diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /drivers/usb/ezusb.h | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'drivers/usb/ezusb.h')
| -rw-r--r-- | drivers/usb/ezusb.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/drivers/usb/ezusb.h b/drivers/usb/ezusb.h index 630169d11..1d2597129 100644 --- a/drivers/usb/ezusb.h +++ b/drivers/usb/ezusb.h @@ -31,6 +31,23 @@ /* --------------------------------------------------------------------- */ +struct ezusb_old_ctrltransfer { + /* keep in sync with usb.h:devrequest */ + unsigned char requesttype; + unsigned char request; + unsigned short value; + unsigned short index; + unsigned short length; + unsigned int dlen; + void *data; +}; + +struct ezusb_old_bulktransfer { + unsigned int ep; + unsigned int len; + void *data; +}; + struct ezusb_ctrltransfer { /* keep in sync with usb.h:devrequest */ unsigned char requesttype; @@ -38,14 +55,14 @@ struct ezusb_ctrltransfer { unsigned short value; unsigned short index; unsigned short length; - /* pointer to data */ - unsigned dlen; + unsigned int timeout; /* in milliseconds */ void *data; }; struct ezusb_bulktransfer { unsigned int ep; unsigned int len; + unsigned int timeout; /* in milliseconds */ void *data; }; @@ -84,8 +101,10 @@ struct ezusb_asynciso { struct ezusb_isoframestat isostat[0]; }; -#define EZUSB_CONTROL _IOWR('E', 0, struct ezusb_ctrltransfer) +#define EZUSB_CONTROL _IOWR('E', 1, struct ezusb_ctrltransfer) #define EZUSB_BULK _IOWR('E', 2, struct ezusb_bulktransfer) +#define EZUSB_OLD_CONTROL _IOWR('E', 0, struct ezusb_old_ctrltransfer) +#define EZUSB_OLD_BULK _IOWR('E', 2, struct ezusb_old_bulktransfer) #define EZUSB_RESETEP _IOR('E', 3, unsigned int) #define EZUSB_SETINTERFACE _IOR('E', 4, struct ezusb_setinterface) #define EZUSB_SETCONFIGURATION _IOR('E', 5, unsigned int) |