Changeset a8def7d in mainline

Timestamp:

2011-03-10T19:26:16Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

6e3b9a58, 9d9ffdd

Parents:

e69f10b

Message:

Small fixex

Location:

uspace/drv/usbhid

Files:

• kbddev.c (modified) (4 diffs)
• kbddev.h (modified) (1 diff)

uspace/drv/usbhid/kbddev.c

@@ -459 +459 @@
                         usbhid_kbd_push_ev(kbd_dev, KEY_PRESS, key);
                         usbhid_kbd_repeat_start(kbd_dev, key);
-                } else {size_t
+                } else {
                         // found, nothing happens
                 }
@@ -502 +502 @@
 
         usb_log_debug("Got keys from parser: %s\n", 
-            usb_debug_str_buffer(key_codes, kbd_dev->key_count, 0));
+            usb_debug_str_buffer(key_codes, count, 0));
         
         if (count != kbd_dev->key_count) {
@@ -535 +535 @@
                                     uint8_t *buffer, size_t actual_size)
 {
+        assert(kbd_dev->initialized);
+        assert(kbd_dev->hid_dev->parser != NULL);
+        
         usb_hid_report_in_callbacks_t *callbacks =
             (usb_hid_report_in_callbacks_t *)malloc(
@@ -617 +620 @@
         }
 
-        usb_hid_free_report_parser((*kbd_dev)->parser);
-        
         free(*kbd_dev);
         *kbd_dev = NULL;

uspace/drv/usbhid/kbddev.h

@@ -100 +100 @@
         /** Mutex for accessing the information about auto-repeat. */
         fibril_mutex_t *repeat_mtx;
-
-        usb_hid_report_parser_t *parser;
         
         /** State of the structure (for checking before use). */