Changeset d46ceb2b in mainline for uspace/drv/bus/usb

Timestamp:

2017-10-28T14:54:29Z (8 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d37514e

Parents:

40a3bfa

Message:

Modified libusbdev to forward fun_online and _offline calls to USB drivers. Added poor man's implementation of HID device removal hook.

Location:

uspace/drv/bus/usb

Files:

• usbhid/main.c (modified) (1 diff)
• usbmid/main.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/main.c

@@ -124 +124 @@
 static int usb_hid_device_rem(usb_device_t *dev)
 {
-        // TODO: Stop device polling
-        // TODO: Call deinit (stops autorepeat too)
-        return ENOTSUP;
+        assert(dev);
+        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+        assert(hid_dev);
+
+        /* TODO: Stop device polling prior to deinit. Now it fails on endpoint error. */
+
+        usb_hid_deinit(hid_dev);
+        usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));
+        return EOK;
 }
 

uspace/drv/bus/usb/usbmid/main.c

@@ -147 +147 @@
 }
 
+static int usbmid_function_online(ddf_fun_t *fun)
+{
+        /* TODO: What if this is the control function? */
+        return ddf_fun_online(fun);
+}
+
+static int usbmid_function_offline(ddf_fun_t *fun)
+{
+        /* TODO: What if this is the control function? */
+        return ddf_fun_offline(fun);
+}
+
 /** USB MID driver ops. */
 static const usb_driver_ops_t mid_driver_ops = {
@@ -152 +164 @@
         .device_rem = usbmid_device_remove,
         .device_gone = usbmid_device_gone,
+        .function_online = usbmid_function_online,
+        .function_offline = usbmid_function_offline
 };