Changeset e67399e in mainline

Timestamp:

2011-04-29T13:13:36Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

30710035

Parents:

890961a

Message:

Minor changes

Location:

uspace/drv/usbhid/lgtch-ultrax

Files:

• keymap.c (modified) (1 diff)
• lgtch-ultrax.c (modified) (2 diffs)

uspace/drv/usbhid/lgtch-ultrax/keymap.c

@@ -55 +55 @@
         [0xc] = KC_F6, /* Just for testing purposes */
         
-        [0xb5] = 0,  /* Scan Next Track */
-        [0xb6] = 0,  /* Scan Previous Track */
-        [0xb7] = 0,  /* Stop */
-        [0xb8] = 0,  /* Eject */
-        [0xcd] = KC_F2,  /* Play/Pause */
-        [0xe2] = KC_F3,  /* Mute */
-        [0xe9] = KC_F5,  /* Volume Increment */
-        [0xea] = KC_F4,  /* Volume Decrement */
-        [0x183] = 0, /* AL Consumer Control Configuration */
-        [0x18a] = 0, /* AL Email Reader */
-        [0x192] = 0, /* AL Calculator */
-        [0x221] = 0, /* AC Search */
-        [0x223] = 0, /* AC Home */
-        [0x224] = 0, /* AC Back */
-        [0x225] = 0, /* AC Forward */
-        [0x226] = 0, /* AC Stop */
-        [0x227] = KC_F1, /* AC Refresh */
-        [0x22a] = KC_F6  /* AC Bookmarks */
+        [0xb5] = 0,       /* Scan Next Track */
+        [0xb6] = 0,       /* Scan Previous Track */
+        [0xb7] = 0,       /* Stop */
+        [0xb8] = 0,       /* Eject */
+        [0xcd] = KC_F2,   /* Play/Pause */
+        [0xe2] = KC_F3,   /* Mute */
+        [0xe9] = KC_F5,   /* Volume Increment */
+        [0xea] = KC_F4,   /* Volume Decrement */
+        [0x183] = 0,      /* AL Consumer Control Configuration */
+        [0x18a] = 0,      /* AL Email Reader */
+        [0x192] = 0,      /* AL Calculator */
+        [0x221] = 0,      /* AC Search */
+        [0x223] = 0,      /* AC Home */
+        [0x224] = 0,      /* AC Back */
+        [0x225] = 0,      /* AC Forward */
+        [0x226] = 0,      /* AC Stop */
+        [0x227] = KC_F1,  /* AC Refresh */
+        [0x22a] = KC_F6   /* AC Bookmarks */
 };
 

uspace/drv/usbhid/lgtch-ultrax/lgtch-ultrax.c

@@ -356 +356 @@
         int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
             &report_id);
+        
+        if (rc != EOK) {
+                usb_log_warning(NAME "Error in usb_hid_parse_report(): %s\n", 
+                    str_error(rc));
+                return true;
+        }
+        
         usb_hid_report_path_set_report_id(path, report_id);
 
@@ -383 +390 @@
         usb_hid_report_path_free(path);
         
-        if (rc != EOK) {
-                usb_log_warning(NAME "Error in usb_hid_boot_keyboard_input_report():"
-                    "%s\n", str_error(rc));
-        }
-        
         return true;
 }