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

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

@@ -183 +183 @@
 /*----------------------------------------------------------------------------*/
 
-static void usb_mouse_free(usb_mouse_t **mouse_dev)
-{
-        assert(mouse_dev != NULL && *mouse_dev != NULL);
+static void usb_mouse_destroy(usb_mouse_t *mouse_dev)
+{
+        assert(mouse_dev != NULL);
         
         // hangup phone to the console
-        if ((*mouse_dev)->mouse_phone >= 0) {
-                async_obsolete_hangup((*mouse_dev)->mouse_phone);
-        }
-        
-        if ((*mouse_dev)->wheel_phone >= 0) {
-                async_obsolete_hangup((*mouse_dev)->wheel_phone);
-        }
-        
-        free(*mouse_dev);
-        *mouse_dev = NULL;
+        if (mouse_dev->mouse_phone >= 0) {
+                async_obsolete_hangup(mouse_dev->mouse_phone);
+        }
+        
+        if (mouse_dev->wheel_phone >= 0) {
+                async_obsolete_hangup(mouse_dev->wheel_phone);
+        }
 }
 
@@ -437 +434 @@
         int rc = usb_mouse_create_function(hid_dev, mouse_dev);
         if (rc != EOK) {
-                usb_mouse_free(&mouse_dev);
+                usb_mouse_destroy(mouse_dev);
                 return rc;
         }
@@ -464 +461 @@
 {
         if (data != NULL) {
-                usb_mouse_free((usb_mouse_t **)&data);
+                usb_mouse_destroy((usb_mouse_t *)data);
         }
 }