Changeset 8e7c9fe in mainline for uspace/srv/net/ethip/atrans.h

Timestamp:

2014-09-12T03:45:25Z (11 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/net/ethip/atrans.h (modified) (1 diff)

uspace/srv/net/ethip/atrans.h

@@ -45 +45 @@
 extern int atrans_remove(addr32_t);
 extern int atrans_lookup(addr32_t, addr48_t);
-extern int atrans_wait_timeout(suseconds_t);
+extern int atrans_lookup_timeout(addr32_t, suseconds_t, addr48_t);
 
 #endif