Changes in uspace/drv/usbkbd/main.c [71ed4849:1f383dde] in mainline

File:

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

uspace/drv/usbkbd/main.c

@@ -29 +29 @@
 #include <driver.h>
 #include <ipc/driver.h>
-#include <ipc/kbd.h>
-#include <io/keycode.h>
-#include <io/console.h>
 #include <errno.h>
 #include <fibril.h>
@@ -38 +35 @@
 #include <usb/devreq.h>
 #include <usb/descriptor.h>
+#include "descparser.h"
 
 #define BUFFER_SIZE 32
@@ -43 +41 @@
 
 #define GUESSED_POLL_ENDPOINT 1
-
-static void default_connection_handler(device_t *, ipc_callid_t, ipc_call_t *);
-static device_ops_t keyboard_ops = {
-        .default_handler = default_connection_handler
-};
-
-static int console_callback_phone = -1;
-
-/** Default handler for IPC methods not handled by DDF.
- *
- * @param dev Device handling the call.
- * @param icallid Call id.
- * @param icall Call data.
- */
-void default_connection_handler(device_t *dev,
-    ipc_callid_t icallid, ipc_call_t *icall)
-{
-        sysarg_t method = IPC_GET_IMETHOD(*icall);
-
-        if (method == IPC_M_CONNECT_TO_ME) {
-                int callback = IPC_GET_ARG5(*icall);
-
-                if (console_callback_phone != -1) {
-                        ipc_answer_0(icallid, ELIMIT);
-                        return;
-                }
-
-                console_callback_phone = callback;
-                ipc_answer_0(icallid, EOK);
-                return;
-        }
-
-        ipc_answer_0(icallid, EINVAL);
-}
-
-static void send_key(int key, int type, wchar_t c) {
-        async_msg_4(console_callback_phone, KBD_EVENT, type, key,
-            KM_NUM_LOCK, c);
-}
-
-static void send_alnum(int key, wchar_t c) {
-        printf(NAME ": sending key '%lc' to console\n", (wint_t) c);
-        send_key(key, KEY_PRESS, c);
-        send_key(key, KEY_RELEASE, c);
-}
 
 /*
@@ -95 +48 @@
                                     void *arg)
 {
-
+        printf("Got keys: ");
+        unsigned i;
+        for (i = 0; i < count; ++i) {
+                printf("%d ", key_codes[i]);
+        }
+        printf("\n");
 }
 
@@ -101 +59 @@
  * Kbd functions
  */
-static int usbkbd_parse_descriptors(usb_hid_dev_kbd_t *kbd_dev,
-                                    const uint8_t *data, size_t size)
-{
-//      const uint8_t *pos = data;
-        
-//      // get the configuration descriptor (should be first)
-//      if (*pos != sizeof(usb_standard_configuration_descriptor_t)
-//          || *(pos + 1) != USB_DESCTYPE_CONFIGURATION) {
-//              fprintf(stderr, "Wrong format of configuration descriptor");
-//              return EINVAL;
-//      }
-        
-//      usb_standard_configuration_descriptor_t config_descriptor;
-//      memcpy(&config_descriptor, pos, 
-//          sizeof(usb_standard_configuration_descriptor_t));
-//      pos += sizeof(usb_standard_configuration_descriptor_t);
-        
-//      // parse other descriptors
-//      while (pos - data < size) {
-//              //uint8_t desc_size = *pos;
-//              uint8_t desc_type = *(pos + 1);
-//              switch (desc_type) {
-//              case USB_DESCTYPE_INTERFACE:
-//                      break;
-//              case USB_DESCTYPE_ENDPOINT:
-//                      break;
-//              case USB_DESCTYPE_HID:
-//                      break;
-//              case USB_DESCTYPE_HID_REPORT:
-//                      break;
-//              case USB_DESCTYPE_HID_PHYSICAL:
-//                      break;
-//              }
-//      }
-        
-        return EOK;
-}
-
-static int usbkbd_get_descriptors(usb_hid_dev_kbd_t *kbd_dev)
-{
-        // get the first configuration descriptor (TODO: or some other??)
+static int usbkbd_process_descriptors(usb_hid_dev_kbd_t *kbd_dev)
+{
+        // get the first configuration descriptor (TODO: parse also other!)
         usb_standard_configuration_descriptor_t config_desc;
         
@@ -170 +90 @@
         }
         
-        rc = usbkbd_parse_descriptors(kbd_dev, descriptors, transferred);
+        kbd_dev->conf = (usb_hid_configuration_t *)calloc(1, 
+            sizeof(usb_hid_configuration_t));
+        if (kbd_dev->conf == NULL) {
+                free(descriptors);
+                return ENOMEM;
+        }
+        
+        rc = usbkbd_parse_descriptors(descriptors, transferred, kbd_dev->conf);
         free(descriptors);
         
+        //usbkbd_print_config(kbd_dev->conf);
+        
         return rc;
 }
@@ -178 +107 @@
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
 {
-        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)malloc(
-                        sizeof(usb_hid_dev_kbd_t));
+        usb_hid_dev_kbd_t *kbd_dev = (usb_hid_dev_kbd_t *)calloc(1, 
+            sizeof(usb_hid_dev_kbd_t));
 
         if (kbd_dev == NULL) {
@@ -190 +119 @@
         // 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->device->parent_phone = usb_drv_hc_connect(dev, 0);
 
         kbd_dev->address = usb_drv_get_my_address(dev->parent_phone,
@@ -212 +141 @@
          */
 
-        // TODO: get descriptors
-        usbkbd_get_descriptors(kbd_dev);
-        // TODO: parse descriptors and save endpoints
+        // TODO: get descriptors, parse descriptors and save endpoints
+        usbkbd_process_descriptors(kbd_dev);
 
         return kbd_dev;
@@ -231 +159 @@
                 sizeof(usb_hid_report_in_callbacks_t));
         callbacks->keyboard = usbkbd_process_keycodes;
-
-        if (console_callback_phone != -1) {
-                static size_t counter = 0;
-                counter++;
-                if (counter > 3) {
-                        counter = 0;
-                        send_alnum(KC_A, L'a');
-                }
-        }
 
         usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
@@ -325 +244 @@
          * Not supported yet, skip..
          */
-//      int phone = usb_drv_hc_connect_auto(dev, 0);
+//      int phone = usb_drv_hc_connect(dev, 0);
 //      if (phone < 0) {
 //              /*
@@ -346 +265 @@
         fibril_add_ready(fid);
 
-        dev->ops = &keyboard_ops;
-
-        add_device_to_class(dev, "keyboard");
-
         /*
          * Hurrah, device is initialized.