Changeset c05642d in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.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/kbd/kbddev.c (modified) (3 diffs)

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

@@ -734 +734 @@
         int rc = usb_kbd_create_function(hid_dev, kbd_dev);
         if (rc != EOK) {
-                usb_kbd_free(&kbd_dev);
+                usb_kbd_destroy(kbd_dev);
                 return rc;
         }
@@ -779 +779 @@
  * @param kbd_dev Pointer to the structure to be destroyed.
  */
-void usb_kbd_free(usb_kbd_t **kbd_dev)
-{
-        if (kbd_dev == NULL || *kbd_dev == NULL) {
+void usb_kbd_destroy(usb_kbd_t *kbd_dev)
+{
+        if (kbd_dev == NULL) {
                 return;
         }
         
         // hangup phone to the console
-        async_obsolete_hangup((*kbd_dev)->console_phone);
-        
-        if ((*kbd_dev)->repeat_mtx != NULL) {
+        async_obsolete_hangup(kbd_dev->console_phone);
+        
+        if (kbd_dev->repeat_mtx != NULL) {
                 //assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
                 // FIXME - the fibril_mutex_is_locked may not cause
                 // fibril scheduling
-                while (fibril_mutex_is_locked((*kbd_dev)->repeat_mtx)) {}
-                free((*kbd_dev)->repeat_mtx);
+                while (fibril_mutex_is_locked(kbd_dev->repeat_mtx)) {}
+                free(kbd_dev->repeat_mtx);
         }
         
         // free all buffers
-        if ((*kbd_dev)->keys != NULL) {
-                free((*kbd_dev)->keys);
-        }
-        if ((*kbd_dev)->keys_old != NULL) {
-                free((*kbd_dev)->keys_old);
-        }
-        if ((*kbd_dev)->led_data != NULL) {
-                free((*kbd_dev)->led_data);
-        }
-        if ((*kbd_dev)->led_path != NULL) {
-                usb_hid_report_path_free((*kbd_dev)->led_path);
-        }
-        if ((*kbd_dev)->output_buffer != NULL) {
-                usb_hid_report_output_free((*kbd_dev)->output_buffer);
-        }
-
-        free(*kbd_dev);
-        *kbd_dev = NULL;
+        if (kbd_dev->keys != NULL) {
+                free(kbd_dev->keys);
+        }
+        if (kbd_dev->keys_old != NULL) {
+                free(kbd_dev->keys_old);
+        }
+        if (kbd_dev->led_data != NULL) {
+                free(kbd_dev->led_data);
+        }
+        if (kbd_dev->led_path != NULL) {
+                usb_hid_report_path_free(kbd_dev->led_path);
+        }
+        if (kbd_dev->output_buffer != NULL) {
+                usb_hid_report_output_free(kbd_dev->output_buffer);
+        }
 }
 
@@ -830 +827 @@
                         usb_kbd_mark_unusable(kbd_dev);
                 } else {
-                        usb_kbd_free(&kbd_dev);
+                        usb_kbd_destroy(kbd_dev);
                 }
         }