Changes in uspace/drv/usbkbd/main.c [45019865:fbddf94] in mainline

File:

• uspace/drv/usbkbd/main.c (modified) (6 diffs)

uspace/drv/usbkbd/main.c

@@ -90 +90 @@
  * Callbacks for parser
  */
-static void usbkbd_process_keycodes(const uint16_t *key_codes, size_t count,
-                                    void *arg)
+static void usbkbd_process_keycodes(const uint8_t *key_codes, size_t count,
+                                    uint8_t modifiers, void *arg)
 {
         printf("Got keys: ");
@@ -130 +130 @@
                 assert(actual_size == length);
 
-                dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT, 
-                    kbd_dev->conf->interfaces[i].report_desc, length);
+                //dump_hid_class_descriptor(0, USB_DESCTYPE_HID_REPORT, 
+                //    kbd_dev->conf->interfaces[i].report_desc, length);
         }
 
@@ -189 +189 @@
         }
         
-        usbkbd_print_config(kbd_dev->conf);
+        //usbkbd_print_config(kbd_dev->conf);
+
+        /*
+         * TODO: 
+         * 1) select one configuration (lets say the first)
+         * 2) how many interfaces?? how to select one??
+     *    ("The default setting for an interface is always alternate setting zero.")
+         * 3) find endpoint which is IN and INTERRUPT (parse), save its number
+     *    as the endpoint for polling
+         */
         
         return EOK;
@@ -208 +217 @@
         // get phone to my HC and save it as my parent's phone
         // TODO: maybe not a good idea if DDF will use parent_phone
-        kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
-
-        kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
-            dev);
+        int rc = kbd_dev->device->parent_phone = usb_drv_hc_connect_auto(dev, 0);
+        if (rc < 0) {
+                printf("Problem setting phone to HC.\n");
+                free(kbd_dev);
+                return NULL;
+        }
+
+        rc = kbd_dev->address = usb_drv_get_my_address(dev->parent_phone, dev);
+        if (rc < 0) {
+                printf("Problem getting address of the device.\n");
+                free(kbd_dev);
+                return NULL;
+        }
 
         // doesn't matter now that we have no address
@@ -239 +257 @@
                                         uint8_t *buffer, size_t actual_size)
 {
-        /*
-         * here, the parser will be called, probably with some callbacks
-         * now only take last 6 bytes and process, i.e. send to kbd
-         */
-
         usb_hid_report_in_callbacks_t *callbacks =
             (usb_hid_report_in_callbacks_t *)malloc(
@@ -249 +262 @@
         callbacks->keyboard = usbkbd_process_keycodes;
 
-        usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
-            NULL);
+        //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
+        //    NULL);
+        printf("Calling usb_hid_boot_keyboard_input_report()...\n)");
+        usb_hid_boot_keyboard_input_report(buffer, actual_size, callbacks, NULL);
 }