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

Timestamp:

2011-10-16T19:38:53Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22ceff3a, e5291e0

Parents:

98fb010 (diff), 93d2684 (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:

Minor USB changes.

Add more const qualifiers where possible.
Do not limit the number possible usbhid subdrivers.
This should not break anything. If it does feel free to revert this merge.

File:

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

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

@@ -59 +59 @@
 /*----------------------------------------------------------------------------*/
 
-usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = {
+const usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = {
         .transfer_type = USB_TRANSFER_INTERRUPT,
         .direction = USB_DIRECTION_IN,
@@ -268 +268 @@
 
         int shift_x = get_mouse_axis_move_value(hid_dev->report_id,
-            hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_X);
+            &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_X);
         int shift_y = get_mouse_axis_move_value(hid_dev->report_id,
-            hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
+            &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
         int wheel = get_mouse_axis_move_value(hid_dev->report_id,
-            hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
+            &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
 
         if ((shift_x != 0) || (shift_y != 0)) {
-                async_exch_t *exch = async_exchange_begin(mouse_dev->mouse_sess);
+                async_exch_t *exch =
+                    async_exchange_begin(mouse_dev->mouse_sess);
                 async_req_2_0(exch, MOUSEEV_MOVE_EVENT, shift_x, shift_y);
                 async_exchange_end(exch);
@@ -291 +292 @@
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
-            hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
-            | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
-            USB_HID_REPORT_TYPE_INPUT);
+            &hid_dev->report, NULL, path, USB_HID_PATH_COMPARE_END
+            | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, USB_HID_REPORT_TYPE_INPUT);
 
         while (field != NULL) {
@@ -314 +314 @@
                         async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, field->usage, 0);
                         async_exchange_end(exch);
-                        
+
                         mouse_dev->buttons[field->usage - field->usage_minimum] =
                            field->value;
                 }
-                
+
                 field = usb_hid_report_get_sibling(
-                    hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
-                    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
+                    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
                     USB_HID_REPORT_TYPE_INPUT);
         }
@@ -474 +474 @@
         // 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_count = 1 + usb_mouse_get_highest_button(
+            &hid_dev->report, hid_dev->report_id);
         mouse_dev->buttons = calloc(mouse_dev->buttons_count, sizeof(int32_t));
 
@@ -532 +532 @@
 int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev)
 {
-        int rc = usb_hid_parse_report_descriptor(hid_dev->report, 
-            USB_MOUSE_BOOT_REPORT_DESCRIPTOR, 
+        int rc = usb_hid_parse_report_descriptor(
+            &hid_dev->report, USB_MOUSE_BOOT_REPORT_DESCRIPTOR,
             USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE);
 
@@ -542 +542 @@
         }
 
-        rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe, 
+        rc = usbhid_req_set_protocol(&hid_dev->usb_dev->ctrl_pipe,
             hid_dev->usb_dev->interface_no, USB_HID_PROTOCOL_BOOT);