Changeset 6bb456c in mainline

Timestamp:

2011-03-05T20:07:47Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

35f0899, d20f211

Parents:

1efe89b

Message:

Idle rate set to infinity, no sleep in polling + minor changes.

Location:

uspace/drv

Files:

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

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/kbddev.c

@@ -63 +63 @@
 static const size_t BOOTP_BUFFER_SIZE = 8;
 static const size_t BOOTP_BUFFER_OUT_SIZE = 1;
-static const uint8_t IDLE_RATE = 125;
+static const uint8_t IDLE_RATE = 0;
 
 /** Keyboard polling endpoint description for boot protocol class. */
@@ -151 +151 @@
         uint8_t buffer[BOOTP_BUFFER_OUT_SIZE];
         int rc= 0;
-        unsigned i;
         
         memset(buffer, 0, BOOTP_BUFFER_OUT_SIZE);
@@ -179 +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;
@@ -388 +382 @@
         
         memcpy(kbd_dev->keycodes, key_codes, kbd_dev->keycode_count);
-        
-        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("New stored keycodes: %s\n", kc);
+
+        usb_log_debug("New stored keycodes: %s\n", 
+            usb_debug_str_buffer(kbd_dev->keycodes, kbd_dev->keycode_count, 0));
 }
 
@@ -412 +403 @@
         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);
+        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) {
@@ -442 +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,
@@ -635 +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);
         }