Changeset 777e336 in mainline for uspace/drv/usbhid/subdrivers.c

Timestamp:

2011-04-12T15:59:44Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7df6cd

Parents:

1cbb4b7

Message:

Minor changes in subdrivers API.

• Changed vendor ID and product ID to uint16_t
• Removed size of the path, ending with {0, 0}
• Named structure initialization for usb_hid_subdrivers()

File:

• uspace/drv/usbhid/subdrivers.c (modified) (1 diff)

uspace/drv/usbhid/subdrivers.c

@@ -37 +37 @@
 #include "usb/classes/hidut.h"
 
-static usb_hid_subdriver_usage_t path_kbd[] = {{USB_HIDUT_PAGE_KEYBOARD, 0}};
+static usb_hid_subdriver_usage_t path_kbd[] = {
+        {USB_HIDUT_PAGE_KEYBOARD, 0}, 
+        {0, 0}
+};
 
 const usb_hid_subdriver_mapping_t usb_hid_subdrivers[] = {
         {
                 path_kbd,
-                1,
                 USB_HID_PATH_COMPARE_END 
                 | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                NULL,
-                NULL,
+                0,
+                0,
                 {
-                        usb_kbd_init,
-                        usb_kbd_deinit,
-                        usb_kbd_polling_callback,
-                        NULL
+                        .init = usb_kbd_init,
+                        .deinit = usb_kbd_deinit,
+                        .poll = usb_kbd_polling_callback,
+                        .poll_end = NULL
                 },
                 
         },
-        {NULL, 0, 0, NULL, NULL, {NULL, NULL, NULL, NULL}}
+        {NULL, 0, 0, 0, {NULL, NULL, NULL, NULL}}
 };