Changes in / [474d08e:d20f211] in mainline

Location:

uspace

Files:

• drv/usbhid/hidreq.c (modified) (1 diff)
• drv/usbhid/hidreq.h (modified) (1 diff)
• drv/usbhid/kbddev.c (modified) (13 diffs)
• drv/usbhid/main.c (modified) (1 diff)
• lib/usb/include/usb/debug.h (modified) (1 diff)
• lib/usb/src/debug.c (modified) (1 diff)

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>
@@ -62 +63 @@
 static const size_t BOOTP_BUFFER_SIZE = 8;
 static const size_t BOOTP_BUFFER_OUT_SIZE = 1;
+static const uint8_t IDLE_RATE = 0;
 
 /** Keyboard polling endpoint description for boot protocol class. */
@@ -149 +151 @@
         uint8_t buffer[BOOTP_BUFFER_OUT_SIZE];
         int rc= 0;
-        unsigned i;
         
         memset(buffer, 0, BOOTP_BUFFER_OUT_SIZE);
@@ -177 +178 @@
         }
         
-        // TODO: REFACTOR!!!
-        
-        usb_log_debug("Output report buffer: ");
-        for (i = 0; i < BOOTP_BUFFER_OUT_SIZE; ++i) {
-                usb_log_debug("0x%x ", buffer[i]);
-        }
-        usb_log_debug("\n");
+        usb_log_debug("Output report buffer: %s\n", 
+            usb_debug_str_buffer(buffer, BOOTP_BUFFER_OUT_SIZE, 0));
         
         uint16_t value = 0;
@@ -228 +224 @@
 
         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
@@ -247 +237 @@
                         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
@@ -281 +267 @@
         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);
@@ -389 +371 @@
                 }
         }
+//      // 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);
-        
-        usb_log_debug2("\nNew stored keycodes: ");
-        for (i = 0; i < kbd_dev->keycode_count; ++i) {
-                usb_log_debug2("%d ", kbd_dev->keycodes[i]);
-        }
+
+        usb_log_debug("New stored keycodes: %s\n", 
+            usb_debug_str_buffer(kbd_dev->keycodes, kbd_dev->keycode_count, 0));
 }
 
@@ -410 +399 @@
                 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);
+
+        usb_log_debug("Got keys from parser: %s\n", 
+            usb_debug_str_buffer(key_codes, kbd_dev->keycode_count, 0));
         
         if (count != kbd_dev->keycode_count) {
@@ -444 +429 @@
         callbacks->keyboard = usbhid_kbd_process_keycodes;
 
-        //usb_hid_parse_report(kbd_dev->parser, buffer, actual_size, callbacks, 
-        //    NULL);
-        /*usb_log_debug2("Calling usb_hid_boot_keyboard_input_report() with size"
-            " %zu\n", actual_size);*/
-        //dump_buffer("bufffer: ", buffer, actual_size);
+        usb_log_debug("Calling usb_hid_boot_keyboard_input_report() with "
+            "buffer %s\n", usb_debug_str_buffer(buffer, actual_size, 0));
         
         int rc = usb_hid_boot_keyboard_input_report(buffer, actual_size,
@@ -559 +541 @@
          * Set boot protocol.
          * Set LEDs according to initial setup.
+         * Set Idle rate
          */
         assert(kbd_dev->hid_dev != NULL);
@@ -565 +548 @@
         
         usbhid_kbd_set_led(kbd_dev);
+        
+        usbhid_req_set_idle(kbd_dev->hid_dev, IDLE_RATE);
         
         kbd_dev->initialized = 1;
@@ -634 +619 @@
                 usbhid_kbd_process_data(kbd_dev, buffer, actual_size);
                 
-                async_usleep(kbd_dev->hid_dev->poll_interval);
+                // disabled for now, no reason to sleep
+                //async_usleep(kbd_dev->hid_dev->poll_interval);
         }
 

uspace/drv/usbhid/main.c

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

uspace/lib/usb/include/usb/debug.h

@@ -79 +79 @@
         usb_log_printf(USB_LOG_LEVEL_DEBUG2, format, ##__VA_ARGS__)
 
-const char *usb_debug_str_buffer(uint8_t *, size_t, size_t);
+const char *usb_debug_str_buffer(const uint8_t *, size_t, size_t);
 
 

uspace/lib/usb/src/debug.c

@@ -281 +281 @@
  * @return Dumped buffer as a static (but fibril local) string.
  */
-const char *usb_debug_str_buffer(uint8_t *buffer, size_t size,
+const char *usb_debug_str_buffer(const uint8_t *buffer, size_t size,
     size_t dumped_size)
 {