diff options
author | thompsa <thompsa@FreeBSD.org> | 2009-02-27 17:27:16 +0000 |
---|---|---|
committer | thompsa <thompsa@FreeBSD.org> | 2009-02-27 17:27:16 +0000 |
commit | 1f16c7700d04a735aa3df3ed26ab236e680c21ad (patch) | |
tree | 799ccaf32ee5b67a3fd075acab472e59c72735d8 /usr.sbin/usbconfig/dump.c | |
parent | 03a6b7577d94c2fbc97da1c5539e0bcae374f497 (diff) | |
download | FreeBSD-src-1f16c7700d04a735aa3df3ed26ab236e680c21ad.zip FreeBSD-src-1f16c7700d04a735aa3df3ed26ab236e680c21ad.tar.gz |
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)
Diffstat (limited to 'usr.sbin/usbconfig/dump.c')
-rw-r--r-- | usr.sbin/usbconfig/dump.c | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/usr.sbin/usbconfig/dump.c b/usr.sbin/usbconfig/dump.c index 01c55d2..6a2fd02 100644 --- a/usr.sbin/usbconfig/dump.c +++ b/usr.sbin/usbconfig/dump.c @@ -263,107 +263,6 @@ dump_be_dev_quirks(struct libusb20_backend *pbe) } void -dump_be_access(struct libusb20_backend *pbe) -{ - struct group *gr; - struct passwd *pw; - const char *owner; - const char *group; - uid_t uid; - gid_t gid; - mode_t mode; - - if (libusb20_be_get_owner(pbe, &uid, &gid)) { - err(1, "could not get owner"); - } - if (libusb20_be_get_perm(pbe, &mode)) { - err(1, "could not get permission"); - } - owner = (pw = getpwuid(uid)) ? pw->pw_name : "UNKNOWN"; - group = (gr = getgrgid(gid)) ? gr->gr_name : "UNKNOWN"; - - if (mode || 1) { - printf("Global Access: %s:%s 0%o\n", owner, group, mode); - } else { - printf("Global Access: <not set>\n"); - } - return; -} - -void -dump_device_access(struct libusb20_device *pdev, uint8_t iface) -{ - struct group *gr; - struct passwd *pw; - const char *owner; - const char *group; - uid_t uid; - gid_t gid; - mode_t mode; - - if (libusb20_dev_get_owner(pdev, &uid, &gid)) { - err(1, "could not get owner"); - } - if (libusb20_dev_get_perm(pdev, &mode)) { - err(1, "could not get permission"); - } - if (mode) { - owner = (pw = getpwuid(uid)) ? pw->pw_name : "UNKNOWN"; - group = (gr = getgrgid(gid)) ? gr->gr_name : "UNKNOWN"; - - printf(" " "Device Access: %s:%s 0%o\n", owner, group, mode); - - } else { - printf(" " "Device Access: <not set>\n"); - } - - if (iface == 0xFF) { - for (iface = 0; iface != 0xFF; iface++) { - if (dump_device_iface_access(pdev, iface)) { - break; - } - } - } else { - if (dump_device_iface_access(pdev, iface)) { - err(1, "could not get interface access info"); - } - } - return; -} - -int -dump_device_iface_access(struct libusb20_device *pdev, uint8_t iface) -{ - struct group *gr; - struct passwd *pw; - const char *owner; - const char *group; - uid_t uid; - gid_t gid; - mode_t mode; - int error; - - if ((error = libusb20_dev_get_iface_owner(pdev, iface, &uid, &gid))) { - return (error); - } - if ((error = libusb20_dev_get_iface_perm(pdev, iface, &mode))) { - return (error); - } - if (mode) { - - owner = (pw = getpwuid(uid)) ? pw->pw_name : "UNKNOWN"; - group = (gr = getgrgid(gid)) ? gr->gr_name : "UNKNOWN"; - - printf(" " "Interface %u Access: %s:%s 0%o\n", - iface, owner, group, mode); - } else { - printf(" " "Interface %u Access: <not set>\n", iface); - } - - return (0); -} - -void dump_device_desc(struct libusb20_device *pdev) { struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; |