Hi David,
unfortunately I had been sick as well being under pressure on a
different project.
Now my boss has promised me time from Monday next week to resolve the
issues.
Tony Olech
On 9 Feb 2007, at 02:52, David Brownell wrote:
> On Thursday 08 February 2007 5:13 pm, Andrew Morton wrote:
>>
>> these are still there.
>>
>> drivers/usb/misc/ftdi-elan.c:2307:1: warning: "OHCI_QUIRK_ZFMICRO"
>> redefined
>> In file included from drivers/usb/misc/ftdi-elan.c:76:
>> drivers/usb/misc/../host/ohci.h:399:1: warning: this is the
>> location of the previous definition
>> drivers/usb/host/u132-hcd.c:181:1: warning: "OHCI_QUIRK_ZFMICRO"
>> redefined
>> In file included from drivers/usb/host/u132-hcd.c:61:
>> drivers/usb/host/ohci.h:399:1: warning: this is the location of
>> the previous definition
>> drivers/usb/misc/ftdi-elan.c:2307:1: warning: "OHCI_QUIRK_ZFMICRO"
>> redefined
>> In file included from drivers/usb/misc/ftdi-elan.c:76:
>> drivers/usb/misc/../host/ohci.h:399:1: warning: this is the
>> location of the previous definition
>
> I guess Tony's not going to fix these bugs ... should this driver
> maybe
> get reclassified as EXPERIMENTAL until it acquires a maintainer? Plus
> maybe someone to run "Lindent" over it and accept the consequences...
>
>
>
> -------------- CUT HERE
>
> Partial fix for bogosity in the ftdi-elan and u13-hcd drivers ...
> these
> have no business including with the internals of other drivers,
> much less
> doing so in a broken way!!
>
> Signed-off-by: David Brownell <[EMAIL PROTECTED]>
>
> Index: g26/drivers/usb/misc/ftdi-elan.c
> ===================================================================
> --- g26.orig/drivers/usb/misc/ftdi-elan.c 2007-01-02
> 20:05:33.000000000 -0800
> +++ g26/drivers/usb/misc/ftdi-elan.c 2007-02-08 18:45:13.000000000
> -0800
> @@ -73,6 +73,13 @@ static struct list_head ftdi_static_list
> #include "usb_u132.h"
> #include <asm/io.h>
> #include "../core/hcd.h"
> +
> + /* FIXME ohci.h is ONLY for internal use by the OHCI driver.
> + * If you're going to try crap like this, you need to split
> + * out the common stuff (register declarations?) into a
> + * sharable file, maybe name <linux/usb/ohci.h>
> + */
> +
> #include "../host/ohci.h"
> /* Define these values to match your devices*/
> #define USB_FTDI_ELAN_VENDOR_ID 0x0403
> @@ -2300,11 +2307,7 @@ static int ftdi_elan_checkingPCI(struct
> offsetof(struct ohci_regs, member), 0, data);
> #define ftdi_write_pcimem(ftdi, member, data)
> ftdi_elan_write_pcimem(ftdi, \
> offsetof(struct ohci_regs, member), 0, data);
> -#define OHCI_QUIRK_AMD756 0x01
> -#define OHCI_QUIRK_SUPERIO 0x02
> -#define OHCI_QUIRK_INITRESET 0x04
> -#define OHCI_BIG_ENDIAN 0x08
> -#define OHCI_QUIRK_ZFMICRO 0x10
> +
> #define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
> #define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE |
> OHCI_INTR_RD | \
> OHCI_INTR_WDH)
> Index: g26/drivers/usb/host/u132-hcd.c
> ===================================================================
> --- g26.orig/drivers/usb/host/u132-hcd.c 2007-01-02
> 20:05:33.000000000 -0800
> +++ g26/drivers/usb/host/u132-hcd.c 2007-02-08 18:45:06.000000000
> -0800
> @@ -58,6 +58,13 @@
> #include <asm/system.h>
> #include <asm/byteorder.h>
> #include "../core/hcd.h"
> +
> + /* FIXME ohci.h is ONLY for internal use by the OHCI driver.
> + * If you're going to try crap like this, you need to split
> + * out the common stuff (register declarations?) into a
> + * sharable file, maybe name <linux/usb/ohci.h>
> + */
> +
> #include "ohci.h"
> #define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
> #define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE |
> OHCI_INTR_RD | \
> @@ -174,11 +181,6 @@ struct u132_ring {
> struct u132_endp *curr_endp;
> struct delayed_work scheduler;
> };
> -#define OHCI_QUIRK_AMD756 0x01
> -#define OHCI_QUIRK_SUPERIO 0x02
> -#define OHCI_QUIRK_INITRESET 0x04
> -#define OHCI_BIG_ENDIAN 0x08
> -#define OHCI_QUIRK_ZFMICRO 0x10
> struct u132 {
> struct kref kref;
> struct list_head u132_list;
>
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
