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

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

@@ -88 +88 @@
 
 /** Keyboard polling endpoint description for boot protocol class. */
-usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description = {
+const usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description = {
         .transfer_type = USB_TRANSFER_INTERRUPT,
         .direction = USB_DIRECTION_IN,
@@ -237 +237 @@
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
-            hid_dev->report, NULL, kbd_dev->led_path, 
+            &hid_dev->report, NULL, kbd_dev->led_path,
             USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
             USB_HID_REPORT_TYPE_OUTPUT);
 
         while (field != NULL) {
-                
-                if ((field->usage == USB_HID_LED_NUM_LOCK) 
+
+                if ((field->usage == USB_HID_LED_NUM_LOCK)
                     && (kbd_dev->mods & KM_NUM_LOCK)){
                         field->value = 1;
                 }
 
-                if ((field->usage == USB_HID_LED_CAPS_LOCK) 
+                if ((field->usage == USB_HID_LED_CAPS_LOCK)
                     && (kbd_dev->mods & KM_CAPS_LOCK)){
                         field->value = 1;
                 }
 
-                if ((field->usage == USB_HID_LED_SCROLL_LOCK) 
+                if ((field->usage == USB_HID_LED_SCROLL_LOCK)
                     && (kbd_dev->mods & KM_SCROLL_LOCK)){
                         field->value = 1;
                 }
-                
-                field = usb_hid_report_get_sibling(hid_dev->report, field,
-                    kbd_dev->led_path,  
-                USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                        USB_HID_REPORT_TYPE_OUTPUT);
+
+                field = usb_hid_report_get_sibling(
+                    &hid_dev->report, field, kbd_dev->led_path,
+                USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                    USB_HID_REPORT_TYPE_OUTPUT);
         }
 
         // TODO: what about the Report ID?
-        int rc = usb_hid_report_output_translate(hid_dev->report, 0,
+        int rc = usb_hid_report_output_translate(&hid_dev->report, 0,
             kbd_dev->output_buffer, kbd_dev->output_size);
 
@@ -432 +432 @@
 static void usb_kbd_process_data(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev)
 {
-        assert(hid_dev->report != NULL);
         assert(hid_dev != NULL);
         assert(kbd_dev != NULL);
@@ -444 +443 @@
 
         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, 
+            &hid_dev->report, NULL, path,
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
             USB_HID_REPORT_TYPE_INPUT);
         unsigned i = 0;
@@ -454 +453 @@
                 
                 assert(i < kbd_dev->key_count);
-                
+
                 // save the key usage
                 if (field->value != 0) {
@@ -463 +462 @@
                 }
                 usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);
-                
+
                 ++i;
-                field = usb_hid_report_get_sibling(hid_dev->report, field, path, 
-                    USB_HID_PATH_COMPARE_END 
-                    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+                field = usb_hid_report_get_sibling(
+                    &hid_dev->report, field, path, USB_HID_PATH_COMPARE_END
+                        | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
                     USB_HID_REPORT_TYPE_INPUT);
         }
@@ -616 +615 @@
 
         kbd_dev->key_count = usb_hid_report_size(
-            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT); 
+            &hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT);
         usb_hid_report_path_free(path);
 
         usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count);
 
-        kbd_dev->keys = (int32_t *)calloc(kbd_dev->key_count, sizeof(int32_t));
+        kbd_dev->keys = calloc(kbd_dev->key_count, sizeof(int32_t));
 
         if (kbd_dev->keys == NULL) {
@@ -643 +642 @@
          */
         kbd_dev->output_size = 0;
-        kbd_dev->output_buffer = usb_hid_report_output(hid_dev->report, 
+        kbd_dev->output_buffer = usb_hid_report_output(&hid_dev->report,
             &kbd_dev->output_size, 0);
         if (kbd_dev->output_buffer == NULL) {
@@ -657 +656 @@
             kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
 
-        kbd_dev->led_output_size = usb_hid_report_size(hid_dev->report, 
-            0, USB_HID_REPORT_TYPE_OUTPUT);
+        kbd_dev->led_output_size = usb_hid_report_size(
+            &hid_dev->report, 0, USB_HID_REPORT_TYPE_OUTPUT);
 
         usb_log_debug("Output report size (in items): %zu\n", 
@@ -826 +825 @@
 int usb_kbd_set_boot_protocol(usb_hid_dev_t *hid_dev)
 {
-        int rc = usb_hid_parse_report_descriptor(hid_dev->report, 
-            USB_KBD_BOOT_REPORT_DESCRIPTOR, 
+        int rc = usb_hid_parse_report_descriptor(
+            &hid_dev->report, USB_KBD_BOOT_REPORT_DESCRIPTOR,
             USB_KBD_BOOT_REPORT_DESCRIPTOR_SIZE);
 
@@ -836 +835 @@
         }
 
-        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);