Changes in / [00db345a:474d08e] in mainline

Location:

uspace/drv

Files:

• uhci-hcd/main.c (modified) (1 diff)
• usbhid/hidreq.c (modified) (1 diff)
• usbhid/hidreq.h (modified) (1 diff)
• usbhid/kbddev.c (modified) (10 diffs)
• usbhid/main.c (modified) (1 diff)

uspace/drv/uhci-hcd/main.c ¶

@@ -158 +158 @@
 {
         sleep(3);
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
         return ddf_driver_main(&uhci_driver);

uspace/drv/usbhid/hidreq.c ¶

@@ -143 +143 @@
 /*----------------------------------------------------------------------------*/
 
-int usbhid_req_set_idle(usbhid_dev_t *hid_dev, uint8_t duration)
-{
-        if (hid_dev == NULL) {
-                usb_log_error("usbhid_req_set_idle(): no HID device "
-                    "structure given.\n");
-                return EINVAL;
-        }
-        
-        /*
-         * No need for checking other parameters, as they are checked in
-         * the called function (usb_control_request_set()).
-         */
-        
-        int rc, sess_rc;
-        
-        sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
-        if (sess_rc != EOK) {
-                usb_log_warning("Failed to start a session: %s.\n",
-                    str_error(sess_rc));
-                return sess_rc;
-        }
-
-        usb_log_debug("Sending Set_Idle request to the device ("
-            "duration: %u, iface: %d).\n", duration, hid_dev->iface);
-        
-        uint16_t value = duration << 8;
-        
-        rc = usb_control_request_set(&hid_dev->ctrl_pipe, 
-            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 
-            USB_HIDREQ_SET_IDLE, value, hid_dev->iface, NULL, 0);
-
-        sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
-
-        if (rc != EOK) {
-                usb_log_warning("Error sending output report to the keyboard: "
-                    "%s.\n", str_error(rc));
-                return rc;
-        }
-
-        if (sess_rc != EOK) {
-                usb_log_warning("Error closing session: %s.\n",
-                    str_error(sess_rc));
-                return sess_rc;
-        }
-        
-        return EOK;
-}
-
-/*----------------------------------------------------------------------------*/
-
 /**
  * @}

uspace/drv/usbhid/hidreq.h ¶

@@ -50 +50 @@
 int usbhid_req_set_protocol(usbhid_dev_t *hid_dev, usb_hid_protocol_t protocol);
 
-int usbhid_req_set_idle(usbhid_dev_t *hid_dev, uint8_t duration);
-
 /*----------------------------------------------------------------------------*/
 

uspace/drv/usbhid/kbddev.c ¶

@@ -38 +38 @@
 #include <str_error.h>
 #include <fibril.h>
-#include <stdio.h>
 
 #include <io/keycode.h>
@@ -63 +62 @@
 static const size_t BOOTP_BUFFER_SIZE = 8;
 static const size_t BOOTP_BUFFER_OUT_SIZE = 1;
-static const uint8_t IDLE_RATE = 125;
 
 /** Keyboard polling endpoint description for boot protocol class. */
@@ -230 +228 @@
 
         if (mod_mask != 0) {
+                usb_log_debug2("\n\nChanging mods and lock keys\n");
+                usb_log_debug2("\nmods before: 0x%x\n", kbd_dev->mods);
+                usb_log_debug2("\nLock keys before:0x%x\n\n", 
+                    kbd_dev->lock_keys);
+                
                 if (type == KEY_PRESS) {
+                        usb_log_debug2("\nKey pressed.\n");
                         /*
                          * Only change lock state on transition from released
@@ -243 +247 @@
                         usbhid_kbd_set_led(kbd_dev);
                 } else {
+                        usb_log_debug2("\nKey released.\n");
                         kbd_dev->lock_keys = kbd_dev->lock_keys & ~mod_mask;
                 }
         }
 
+        usb_log_debug2("\n\nmods after: 0x%x\n", kbd_dev->mods);
+        usb_log_debug2("\nLock keys after: 0x%x\n\n", kbd_dev->lock_keys);
+        
         if (key == KC_CAPS_LOCK || key == KC_NUM_LOCK || key == KC_SCROLL_LOCK) {
                 // do not send anything to the console, this is our business
@@ -273 +281 @@
         ev.key = key;
         ev.mods = kbd_dev->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);
@@ -377 +389 @@
                 }
         }
-//      // report all currently pressed keys
-//      for (i = 0; i < kbd_dev->keycode_count; ++i) {
-//              if (key_codes[i] != 0) {
-//                      key = usbhid_parse_scancode(key_codes[i]);
-//                      usb_log_debug2("\nKey pressed: %d (keycode: %d)\n", key,
-//                          key_codes[i]);
-//                      usbhid_kbd_push_ev(kbd_dev, KEY_PRESS, key);
-//              }
-//      }
         
         memcpy(kbd_dev->keycodes, key_codes, kbd_dev->keycode_count);
         
-        char *kc = (char *)malloc(kbd_dev->keycode_count * 4 + 1);
+        usb_log_debug2("\nNew stored keycodes: ");
         for (i = 0; i < kbd_dev->keycode_count; ++i) {
-                snprintf(kc + (i * 4), 5, "%4d", key_codes[i]);
-        }
-        usb_log_debug("New stored keycodes: %s\n", kc);
+                usb_log_debug2("%d ", kbd_dev->keycodes[i]);
+        }
 }
 
@@ -408 +410 @@
                 return;
         }
+
+        usb_log_debug2("Got keys from parser: ");
+        unsigned i;
+        for (i = 0; i < count; ++i) {
+                usb_log_debug2("%d ", key_codes[i]);
+        }
+        usb_log_debug2("\n");
         
         usbhid_kbd_t *kbd_dev = (usbhid_kbd_t *)arg;
         assert(kbd_dev != NULL);
-
-        unsigned i;
-        char *kc = (char *)malloc(kbd_dev->keycode_count * 4 + 1);
-        for (i = 0; i < kbd_dev->keycode_count; ++i) {
-                snprintf(kc + (i * 4), 5, "%4d", key_codes[i]);
-        }
-        usb_log_debug("Got keys from parser: %s\n", kc);
         
         if (count != kbd_dev->keycode_count) {
@@ -444 +446 @@
         //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
         //    NULL);
-        /*//usb_log_debug2("Calling usb_hid_boot_keyboard_input_report() with size"
+        /*usb_log_debug2("Calling usb_hid_boot_keyboard_input_report() with size"
             " %zu\n", actual_size);*/
         //dump_buffer("bufffer: ", buffer, actual_size);
@@ -557 +559 @@
          * Set boot protocol.
          * Set LEDs according to initial setup.
-         * Set Idle rate
          */
         assert(kbd_dev->hid_dev != NULL);
@@ -564 +565 @@
         
         usbhid_kbd_set_led(kbd_dev);
-        
-        usbhid_req_set_idle(kbd_dev->hid_dev, IDLE_RATE);
         
         kbd_dev->initialized = 1;

uspace/drv/usbhid/main.c ¶

@@ -80 +80 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
         return ddf_driver_main(&kbd_driver);
 }