resend: compat ioctl for submiting URB
PATCH 1/1 resend: compat ioctl for submiting URB
Here is the resend of the patch to support compatible URB ioctl on 64 bit systems. This version already incorporate some feed back I get from the list and I have not get any new input yet.
Change Log:
- Let usbdevfs directly handle 32 bit URB ioctl. More specifically:
USBDEVFS_SUBMITURB32, USBDEVFS_REAPURB32 and USBDEVFS_REAPURBNDELAY32. Those asynchronous ioctls are too complicate to handle by the compatible layer.
Thanks
Chris
include/linux/compat_ioctl.h +3 -0
@@ -692,6 +692,9 @@ COMPATIBLE_IOCTL(USBDEVFS_CONNECTINFO) COMPATIBLE_IOCTL(USBDEVFS_HUB_PORTINFO) COMPATIBLE_IOCTL(USBDEVFS_RESET) +COMPATIBLE_IOCTL(USBDEVFS_SUBMITURB32) +COMPATIBLE_IOCTL(USBDEVFS_REAPURB32) +COMPATIBLE_IOCTL(USBDEVFS_REAPURBNDELAY32) COMPATIBLE_IOCTL(USBDEVFS_CLEAR_HALT) /* MTD */ COMPATIBLE_IOCTL(MEMGETINFO)
include/linux/usbdevice_fs.h +20 -1
@@ -32,6 +32,7 @@#define _LINUX_USBDEVICE_FS_H#include <linux/types.h> +#include <linux/compat.h> /* --------------------------------------------------------------------- */
@@ -123,6 +124,22 @@char port [127 ];/* e.g. port 3 connects to device 27 */ }; +struct usbdevfs_urb32 { +unsigned char type; +unsigned char endpoint; +compat_int_t status; +compat_uint_t flags; +compat_caddr_t buffer; +compat_int_t buffer_length; +compat_int_t actual_length; +compat_int_t start_frame; +compat_int_t number_of_packets; +compat_int_t error_count; +compat_uint_t signr; +compat_caddr_t usercontext;/* unused */ +struct usbdevfs_iso_packet_desc iso_frame_desc[0 ]; +}; +#define USBDEVFS_CONTROL _IOWR('U', 0, struct usbdevfs_ctrltransfer)#define USBDEVFS_BULK _IOWR('U', 2, struct usbdevfs_bulktransfer)#define USBDEVFS_RESETEP _IOR('U', 3, unsigned int)
@@ -130,9 +147,12 @@#define USBDEVFS_SETCONFIGURATION _IOR('U', 5, unsigned int)#define USBDEVFS_GETDRIVER _IOW('U', 8, struct usbdevfs_getdriver)#define USBDEVFS_SUBMITURB _IOR('U', 10, struct usbdevfs_urb) +#define USBDEVFS_SUBMITURB32 _IOR('U', 10, struct usbdevfs_urb32)#define USBDEVFS_DISCARDURB _IO('U', 11)#define USBDEVFS_REAPURB _IOW('U', 12, void *) +#define USBDEVFS_REAPURB32 _IOW('U', 12, u32)#define USBDEVFS_REAPURBNDELAY _IOW('U', 13, void *) +#define USBDEVFS_REAPURBNDELAY32 _IOW('U', 13, u32)#define USBDEVFS_DISCSIGNAL _IOR('U', 14, struct usbdevfs_disconnectsignal)#define USBDEVFS_CLAIMINTERFACE _IOR('U', 15, unsigned int)#define USBDEVFS_RELEASEINTERFACE _IOR('U', 16, unsigned int)
@@ -143,5 +163,4 @@#define USBDEVFS_CLEAR_HALT _IOR('U', 21, unsigned int)#define USBDEVFS_DISCONNECT _IO('U', 22)#define USBDEVFS_CONNECT _IO('U', 23) -#endif /* _LINUX_USBDEVICE_FS_H */
fs/compat_ioctl.c +4 -225
242 lines not on this page · raw message
drivers/usb/core/devio.c +185 -66
416 lines not on this page · raw message