Changeset 8e7c9fe in mainline for uspace/srv/hid/input/port/adb.c

Timestamp:

2014-09-12T03:45:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

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

@@ -49 +49 @@
 
 static int adb_port_init(kbd_dev_t *);
-static void adb_port_yield(void);
-static void adb_port_reclaim(void);
-static void adb_port_write(uint8_t data);
+static void adb_port_write(uint8_t);
 
 kbd_port_ops_t adb_port = {
         .init = adb_port_init,
-        .yield = adb_port_yield,
-        .reclaim = adb_port_reclaim,
         .write = adb_port_write
 };
@@ -95 +91 @@
         
         return EOK;
-}
-
-static void adb_port_yield(void)
-{
-}
-
-static void adb_port_reclaim(void)
-{
 }