Changeset e3c78efc in mainline

Timestamp:

2011-11-09T12:59:37Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6f730278

Parents:

555499da

Message:

usbhid: Remove redundant array size enums.

Location:

uspace/drv/bus/usb/usbhid

Files:

• kbd/kbddev.c (modified) (2 diffs)
• mouse/mousedev.c (modified) (2 diffs)
• usbhid.c (modified) (1 diff)

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

@@ -102 +102 @@
 static void usb_kbd_set_led(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev);
 /*----------------------------------------------------------------------------*/
-enum {
-        USB_KBD_BOOT_REPORT_DESCRIPTOR_SIZE = 63
-};
-
-static const uint8_t USB_KBD_BOOT_REPORT_DESCRIPTOR[
-    USB_KBD_BOOT_REPORT_DESCRIPTOR_SIZE] = {
+static const uint8_t USB_KBD_BOOT_REPORT_DESCRIPTOR[] = {
         0x05, 0x01,  // Usage Page (Generic Desktop),
         0x09, 0x06,  // Usage (Keyboard),
         0xA1, 0x01,  // Collection (Application),
         0x75, 0x01,  //   Report Size (1),
-        0x95, 0x08,  //   Report Count (8),       
+        0x95, 0x08,  //   Report Count (8),
         0x05, 0x07,  //   Usage Page (Key Codes);
         0x19, 0xE0,  //   Usage Minimum (224),
@@ -796 +791 @@
         int rc = usb_hid_parse_report_descriptor(
             &hid_dev->report, USB_KBD_BOOT_REPORT_DESCRIPTOR,
-            USB_KBD_BOOT_REPORT_DESCRIPTOR_SIZE);
+            sizeof(USB_KBD_BOOT_REPORT_DESCRIPTOR));
 
         if (rc != EOK) {

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

@@ -77 +77 @@
 
 /*----------------------------------------------------------------------------*/
-
-enum {
-        USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE = 63
-};
-
-static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[
-    USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE] = {
+static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[] = {
         0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)
         0x09, 0x02,                    // USAGE (Mouse)
@@ -540 +534 @@
         int rc = usb_hid_parse_report_descriptor(
             &hid_dev->report, USB_MOUSE_BOOT_REPORT_DESCRIPTOR,
-            USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE);
+            sizeof(USB_MOUSE_BOOT_REPORT_DESCRIPTOR));
 
         if (rc != EOK) {

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

@@ -301 +301 @@
         assert(dev);
 
-
         if (dev->pipes[USB_HID_KBD_POLL_EP_NO].present) {
                 usb_log_debug("Found keyboard endpoint.\n");