Changeset d972534 in mainline for uspace/drv/usbhid/main.c

Timestamp:

2011-02-24T23:32:04Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

54e682f

Parents:

f2ba5d9f

Message:

LED setting

• LEDs are determined from remembered modifiers (not good, as that doesn't work well).
• Added function for sending a Set_Report(Output) request (specific, have to make it generic later).
• Added a lot of debug output.
• Added HID Report Type constants to libusb (hid.h).
• Added constants for LEDs (hidparser.h).
• Modified function for composing output reports in hidparser.

File:

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

uspace/drv/usbhid/main.c

@@ -59 +59 @@
 
 #define BUFFER_SIZE 8
+#define BUFFER_OUT_SIZE 1
 #define NAME "usbhid"
 
@@ -122 +123 @@
 
 static void dump_buffer(const char *msg, const uint8_t *buffer, size_t length)
-{
+{uint8_t buffer[BUFFER_SIZE];
         printf("%s\n", msg);
         
@@ -161 +162 @@
 static int active_layout = 0;
 
-static void kbd_push_ev(int type, unsigned int key)
+static void usbkbd_req_set_report(usb_hid_dev_kbd_t *kbd_dev, uint8_t *buffer,
+    size_t buf_size)
+{
+        int rc, sess_rc;
+        
+        sess_rc = usb_endpoint_pipe_start_session(&kbd_dev->ctrl_pipe);
+        if (sess_rc != EOK) {
+                usb_log_warning("Failed to start a session: %s.\n",
+                    str_error(sess_rc));
+                return;
+        }
+
+        usb_log_debug("Sending Set_Report request to the device.\n");
+        // TODO: determine what interface to use!! (now set to 1)
+        rc = usb_control_request_set(&kbd_dev->ctrl_pipe, 
+            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 
+            USB_HIDREQ_SET_REPORT, USB_HID_REPORT_TYPE_OUTPUT,
+            1, buffer, buf_size);
+
+        sess_rc = usb_endpoint_pipe_end_session(&kbd_dev->ctrl_pipe);
+
+        if (rc != EOK) {
+                usb_log_warning("Error sending output report to the keyboard: "
+                    "%s.\n", str_error(rc));
+                return;
+        }
+
+        if (sess_rc != EOK) {
+                usb_log_warning("Error closing session: %s.\n",
+                    str_error(sess_rc));
+                return;
+        }
+}
+
+static void usbkbd_set_led(unsigned mods, usb_hid_dev_kbd_t *kbd_dev) 
+{
+        uint8_t buffer[BUFFER_SIZE];
+        int rc= 0;
+        
+        uint8_t leds = 0;
+
+        if (mods & KM_NUM_LOCK) {
+                leds |= USB_HID_LED_NUM_LOCK;
+        }
+        
+        if (mods & KM_CAPS_LOCK) {
+                leds |= USB_HID_LED_CAPS_LOCK;
+        }
+        
+        if (mods & KM_SCROLL_LOCK) {
+                leds |= USB_HID_LED_SCROLL_LOCK;
+        }
+
+        // TODO: COMPOSE and KANA
+        
+        usb_log_debug("Creating output report.\n");
+        if ((rc = usb_hid_boot_keyboard_output_report(
+            leds, buffer, BUFFER_SIZE)) != EOK) {
+                usb_log_warning("Error composing output report to the keyboard:"
+                    "%s.\n", str_error(rc));
+                return;
+        }
+        
+        usbkbd_req_set_report(kbd_dev, buffer, BUFFER_SIZE);
+}
+
+static void kbd_push_ev(int type, unsigned int key, usb_hid_dev_kbd_t *kbd_dev)
 {
         console_event_t ev;
@@ -185 +252 @@
 
         switch (key) {
-        case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; break;
-        case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; break;
-        case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; break;
+        case KC_CAPS_LOCK: mod_mask = KM_CAPS_LOCK; usb_log_debug("\n\nPushing CAPS LOCK! (mask: %u)\n\n", mod_mask); break;
+        case KC_NUM_LOCK: mod_mask = KM_NUM_LOCK; usb_log_debug("\n\nPushing NUM LOCK! (mask: %u)\n\n", mod_mask); break;
+        case KC_SCROLL_LOCK: mod_mask = KM_SCROLL_LOCK; usb_log_debug("\n\nPushing SCROLL LOCK! (mask: %u)\n\n", mod_mask); break;
         default: mod_mask = 0; break;
         }
 
         if (mod_mask != 0) {
+                usb_log_debug("\n\nChanging mods and lock keys\n\n");
+                usb_log_debug("\n\nmods before: 0x%x\n\n", mods);
+                usb_log_debug("\n\nLock keys before:0x%x\n\n", lock_keys);
+                
                 if (type == KEY_PRESS) {
                         /*
@@ -202 +273 @@
 
                         /* Update keyboard lock indicator lights. */
-                        // TODO
-                        //kbd_ctl_set_ind(mods);
+                        usbkbd_set_led(mods, kbd_dev);
                 } else {
                         lock_keys = lock_keys & ~mod_mask;
@@ -213 +283 @@
         usb_log_debug2("keycode: %u\n", key);
 */
+        usb_log_debug("\n\nmods after: 0x%x\n\n", mods);
+        usb_log_debug("\n\nLock keys after: 0x%x\n\n", lock_keys);
         
         if (type == KEY_PRESS && (mods & KM_LCTRL) &&
@@ -238 +310 @@
         ev.key = key;
         ev.mods = mods;
+        
+        if (ev.mods & KM_NUM_LOCK) {
+                usb_log_debug("\n\nNum Lock turned on.\n\n");
+        }
 
         ev.c = layout[active_layout]->parse_ev(&ev);
@@ -288 +364 @@
                         if (usb_hid_modifiers_keycodes[i] != 0) {
                                 kbd_push_ev(KEY_PRESS, 
-                                    usb_hid_modifiers_keycodes[i]);
+                                    usb_hid_modifiers_keycodes[i], kbd_dev);
                         }
                 } else if (!(modifiers & usb_hid_modifiers_consts[i]) &&
@@ -295 +371 @@
                         if (usb_hid_modifiers_keycodes[i] != 0) {
                                 kbd_push_ev(KEY_RELEASE, 
-                                    usb_hid_modifiers_keycodes[i]);
+                                    usb_hid_modifiers_keycodes[i], kbd_dev);
                         }
                 }       // no change
@@ -323 +399 @@
                         // not found, i.e. the key was released
                         key = usbkbd_parse_scancode(kbd_dev->keycodes[j]);
-                        kbd_push_ev(KEY_RELEASE, key);
+                        kbd_push_ev(KEY_RELEASE, key, kbd_dev);
                 } else {
                         // found, nothing happens
@@ -343 +419 @@
                         // not found, i.e. new key pressed
                         key = usbkbd_parse_scancode(key_codes[i]);
-                        kbd_push_ev(KEY_PRESS, key);
+                        kbd_push_ev(KEY_PRESS, key, kbd_dev);
                 } else {
                         // found, nothing happens
@@ -621 +697 @@
 
         while (true) {
-                async_usleep(1000 * 10);
+                async_usleep(1000 * 1000);
 
                 sess_rc = usb_endpoint_pipe_start_session(&kbd_dev->poll_pipe);