Author: thompsa
Date: Thu Mar 11 21:50:36 2010
New Revision: 205036
URL: http://svn.freebsd.org/changeset/base/205036
Log:
Implement USB kernel driver detach from userland.
Submitted by: Hans Petter Selasky
Modified:
head/sys/dev/usb/usb_device.c
head/sys/dev/usb/usb_device.h
head/sys/dev/usb/usb_generic.c
Modified: head/sys/dev/usb/usb_device.c
==============================================================================
--- head/sys/dev/usb/usb_device.c Thu Mar 11 21:49:43 2010
(r205035)
+++ head/sys/dev/usb/usb_device.c Thu Mar 11 21:50:36 2010
(r205036)
@@ -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 *,
Modified: head/sys/dev/usb/usb_device.h
==============================================================================
--- head/sys/dev/usb/usb_device.h Thu Mar 11 21:49:43 2010
(r205035)
+++ head/sys/dev/usb/usb_device.h Thu Mar 11 21:50:36 2010
(r205036)
@@ -196,6 +196,7 @@ struct usb_device *usb_alloc_device(devi
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);
Modified: head/sys/dev/usb/usb_generic.c
==============================================================================
--- head/sys/dev/usb/usb_generic.c Thu Mar 11 21:49:43 2010
(r205035)
+++ head/sys/dev/usb/usb_generic.c Thu Mar 11 21:50:36 2010
(r205036)
@@ -2095,17 +2095,32 @@ ugen_ioctl_post(struct usb_fifo *f, u_lo
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:
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
