Changes in uspace/drv/usbhid/kbd/kbddev.c [19e0560e:0d59d0e9] in mainline

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (13 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -72 +72 @@
 static const unsigned DEFAULT_ACTIVE_MODS = KM_NUM_LOCK;
 
+///** Boot protocol report size (key part). */
+//static const size_t BOOTP_REPORT_SIZE = 6;
+
+///** Boot protocol total report size. */
+//static const size_t BOOTP_BUFFER_SIZE = 8;
+
+///** Boot protocol output report size. */
+//static const size_t BOOTP_BUFFER_OUT_SIZE = 1;
+
+///** Boot protocol error key code. */
+//static const uint8_t BOOTP_ERROR_ROLLOVER = 1;
 static const uint8_t ERROR_ROLLOVER = 1;
 
@@ -94 +105 @@
         .flags = 0
 };
+
+//static usb_endpoint_description_t hid_poll_endpoint_description = {
+//      .transfer_type = USB_TRANSFER_INTERRUPT,
+//      .direction = USB_DIRECTION_IN,
+//      .interface_class = USB_CLASS_HID,
+//      .flags = 0
+//};
+
+///* Array of endpoints expected on the device, NULL terminated. */
+//usb_endpoint_description_t 
+//    *usb_kbd_endpoints[USB_KBD_POLL_EP_COUNT + 1] = {
+//      &boot_poll_endpoint_description,
+//      &hid_poll_endpoint_description,
+//      NULL
+//};
 
 const char *HID_KBD_FUN_NAME = "keyboard";
@@ -150 +176 @@
 
 /*----------------------------------------------------------------------------*/
+
+//static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,
+//    uint8_t report_id, void *arg);
+
+//static const usb_hid_report_in_callbacks_t usb_kbd_parser_callbacks = {
+//      .keyboard = usb_kbd_process_keycodes
+//};
+
+/*----------------------------------------------------------------------------*/
 /* Keyboard layouts                                                           */
 /*----------------------------------------------------------------------------*/
@@ -165 +200 @@
 
 /*----------------------------------------------------------------------------*/
+/* Modifier constants                                                         */
+/*----------------------------------------------------------------------------*/
+/** Mapping of USB modifier key codes to generic modifier key codes. */
+//static const keycode_t usbhid_modifiers_keycodes[USB_HID_MOD_COUNT] = {
+//      KC_LCTRL,         /* USB_HID_MOD_LCTRL */
+//      KC_LSHIFT,        /* USB_HID_MOD_LSHIFT */
+//      KC_LALT,          /* USB_HID_MOD_LALT */
+//      0,                /* USB_HID_MOD_LGUI */
+//      KC_RCTRL,         /* USB_HID_MOD_RCTRL */
+//      KC_RSHIFT,        /* USB_HID_MOD_RSHIFT */
+//      KC_RALT,          /* USB_HID_MOD_RALT */
+//      0,                /* USB_HID_MOD_RGUI */
+//};
+
+//typedef enum usbhid_lock_code {
+//      USB_KBD_LOCK_NUM = 0x53,
+//      USB_KBD_LOCK_CAPS = 0x39,
+//      USB_KBD_LOCK_SCROLL = 0x47,
+//      USB_KBD_LOCK_COUNT = 3
+//} usbhid_lock_code;
+
+//static const usbhid_lock_code usbhid_lock_codes[USB_KBD_LOCK_COUNT] = {
+//      USB_KBD_LOCK_NUM,
+//      USB_KBD_LOCK_CAPS,
+//      USB_KBD_LOCK_SCROLL
+//};
+
+/*----------------------------------------------------------------------------*/
 /* IPC method handler                                                         */
 /*----------------------------------------------------------------------------*/
 
 static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+//ddf_dev_ops_t keyboard_ops = {
+//      .default_handler = default_connection_handler
+//};
 
 /** 
@@ -235 +301 @@
                 return;
         }
-
+                
         /* Reset the LED data. */
         memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t));
@@ -429 +495 @@
  */
 static void usb_kbd_check_key_changes(usb_hid_dev_t *hid_dev, 
-    usb_kbd_t *kbd_dev)
+    usb_kbd_t *kbd_dev/*, const uint8_t *key_codes, size_t count*/)
 {
         unsigned int key;
@@ -501 +567 @@
         }
         
+//      usb_log_debug("Old keys: ");
+//      for (i = 0; i < kbd_dev->key_count; ++i) {
+//              usb_log_debug("%d ", kbd_dev->keys_old[i]);
+//      }
+//      usb_log_debug("\n");
+        
+        
+//      usb_log_debug("New keys: ");
+//      for (i = 0; i < kbd_dev->key_count; ++i) {
+//              usb_log_debug("%d ", kbd_dev->keys[i]);
+//      }
+//      usb_log_debug("\n");
+        
         memcpy(kbd_dev->keys_old, kbd_dev->keys, kbd_dev->key_count * 4);
         
@@ -511 +590 @@
 
 /*----------------------------------------------------------------------------*/
+/* Callbacks for parser                                                       */
+/*----------------------------------------------------------------------------*/
+/**
+ * Callback function for the HID report parser.
+ *
+ * This function is called by the HID report parser with the parsed report.
+ * The parsed report is used to check if any events occured (key was pressed or
+ * released, modifier was pressed or released).
+ *
+ * @param key_codes Parsed keyboard report - codes of currently pressed keys 
+ *                  according to HID Usage Tables.
+ * @param count Number of key codes in report (size of the report).
+ * @param report_id
+ * @param arg User-specified argument. Expects pointer to the keyboard device
+ *            structure representing the keyboard.
+ *
+ * @sa usb_kbd_check_key_changes(), usb_kbd_check_modifier_changes()
+ */
+//static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,
+//    uint8_t report_id, void *arg)
+//{
+//      if (arg == NULL) {
+//              usb_log_warning("Missing argument in callback "
+//                  "usbhid_process_keycodes().\n");
+//              return;
+//      }
+        
+//      usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
+        
+//      if (hid_dev->data == NULL) {
+//              usb_log_warning("Missing KBD device structure in callback.\n");
+//              return;
+//      }
+        
+//      usb_kbd_t *kbd_dev = (usb_kbd_t *)hid_dev->data;
+
+//      usb_log_debug("Got keys from parser (report id: %u): %s\n", 
+//          report_id, usb_debug_str_buffer(key_codes, count, 0));
+        
+//      if (count != kbd_dev->key_count) {
+//              usb_log_warning("Number of received keycodes (%zu) differs from"
+//                  " expected (%zu).\n", count, kbd_dev->key_count);
+//              return;
+//      }
+        
+//      ///usb_kbd_check_modifier_changes(kbd_dev, key_codes, count);
+//      usb_kbd_check_key_changes(hid_dev, kbd_dev, key_codes, count);
+//}
+
+/*----------------------------------------------------------------------------*/
 /* General kbd functions                                                      */
 /*----------------------------------------------------------------------------*/
@@ -539 +668 @@
             "buffer %s\n", usb_debug_str_buffer(buffer, actual_size, 0));
         
+//      int rc = usb_hid_boot_keyboard_input_report(buffer, actual_size,
+//          callbacks, kbd_dev);
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
+        //usb_hid_report_path_set_report_id(path, 0);
 
         uint8_t report_id;
@@ -566 +698 @@
                 
                 assert(i < kbd_dev->key_count);
+//              if (i == kbd_dev->key_count) {
+//                      break;
+//              }
                 
                 // save the key usage
+                /* TODO: maybe it's not good to save value, nor usage
+                 *       as the value may be e.g. 1 for LEDs and usage may be
+                 *       value of the LED. On the other hand, in case of normal
+                 *       keys, the usage is more important and we must check
+                 *       that. One possible solution: distinguish between those
+                 *       two parts of the Report somehow.
+                 */
                 if (field->value != 0) {
                         kbd_dev->keys[i] = field->usage;
@@ -754 +896 @@
                 usb_log_warning("Error creating output report buffer.\n");
                 free(kbd_dev->keys);
-                return ENOMEM;
+                return ENOMEM;  /* TODO: other error code */
         }
         
@@ -809 +951 @@
         
         // save the KBD device structure into the HID device structure
+        //hid_dev->data = kbd_dev;
         *data = kbd_dev;
         
@@ -895 +1038 @@
         
         if ((*kbd_dev)->repeat_mtx != NULL) {
-                //assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
-                while (fibril_mutex_is_locked((*kbd_dev)->repeat_mtx)) {}
+                /* TODO: replace by some check and wait */
+                assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
                 free((*kbd_dev)->repeat_mtx);
         }