aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/usb/usb_ioctl.h
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2009-02-27 17:27:16 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2009-02-27 17:27:16 +0000
commitee3e3ff5c201f0b8942ea912ce7ebfdccb32af52 (patch)
tree799ccaf32ee5b67a3fd075acab472e59c72735d8 /sys/dev/usb/usb_ioctl.h
parent2ebdf042257919c7ee6a2c7d8761a3803c0c87c0 (diff)
downloadsrc-ee3e3ff5c201f0b8942ea912ce7ebfdccb32af52.tar.gz
src-ee3e3ff5c201f0b8942ea912ce7ebfdccb32af52.zip
Change USB over to make_dev() for all device nodes, previously it hooked into
the devfs clone handler to open the (invisible) devices on the fly. The /dev entries are layed out as follows, /dev/usbctl = master device /dev/usb/0.1.0.5 = usb device, (<bus>.<dev>.<iface>.<endpoint>) /dev/ugen0.1 -> usb/0.1.0.0 = ugen link to ctrl endpoint This also removes the custom permissions model from USB. Bump __FreeBSD_version to 800066. Submitted by: rink (earlier version)
Notes
Notes: svn path=/head/; revision=189110
Diffstat (limited to 'sys/dev/usb/usb_ioctl.h')
-rw-r--r--sys/dev/usb/usb_ioctl.h24
1 files changed, 3 insertions, 21 deletions
diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h
index 73f77964e110..81e2c466dec7 100644
--- a/sys/dev/usb/usb_ioctl.h
+++ b/sys/dev/usb/usb_ioctl.h
@@ -36,7 +36,8 @@
#include <dev/usb/usb_endian.h>
#include <dev/usb/usb.h>
-#define USB_DEVICE_NAME "usb"
+#define USB_DEVICE_NAME "usbctl"
+#define USB_DEVICE_DIR "usb"
#define USB_GENERIC_NAME "ugen"
struct usb2_read_dir {
@@ -180,18 +181,6 @@ struct usb2_fs_clear_stall_sync {
uint8_t ep_index;
};
-struct usb2_dev_perm {
- /* Access information */
- uint32_t user_id;
- uint32_t group_id;
- uint16_t mode;
-
- /* Device location */
- uint16_t bus_index;
- uint16_t dev_index;
- uint16_t iface_index;
-};
-
struct usb2_gen_quirk {
uint16_t index; /* Quirk Index */
uint16_t vid; /* Vendor ID */
@@ -248,14 +237,7 @@ struct usb2_gen_quirk {
#define USB_IFACE_DRIVER_DETACH _IOW ('U', 125, int)
#define USB_GET_PLUGTIME _IOR ('U', 126, uint32_t)
#define USB_READ_DIR _IOW ('U', 127, struct usb2_read_dir)
-#define USB_SET_ROOT_PERM _IOW ('U', 128, struct usb2_dev_perm)
-#define USB_SET_BUS_PERM _IOW ('U', 129, struct usb2_dev_perm)
-#define USB_SET_DEVICE_PERM _IOW ('U', 130, struct usb2_dev_perm)
-#define USB_SET_IFACE_PERM _IOW ('U', 131, struct usb2_dev_perm)
-#define USB_GET_ROOT_PERM _IOWR('U', 132, struct usb2_dev_perm)
-#define USB_GET_BUS_PERM _IOWR('U', 133, struct usb2_dev_perm)
-#define USB_GET_DEVICE_PERM _IOWR('U', 134, struct usb2_dev_perm)
-#define USB_GET_IFACE_PERM _IOWR('U', 135, struct usb2_dev_perm)
+/* 128 - 135 unused */
#define USB_SET_TX_FORCE_SHORT _IOW ('U', 136, int)
#define USB_SET_TX_TIMEOUT _IOW ('U', 137, int)
#define USB_GET_TX_FRAME_SIZE _IOR ('U', 138, int)