Changeset 1db44ea in mainline for uspace/drv/bus/usb/usbhid/mouse/mousedev.c

Timestamp:

2011-09-25T18:46:45Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

36cb22f

Parents:

dcc44ca1 (diff), f9d8c3a (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

@@ -75 +75 @@
 /** Default idle rate for mouses. */
 static const uint8_t IDLE_RATE = 0;
-static const size_t USB_MOUSE_BUTTON_COUNT = 3;
 
 /*----------------------------------------------------------------------------*/
@@ -397 +396 @@
 /*----------------------------------------------------------------------------*/
 
+/** Get highest index of a button mentioned in given report.
+ *
+ * @param report HID report.
+ * @param report_id Report id we are interested in.
+ * @return Highest button mentioned in the report.
+ * @retval 1 No button was mentioned.
+ *
+ */
+static size_t usb_mouse_get_highest_button(usb_hid_report_t *report, uint8_t report_id)
+{
+        size_t highest_button = 0;
+
+        usb_hid_report_path_t *path = usb_hid_report_path();
+        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
+        usb_hid_report_path_set_report_id(path, report_id);
+
+        usb_hid_report_field_t *field = NULL;
+
+        /* Break from within. */
+        while (1) {
+                field = usb_hid_report_get_sibling(
+                    report, field, path,
+                    USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                    USB_HID_REPORT_TYPE_INPUT);
+                /* No more buttons? */
+                if (field == NULL) {
+                        break;
+                }
+
+                size_t current_button = field->usage - field->usage_minimum;
+                if (current_button > highest_button) {
+                        highest_button = current_button;
+                }
+        }
+
+        usb_hid_report_path_free(path);
+
+        return highest_button;
+}
+
+/*----------------------------------------------------------------------------*/
+
 int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data)
 {
@@ -414 +455 @@
         }
         
-        mouse_dev->buttons = (int32_t *)calloc(USB_MOUSE_BUTTON_COUNT, 
-            sizeof(int32_t));
+        // FIXME: This may not be optimal since stupid hardware vendor may
+        // use buttons 1, 2, 3 and 6000 and we would allocate array of
+        // 6001*4B and use only 4 items in it.
+        // Since I doubt that hardware producers would do that, I think
+        // that the current solution is good enough.
+        /* Adding 1 because we will be accessing buttons[highest]. */
+        mouse_dev->buttons_count = usb_mouse_get_highest_button(hid_dev->report,
+            hid_dev->report_id) + 1;
+        mouse_dev->buttons = calloc(mouse_dev->buttons_count, sizeof(int32_t));
         
         if (mouse_dev->buttons == NULL) {
-                usb_log_fatal("No memory!\n");
+                usb_log_error(NAME ": out of memory, giving up on device!\n");
                 free(mouse_dev);
                 return ENOMEM;
         }
-        
+
+
         // save the Mouse device structure into the HID device structure
         *data = mouse_dev;