Changeset c05642d in mainline for uspace/drv/bus/usb/usbhid/usbhid.c

Timestamp:

2011-09-07T00:03:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

5081276

Parents:

bb74dabe (diff), 038b289 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/bus/usb/usbhid/usbhid.c (modified) (2 diffs)

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

@@ -627 +627 @@
         }
         
-        usb_hid_free(&hid_dev);
+        usb_hid_destroy(hid_dev);
 }
 
@@ -646 +646 @@
 /*----------------------------------------------------------------------------*/
 
-void usb_hid_free(usb_hid_dev_t **hid_dev)
+void usb_hid_destroy(usb_hid_dev_t *hid_dev)
 {
         int i;
         
-        if (hid_dev == NULL || *hid_dev == NULL) {
+        if (hid_dev == NULL) {
                 return;
         }
         
         usb_log_debug("Subdrivers: %p, subdriver count: %d\n", 
-            (*hid_dev)->subdrivers, (*hid_dev)->subdriver_count);
-        
-        assert((*hid_dev)->subdrivers != NULL 
-            || (*hid_dev)->subdriver_count == 0);
-        
-        for (i = 0; i < (*hid_dev)->subdriver_count; ++i) {
-                if ((*hid_dev)->subdrivers[i].deinit != NULL) {
-                        (*hid_dev)->subdrivers[i].deinit(*hid_dev,
-                            (*hid_dev)->subdrivers[i].data);
+            hid_dev->subdrivers, hid_dev->subdriver_count);
+        
+        assert(hid_dev->subdrivers != NULL 
+            || hid_dev->subdriver_count == 0);
+        
+        for (i = 0; i < hid_dev->subdriver_count; ++i) {
+                if (hid_dev->subdrivers[i].deinit != NULL) {
+                        hid_dev->subdrivers[i].deinit(hid_dev,
+                            hid_dev->subdrivers[i].data);
                 }
         }
         
         // free the subdrivers info
-        if ((*hid_dev)->subdrivers != NULL) {
-                free((*hid_dev)->subdrivers);
+        if (hid_dev->subdrivers != NULL) {
+                free(hid_dev->subdrivers);
         }
 
         // destroy the parser
-        if ((*hid_dev)->report != NULL) {
-                usb_hid_free_report((*hid_dev)->report);
-        }
-
-        if ((*hid_dev)->report_desc != NULL) {
-                free((*hid_dev)->report_desc);
-        }
-
-        free(*hid_dev);
-        *hid_dev = NULL;
+        if (hid_dev->report != NULL) {
+                usb_hid_free_report(hid_dev->report);
+        }
+
+        if (hid_dev->report_desc != NULL) {
+                free(hid_dev->report_desc);
+        }
 }