Changes in uspace/drv/usbhid/kbd/kbddev.c [323b0ec:7304663] in mainline

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (4 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -203 +203 @@
 /*----------------------------------------------------------------------------*/
 /** Mapping of USB modifier key codes to generic modifier key codes. */
-//static const keycode_t usbhid_modifiers_keycodes[USB_HID_MOD_COUNT] = {
-//      KC_LCTRL,         /* USB_HID_MOD_LCTRL */
-//      KC_LSHIFT,        /* USB_HID_MOD_LSHIFT */
-//      KC_LALT,          /* USB_HID_MOD_LALT */
-//      0,                /* USB_HID_MOD_LGUI */
-//      KC_RCTRL,         /* USB_HID_MOD_RCTRL */
-//      KC_RSHIFT,        /* USB_HID_MOD_RSHIFT */
-//      KC_RALT,          /* USB_HID_MOD_RALT */
-//      0,                /* USB_HID_MOD_RGUI */
-//};
-
-//typedef enum usbhid_lock_code {
-//      USB_KBD_LOCK_NUM = 0x53,
-//      USB_KBD_LOCK_CAPS = 0x39,
-//      USB_KBD_LOCK_SCROLL = 0x47,
-//      USB_KBD_LOCK_COUNT = 3
-//} usbhid_lock_code;
-
-//static const usbhid_lock_code usbhid_lock_codes[USB_KBD_LOCK_COUNT] = {
-//      USB_KBD_LOCK_NUM,
-//      USB_KBD_LOCK_CAPS,
-//      USB_KBD_LOCK_SCROLL
-//};
+static const keycode_t usbhid_modifiers_keycodes[USB_HID_MOD_COUNT] = {
+        KC_LCTRL,         /* USB_HID_MOD_LCTRL */
+        KC_LSHIFT,        /* USB_HID_MOD_LSHIFT */
+        KC_LALT,          /* USB_HID_MOD_LALT */
+        0,                /* USB_HID_MOD_LGUI */
+        KC_RCTRL,         /* USB_HID_MOD_RCTRL */
+        KC_RSHIFT,        /* USB_HID_MOD_RSHIFT */
+        KC_RALT,          /* USB_HID_MOD_RALT */
+        0,                /* USB_HID_MOD_RGUI */
+};
+
+typedef enum usbhid_lock_code {
+        USB_KBD_LOCK_NUM = 0x53,
+        USB_KBD_LOCK_CAPS = 0x39,
+        USB_KBD_LOCK_SCROLL = 0x47,
+        USB_KBD_LOCK_COUNT = 3
+} usbhid_lock_code;
+
+static const usbhid_lock_code usbhid_lock_codes[USB_KBD_LOCK_COUNT] = {
+        USB_KBD_LOCK_NUM,
+        USB_KBD_LOCK_CAPS,
+        USB_KBD_LOCK_SCROLL
+};
 
 /*----------------------------------------------------------------------------*/
@@ -709 +709 @@
                  *       two parts of the Report somehow.
                  */
-                if (field->value != 0) {
+                if( field->value != 0 ) {
                         kbd_dev->keys[i] = field->usage;
                 }
@@ -984 +984 @@
         }
         
-        // free all buffers
-        if ((*kbd_dev)->keys != NULL) {
-                free((*kbd_dev)->keys);
-        }
-        if ((*kbd_dev)->keys_old != NULL) {
-                free((*kbd_dev)->keys_old);
-        }
-        if ((*kbd_dev)->led_data != NULL) {
-                free((*kbd_dev)->led_data);
-        }
-        if ((*kbd_dev)->output_buffer != NULL) {
-                free((*kbd_dev)->output_buffer);
-        }
-        if ((*kbd_dev)->led_path != NULL) {
-                usb_hid_report_path_free((*kbd_dev)->led_path);
-        }
-        if ((*kbd_dev)->output_buffer != NULL) {
-                usb_hid_report_output_free((*kbd_dev)->output_buffer);
-        }
+        // free the output buffer
+        usb_hid_report_output_free((*kbd_dev)->output_buffer);
 
         free(*kbd_dev);
@@ -1022 +1005 @@
                 } else {
                         usb_kbd_free(&kbd_dev);
-                        hid_dev->data = NULL;
                 }
         }