d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement USB kernel driver detach from userland.

Browse Source 
Submitted by:	Hans Petter Selasky
This commit is contained in:
Andrew Thompson 2010-03-11 21:50:36 +00:00
parent 3f6c7805b4
commit a7aca4cd92
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/usb/usb_device.c
View File

@ -80,7 +80,6 @@
static void usb_init_endpoint(struct usb_device *, uint8_t,
struct usb_endpoint_descriptor *, struct usb_endpoint *);
static void usb_unconfigure(struct usb_device *, uint8_t);
static void usb_detach_device(struct usb_device *, uint8_t, uint8_t);
static void usb_detach_device_sub(struct usb_device *, device_t *,
uint8_t);
static uint8_t usb_probe_and_attach_sub(struct usb_device *,

1
sys/dev/usb/usb_device.h
View File

@ -196,6 +196,7 @@ struct usb_device *usb_alloc_device(device_t parent_dev, struct usb_bus *bus,
enum usb_dev_speed speed, enum usb_hc_mode mode);
usb_error_t usb_probe_and_attach(struct usb_device *udev,
uint8_t iface_index);
void usb_detach_device(struct usb_device *, uint8_t, uint8_t);
usb_error_t usb_reset_iface_endpoints(struct usb_device *udev,
uint8_t iface_index);
usb_error_t usbd_set_config_index(struct usb_device *udev, uint8_t index);

25
sys/dev/usb/usb_generic.c
View File

@ -2095,17 +2095,32 @@ ugen_ioctl_post(struct usb_fifo *f, u_long cmd, void *addr, int fflags)
break;
case USB_IFACE_DRIVER_ACTIVE:
/* TODO */
*u.pint = 0;
n = *u.pint & 0xFF;
iface = usbd_get_iface(f->udev, n);
if (iface && iface->subdev)
error = 0;
else
error = ENXIO;
break;
case USB_IFACE_DRIVER_DETACH:
/* TODO */
error = priv_check(curthread, PRIV_DRIVER);
if (error) {
if (error)
break;
n = *u.pint & 0xFF;
if (n == USB_IFACE_INDEX_ANY) {
error = EINVAL;
break;
}
error = EINVAL;
usb_detach_device(f->udev, n, 0);
break;
case USB_SET_POWER_MODE: