Changeset 8e7c9fe in mainline for uspace/lib/nic/include/nic_driver.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_driver.h (modified) (1 diff)

uspace/lib/nic/include/nic_driver.h

@@ -80 +80 @@
         /** Client callback session */
         async_sess_t *client_session;
-        /** Phone to APIC or i8259 */
-        async_sess_t *irc_session;
         /** Current polling mode of the NIC */
         nic_poll_mode_t poll_mode;