Changes in uspace/drv/bus/usb/usbhid/mouse/mousedev.c [4093b14:f2964e45] in mainline

File:

• uspace/drv/bus/usb/usbhid/mouse/mousedev.c (modified) (27 diffs)

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

@@ -124 +124 @@
 {
         usb_mouse_t *mouse_dev = (usb_mouse_t *) fun->driver_data;
-        
+
         if (mouse_dev == NULL) {
                 usb_log_debug("default_connection_handler: Missing "
@@ -131 +131 @@
                 return;
         }
-        
+
         usb_log_debug("default_connection_handler: fun->name: %s\n",
                       fun->name);
         usb_log_debug("default_connection_handler: mouse_sess: %p, "
             "wheel_sess: %p\n", mouse_dev->mouse_sess, mouse_dev->wheel_sess);
-        
+
         async_sess_t **sess_ptr =
             (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0) ?
             &mouse_dev->mouse_sess : &mouse_dev->wheel_sess;
-        
+
         async_sess_t *sess =
             async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
@@ -170 +170 @@
         mouse->mouse_sess = NULL;
         mouse->wheel_sess = NULL;
-        
+
         return mouse;
 }
@@ -179 +179 @@
 {
         assert(mouse_dev != NULL);
-        
+
         // hangup session to the console
         if (mouse_dev->mouse_sess != NULL)
                 async_hangup(mouse_dev->mouse_sess);
-        
+
         if (mouse_dev->wheel_sess != NULL)
                 async_hangup(mouse_dev->wheel_sess);
+        int ret = ddf_fun_unbind(mouse_dev->mouse_fun);
+        if (ret != EOK) {
+                usb_log_error("Failed to unbind mouse function.\n");
+        } else {
+                ddf_fun_destroy(mouse_dev->mouse_fun);
+                /* Prevent double free */
+                mouse_dev->wheel_fun->driver_data = NULL;
+        }
+
+        ret = ddf_fun_unbind(mouse_dev->wheel_fun);
+        if (ret != EOK) {
+                usb_log_error("Failed to unbind wheel function.\n");
+        } else {
+                ddf_fun_destroy(mouse_dev->wheel_fun);
+        }
 }
 
@@ -199 +214 @@
                 return;
         }
-        
+
         int count = ((wheel < 0) ? -wheel : wheel) * ARROWS_PER_SINGLE_WHEEL;
         int i;
-        
+
         for (i = 0; i < count; i++) {
                 /* Send arrow press and release. */
@@ -246 +261 @@
 {
         assert(mouse_dev != NULL);
-        
+
         if (mouse_dev->mouse_sess == NULL) {
                 usb_log_warning(NAME " No console session.\n");
@@ -264 +279 @@
                 async_exchange_end(exch);
         }
-        
+
         if (wheel != 0)
                 usb_mouse_send_wheel(mouse_dev, wheel);
-        
+
         /*
          * Buttons
@@ -274 +289 @@
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
         usb_hid_report_path_set_report_id(path, hid_dev->report_id);
-        
+
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
             hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
@@ -309 +324 @@
                     USB_HID_REPORT_TYPE_INPUT);
         }
-        
+
         usb_hid_report_path_free(path);
 
@@ -321 +336 @@
         assert(hid_dev != NULL);
         assert(mouse != NULL);
-        
+
         /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
@@ -330 +345 @@
                 return ENOMEM;
         }
-        
+
         fun->ops = &mouse->ops;
         fun->driver_data = mouse;
@@ -338 +353 @@
                 usb_log_error("Could not bind DDF function: %s.\n",
                     str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-        
+                return rc;
+        }
+
         usb_log_debug("Adding DDF function to category %s...\n", 
             HID_MOUSE_CATEGORY);
@@ -349 +363 @@
                     "Could not add DDF function to category %s: %s.\n",
                     HID_MOUSE_CATEGORY, str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-        
+                return rc;
+        }
+        mouse->mouse_fun = fun;
+
         /*
          * Special function for acting as keyboard (wheel)
@@ -364 +378 @@
                 return ENOMEM;
         }
-        
+
         /*
          * Store the initialized HID device and HID ops
@@ -376 +390 @@
                 usb_log_error("Could not bind DDF function: %s.\n",
                     str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-        
+                return rc;
+        }
+
         usb_log_debug("Adding DDF function to category %s...\n", 
             HID_MOUSE_WHEEL_CATEGORY);
@@ -387 +400 @@
                     "Could not add DDF function to category %s: %s.\n",
                     HID_MOUSE_WHEEL_CATEGORY, str_error(rc));
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-        
+                return rc;
+        }
+        mouse->wheel_fun = fun;
+
         return EOK;
 }
@@ -441 +454 @@
 {
         usb_log_debug("Initializing HID/Mouse structure...\n");
-        
+
         if (hid_dev == NULL) {
                 usb_log_error("Failed to init keyboard structure: no structure"
@@ -447 +460 @@
                 return EINVAL;
         }
-        
+
         usb_mouse_t *mouse_dev = usb_mouse_new();
         if (mouse_dev == NULL) {
@@ -454 +467 @@
                 return ENOMEM;
         }
-        
+
         // FIXME: This may not be optimal since stupid hardware vendor may
         // use buttons 1, 2, 3 and 6000 and we would allocate array of
@@ -464 +477 @@
             hid_dev->report_id) + 1;
         mouse_dev->buttons = calloc(mouse_dev->buttons_count, sizeof(int32_t));
-        
+
         if (mouse_dev->buttons == NULL) {
                 usb_log_error(NAME ": out of memory, giving up on device!\n");
@@ -474 +487 @@
         // save the Mouse device structure into the HID device structure
         *data = mouse_dev;
-        
+
         // set handler for incoming calls
         mouse_dev->ops.default_handler = default_connection_handler;
-        
+
         // TODO: how to know if the device supports the request???
         usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
             hid_dev->usb_dev->interface_no, IDLE_RATE);
-        
+
         int rc = usb_mouse_create_function(hid_dev, mouse_dev);
         if (rc != EOK) {
@@ -487 +500 @@
                 return rc;
         }
-        
+
         return EOK;
 }
@@ -500 +513 @@
                 return false;
         }
-        
+
         usb_mouse_t *mouse_dev = (usb_mouse_t *)data;
                 
@@ -511 +524 @@
 {
         if (data != NULL) {
-                usb_mouse_destroy((usb_mouse_t *)data);
+                usb_mouse_destroy(data);
         }
 }
@@ -522 +535 @@
             USB_MOUSE_BOOT_REPORT_DESCRIPTOR, 
             USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE);
-        
+
         if (rc != EOK) {
                 usb_log_error("Failed to parse boot report descriptor: %s\n",
@@ -528 +541 @@
                 return rc;
         }
-        
+
         rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe, 
             hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);
-        
+
         if (rc != EOK) {
                 usb_log_warning("Failed to set boot protocol to the device: "
@@ -537 +550 @@
                 return rc;
         }
-        
+
         return EOK;
 }