Changeset 8e7c9fe in mainline for uspace/lib/nic/include/nic.h

Timestamp:

2014-09-12T03:45:25Z (10 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/lib/nic/include/nic.h (modified) (2 diffs)

uspace/lib/nic/include/nic.h

@@ -216 +216 @@
 
 /* Functions called in add_device */
-extern int nic_connect_to_services(nic_t *);
 extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
 extern void nic_set_specific(nic_t *, void *);
@@ -245 +244 @@
 extern void nic_received_frame(nic_t *, nic_frame_t *);
 extern void nic_received_frame_list(nic_t *, nic_frame_list_t *);
-extern void nic_disable_interrupt(nic_t *, int);
-extern void nic_enable_interrupt(nic_t *, int);
 extern nic_poll_mode_t nic_query_poll_mode(nic_t *, struct timeval *);