Changeset d46ceb2b in mainline

Timestamp:

2017-10-28T14:54:29Z (6 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

Files:

• drv/bus/usb/usbhid/main.c (modified) (1 diff)
• drv/bus/usb/usbmid/main.c (modified) (2 diffs)
• lib/usbdev/include/usb/dev/driver.h (modified) (1 diff)
• lib/usbdev/src/driver.c (modified) (1 diff)

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
 };
 

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -48 +48 @@
         /** Callback when a device was removed from the system. */
         int (*device_gone)(usb_device_t *);
+        /** Callback asking the driver to online a specific function. */
+        int (*function_online)(ddf_fun_t *);
+        /** Callback asking the driver to offline a specific function. */
+        int (*function_offline)(ddf_fun_t *);
 } usb_driver_ops_t;
 

uspace/lib/usbdev/src/driver.c

@@ -117 +117 @@
 }
 
+/** Callback when the driver is asked to online a specific function.
+ *
+ * This callback is a wrapper for USB specific version of @c fun_online.
+ *
+ * @param gen_dev Device function structure as prepared by DDF.
+ * @return Error code.
+ */
+static int generic_function_online(ddf_fun_t *fun)
+{
+        assert(driver);
+        assert(driver->ops);
+        if (driver->ops->function_online == NULL)
+                return ENOTSUP;
+        return driver->ops->function_online(fun);
+}
+
+/** Callback when the driver is asked to offline a specific function.
+ *
+ * This callback is a wrapper for USB specific version of @c fun_offline.
+ *
+ * @param gen_dev Device function structure as prepared by DDF.
+ * @return Error code.
+ */
+static int generic_function_offline(ddf_fun_t *fun)
+{
+        assert(driver);
+        assert(driver->ops);
+        if (driver->ops->function_offline == NULL)
+                return ENOTSUP;
+        return driver->ops->function_offline(fun);
+}
+
 static driver_ops_t generic_driver_ops = {
         .dev_add = generic_device_add,
         .dev_remove = generic_device_remove,
         .dev_gone = generic_device_gone,
+        .fun_online = generic_function_online,
+        .fun_offline = generic_function_offline,
 };
 static driver_t generic_driver = {