Changes in / [ec6bee4:bda06a3] in mainline

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/usbhid/Makefile (deleted)
• uspace/drv/usbhid/main.c (deleted)
• uspace/drv/usbhid/usbhid.c (deleted)
• uspace/drv/usbhid/usbhid.h (deleted)
• uspace/drv/usbhid/usbhid.ma (deleted)
• uspace/drv/usbkbd/kbddev.c (modified) (5 diffs)
• uspace/drv/usbkbd/main.c (modified) (5 diffs)

boot/arch/amd64/Makefile.inc

@@ -50 +50 @@
         usbhub \
         usbkbd \
-        usbhid \
         usbmid \
         usbmouse \

uspace/Makefile

@@ -123 +123 @@
                 drv/usbflbk \
                 drv/usbkbd \
-                drv/usbhid \
                 drv/usbhub \
                 drv/usbmid \
@@ -144 +143 @@
                 drv/usbflbk \
                 drv/usbkbd \
-                drv/usbhid \
                 drv/usbhub \
                 drv/usbmid \

uspace/drv/usbkbd/kbddev.c

@@ -70 +70 @@
 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;
+/** 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;
 
 /** Default idle rate for keyboards. */
@@ -265 +264 @@
 static void usb_kbd_set_led(usb_kbd_t *kbd_dev) 
 {
+//      uint8_t buffer[BOOTP_BUFFER_OUT_SIZE];
+//      int rc= 0;
+        
+//      memset(buffer, 0, BOOTP_BUFFER_OUT_SIZE);
+//      uint8_t leds = 0;
+
         unsigned i = 0;
-        
-        /* Reset the LED data. */
-        memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t));
         
         if ((kbd_dev->mods & KM_NUM_LOCK) && (i < kbd_dev->led_output_size)) {
                 kbd_dev->led_data[i++] = USB_HID_LED_NUM_LOCK;
+//              leds |= USB_HID_LED_NUM_LOCK;
+        }
+        else {
+            kbd_dev->led_data[i++] = 0;
         }
         
         if ((kbd_dev->mods & KM_CAPS_LOCK) && (i < kbd_dev->led_output_size)) {
                 kbd_dev->led_data[i++] = USB_HID_LED_CAPS_LOCK;
+//              leds |= USB_HID_LED_CAPS_LOCK;
+        }
+        else {
+            kbd_dev->led_data[i++] = 0;
         }
         
@@ -281 +291 @@
             && (i < kbd_dev->led_output_size)) {
                 kbd_dev->led_data[i++] = USB_HID_LED_SCROLL_LOCK;
+//              leds |= USB_HID_LED_SCROLL_LOCK;
+        }
+        else {
+            kbd_dev->led_data[i++] = 0;
+        }
+        
+        usb_log_debug("Output report data: ");
+        for (i = 0; i < kbd_dev->led_output_size; ++i) {
+                usb_log_debug("%u: %d", i, kbd_dev->led_data[i]);
         }
 
@@ -296 +315 @@
                 return;
         }
+        
+//      if ((rc = usb_hid_boot_keyboard_output_report(
+//          leds, buffer, BOOTP_BUFFER_OUT_SIZE)) != EOK) {
+//              usb_log_warning("Error composing output report to the keyboard:"
+//                  "%s.\n", str_error(rc));
+//              return;
+//      }
         
         usb_log_debug("Output report buffer: %s\n", 
@@ -454 +480 @@
          * First of all, check if the kbd have reported phantom state.
          *
-         * As there is no way to distinguish keys from modifiers, we do not have
-         * a way to check that 'all keys report Error Rollover'. We thus check
-         * if there is at least one such error and in such case we ignore the
-         * whole input report.
+         *  this must be changed as we don't know which keys are modifiers
+         *       and which are regular keys.
          */
         i = 0;
-        while (i < count && key_codes[i] != ERROR_ROLLOVER) {
+        // all fields should report Error Rollover
+        while (i < count &&
+            key_codes[i] == BOOTP_ERROR_ROLLOVER) {
                 ++i;
         }
-        if (i != count) {
+        if (i == count) {
                 usb_log_debug("Phantom state occured.\n");
                 // phantom state, do nothing

uspace/drv/usbkbd/main.c

@@ -33 +33 @@
 /**
  * @file
- * Main routines of USB KBD driver.
+ * Main routines of USB HID driver.
  */
 
@@ -75 +75 @@
  * @sa usb_kbd_fibril(), usb_kbd_repeat_fibril()
  */
-static int usb_kbd_try_add_device(usb_device_t *dev)
+static int usbhid_try_add_device(usb_device_t *dev)
 {
         /* Create the function exposed under /dev/devices. */
@@ -195 +195 @@
  * @retval EREFUSED if the device is not supported.
  */
-static int usb_kbd_add_device(usb_device_t *dev)
+static int usbhid_add_device(usb_device_t *dev)
 {
-        usb_log_debug("usb_kbd_add_device()\n");
+        usb_log_debug("usbhid_add_device()\n");
         
         if (dev->interface_no < 0) {
                 usb_log_warning("Device is not a supported keyboard.\n");
-                usb_log_error("Failed to add USB KBD device: endpoint not found."
+                usb_log_error("Failed to add HID device: endpoint not found."
                     "\n");
                 return ENOTSUP;
         }
         
-        int rc = usb_kbd_try_add_device(dev);
+        int rc = usbhid_try_add_device(dev);
         
         if (rc != EOK) {
                 usb_log_warning("Device is not a supported keyboard.\n");
-                usb_log_error("Failed to add KBD device: %s.\n",
+                usb_log_error("Failed to add HID device: %s.\n",
                     str_error(rc));
                 return rc;
@@ -224 +224 @@
 /* Currently, the framework supports only device adding. Once the framework
  * supports unplug, more callbacks will be added. */
-static usb_driver_ops_t usb_kbd_driver_ops = {
-        .add_device = usb_kbd_add_device,
+static usb_driver_ops_t usbhid_driver_ops = {
+        .add_device = usbhid_add_device,
 };
 
 
 /* The driver itself. */
-static usb_driver_t usb_kbd_driver = {
+static usb_driver_t usbhid_driver = {
         .name = NAME,
-        .ops = &usb_kbd_driver_ops,
+        .ops = &usbhid_driver_ops,
         .endpoints = usb_kbd_endpoints
 };
@@ -238 +238 @@
 /*----------------------------------------------------------------------------*/
 
+//static driver_ops_t kbd_driver_ops = {
+//      .add_device = usbhid_add_device,
+//};
+
+///*----------------------------------------------------------------------------*/
+
+//static driver_t kbd_driver = {
+//      .name = NAME,
+//      .driver_ops = &kbd_driver_ops
+//};
+
+/*----------------------------------------------------------------------------*/
+
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS USB KBD driver.\n");
+        printf(NAME ": HelenOS USB HID driver.\n");
 
         usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
-        return usb_driver_main(&usb_kbd_driver);
+        return usb_driver_main(&usbhid_driver);
 }