Changeset 73ae3373 in mainline

Timestamp:

2011-04-08T07:47:06Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fec47d4

Parents:

dd10e07

Message:

Fixed default connection handler + typo

Location:

uspace/drv/usbhid/kbd

Files:

• kbddev.c (modified) (2 diffs)
• kbddev.h (modified) (1 diff)

uspace/drv/usbhid/kbd/kbddev.c

@@ -97 +97 @@
 
 /** Keyboard polling endpoint description for boot protocol class. */
-usb_endpoint_description_t ush_hid_kbd_poll_endpoint_description = {
+usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description = {
         .transfer_type = USB_TRANSFER_INTERRUPT,
         .direction = USB_DIRECTION_IN,
@@ -243 +243 @@
         sysarg_t method = IPC_GET_IMETHOD(*icall);
         
-        usb_kbd_t *kbd_dev = (usb_kbd_t *)fun->driver_data;
-        assert(kbd_dev != NULL);
+        usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)fun->driver_data;
+        
+        if (hid_dev == NULL || hid_dev->data == NULL) {
+                async_answer_0(icallid, EINVAL);
+                return;
+        }
+        
+        assert(hid_dev != NULL);
+        assert(hid_dev->data != NULL);
+        usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data;
 
         if (method == IPC_M_CONNECT_TO_ME) {

uspace/drv/usbhid/kbd/kbddev.h

@@ -131 +131 @@
 //ddf_dev_ops_t keyboard_ops;
 
-usb_endpoint_description_t ush_hid_kbd_poll_endpoint_description;
+usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
 
 const char *HID_KBD_FUN_NAME;