Changeset c5b6db53 in mainline

Timestamp:

2011-10-14T15:22:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2964e45

Parents:

af8c9b54

Message:

usbhid: unbind generic hid DDF function.

Location:

uspace/drv/bus/usb/usbhid

Files:

• generic/hiddev.c (modified) (2 diffs)
• generic/hiddev.h (modified) (1 diff)
• usbhid.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhid/generic/hiddev.c

@@ -190 +190 @@
 /*----------------------------------------------------------------------------*/
 
-static int usb_generic_hid_create_function(usb_hid_dev_t *hid_dev)
-{       
+void usb_generic_hid_deinit(usb_hid_dev_t *hid_dev, void *data)
+{
+        ddf_fun_t *fun = data;
+        const int ret = ddf_fun_unbind(fun);
+        if (ret != EOK) {
+                usb_log_error("ailed to unbind generic hid fun.\n");
+                return;
+        }
+        ddf_fun_destroy(fun);
+}
+
+/*----------------------------------------------------------------------------*/
+
+int usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data)
+{
+        if (hid_dev == NULL) {
+                return EINVAL;
+        }
+
         /* Create the exposed function. */
         /** @todo Generate numbers for the devices? */
@@ -214 +231 @@
 
         usb_log_debug("HID function created. Handle: %" PRIun "\n", fun->handle);
-
-        return EOK;
-}
-
-/*----------------------------------------------------------------------------*/
-
-int usb_generic_hid_init(usb_hid_dev_t *hid_dev, void **data)
-{
-        if (hid_dev == NULL) {
-                return EINVAL;
-        }
-
-        return usb_generic_hid_create_function(hid_dev);
+        *data = fun;
+
+        return EOK;
 }
 

uspace/drv/bus/usb/usbhid/generic/hiddev.h

@@ -50 +50 @@
 int usb_generic_hid_init(struct usb_hid_dev *hid_dev, void **data);
 
+void usb_generic_hid_deinit(struct usb_hid_dev *hid_dev, void *data);
+
 bool usb_generic_hid_polling_callback(struct usb_hid_dev *hid_dev, void *data);
 

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

@@ -155 +155 @@
 
         // set the deinit callback
-        hid_dev->subdrivers[hid_dev->subdriver_count].deinit = NULL;
+        hid_dev->subdrivers[hid_dev->subdriver_count].deinit =
+            usb_generic_hid_deinit;
 
         // set subdriver count
@@ -270 +271 @@
         hid_dev->subdrivers[count].init = usb_generic_hid_init;
         hid_dev->subdrivers[count].poll = usb_generic_hid_polling_callback;
-        hid_dev->subdrivers[count].deinit = NULL;
+        hid_dev->subdrivers[count].deinit = usb_generic_hid_deinit;
         hid_dev->subdrivers[count].poll_end = NULL;