Changeset e50cd7f in mainline for uspace/drv/usbkbd

Timestamp:

2011-04-17T19:17:55Z (15 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

ef354b6 (diff), 8595577b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

new report structure fixes

Location:

uspace/drv/usbkbd

Files:

• kbddev.c (modified) (6 diffs)
• main.c (modified) (7 diffs)
• usbkbd.ma (modified) (1 diff)

uspace/drv/usbkbd/kbddev.c

@@ -268 +268 @@
 static void usb_kbd_set_led(usb_kbd_t *kbd_dev) 
 {
+        if (kbd_dev->output_size == 0) {
+                return;
+        }
+
         unsigned i = 0;
         
@@ -544 +548 @@
  *                  according to HID Usage Tables.
  * @param count Number of key codes in report (size of the report).
- * @param modifiers Bitmap of modifiers (Ctrl, Alt, Shift, GUI).
+ * @param report_id
  * @param arg User-specified argument. Expects pointer to the keyboard device
  *            structure representing the keyboard.
@@ -551 +555 @@
  */
 static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,
-    uint8_t modifiers, void *arg)
+    uint8_t report_id, void *arg)
 {
         if (arg == NULL) {
@@ -562 +566 @@
         assert(kbd_dev != NULL);
 
-        usb_log_debug("Got keys from parser (report id: %d): %s\n", modifiers, 
+        usb_log_debug("Got keys from parser (report id: %d): %s\n", report_id, 
             usb_debug_str_buffer(key_codes, count, 0));
         
@@ -763 +767 @@
         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);
+        
         kbd_dev->key_count = usb_hid_report_input_length(
             kbd_dev->parser, path, USB_HID_PATH_COMPARE_END);
@@ -796 +803 @@
         
         kbd_dev->led_output_size = usb_hid_report_output_size(kbd_dev->parser, 
-            kbd_dev->led_path, USB_HID_PATH_COMPARE_END);
+            kbd_dev->led_path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         
         usb_log_debug("Output report size (in items): %zu\n", 

uspace/drv/usbkbd/main.c

@@ -33 +33 @@
 /**
  * @file
- * Main routines of USB HID driver.
+ * Main routines of USB KBD driver.
  */
 
@@ -42 +42 @@
 
 #include <usb/devdrv.h>
+#include <usb/devpoll.h>
 
 #include "kbddev.h"
@@ -75 +76 @@
  * @sa usb_kbd_fibril(), usb_kbd_repeat_fibril()
  */
-static int usbhid_try_add_device(usb_device_t *dev)
+static int usb_kbd_try_add_device(usb_device_t *dev)
 {
         /* Create the function exposed under /dev/devices. */
@@ -105 +106 @@
                 usb_kbd_free(&kbd_dev);
                 return rc;
-        }       
+        }
         
         usb_log_debug("USB/HID KBD device structure initialized.\n");
@@ -195 +196 @@
  * @retval EREFUSED if the device is not supported.
  */
-static int usbhid_add_device(usb_device_t *dev)
+static int usb_kbd_add_device(usb_device_t *dev)
 {
-        usb_log_debug("usbhid_add_device()\n");
+        usb_log_debug("usb_kbd_add_device()\n");
         
         if (dev->interface_no < 0) {
                 usb_log_warning("Device is not a supported keyboard.\n");
-                usb_log_error("Failed to add HID device: endpoint not found."
-                    "\n");
+                usb_log_error("Failed to add USB KBD device: endpoint not "
+                    "found.\n");
                 return ENOTSUP;
         }
         
-        int rc = usbhid_try_add_device(dev);
+        int rc = usb_kbd_try_add_device(dev);
         
         if (rc != EOK) {
                 usb_log_warning("Device is not a supported keyboard.\n");
-                usb_log_error("Failed to add HID device: %s.\n",
+                usb_log_error("Failed to add KBD device: %s.\n",
                     str_error(rc));
                 return rc;
@@ -224 +225 @@
 /* Currently, the framework supports only device adding. Once the framework
  * supports unplug, more callbacks will be added. */
-static usb_driver_ops_t usbhid_driver_ops = {
-        .add_device = usbhid_add_device,
+static usb_driver_ops_t usb_kbd_driver_ops = {
+        .add_device = usb_kbd_add_device,
 };
 
 
 /* The driver itself. */
-static usb_driver_t usbhid_driver = {
+static usb_driver_t usb_kbd_driver = {
         .name = NAME,
-        .ops = &usbhid_driver_ops,
+        .ops = &usb_kbd_driver_ops,
         .endpoints = usb_kbd_endpoints
 };
@@ -238 +239 @@
 /*----------------------------------------------------------------------------*/
 
-//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 HID driver.\n");
+        printf(NAME ": HelenOS USB KBD driver.\n");
 
         usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
-        return usb_driver_main(&usbhid_driver);
+        return usb_driver_main(&usb_kbd_driver);
 }
 

uspace/drv/usbkbd/usbkbd.ma

@@ -1 @@
-100 usb&interface&class=HID&subclass=0x01&protocol=0x01
-10 usb&interface&class=HID
+10 usb&interface&class=HID&subclass=0x01&protocol=0x01