Changeset 3b2e387 in mainline for uspace/srv/hid/input/port/adb.c

Timestamp:

2011-06-21T19:36:05Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e3a6c45

Parents:

40f606b (diff), 022d9f67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge input server, console and various other improvements

File:

• uspace/srv/hid/input/port/adb.c (modified) (2 diffs)

uspace/srv/hid/input/port/adb.c

@@ -93 +93 @@
         async_exchange_end(exch);
         if (rc != EOK) {
-                printf(NAME ": Failed to create callback from device\n");
+                printf("%s: Failed to create callback from device\n", NAME);
                 async_hangup(dev_sess);
                 return rc;
@@ -142 +142 @@
 static void adb_kbd_reg0_data(uint16_t data)
 {
-        uint8_t b0, b1;
-
-        b0 = (data >> 8) & 0xff;
-        b1 = data & 0xff;
-
+        uint8_t b0 = (data >> 8) & 0xff;
+        uint8_t b1 = data & 0xff;
+        
         if (b0 != 0xff)
-                kbd_push_scancode(kbd_dev, b0);
+                kbd_push_data(kbd_dev, b0);
+        
         if (b1 != 0xff)
-                kbd_push_scancode(kbd_dev, b1);
+                kbd_push_data(kbd_dev, b1);
 }