Changeset 8e7c9fe in mainline for uspace/lib/drv/generic/dev_iface.c

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/lib/drv/generic/dev_iface.c (modified) (3 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -43 +43 @@
 #include "remote_char_dev.h"
 #include "remote_clock_dev.h"
+#include "remote_led_dev.h"
 #include "remote_battery_dev.h"
-#include "remote_graph_dev.h"
 #include "remote_nic.h"
 #include "remote_usb.h"
@@ -61 +61 @@
                 [PIO_WINDOW_DEV_IFACE] = &remote_pio_window_iface,
                 [CHAR_DEV_IFACE] = &remote_char_dev_iface,
-                [GRAPH_DEV_IFACE] = &remote_graph_dev_iface,
                 [NIC_DEV_IFACE] = &remote_nic_iface,
                 [PCI_DEV_IFACE] = &remote_pci_iface,
@@ -68 +67 @@
                 [USBHID_DEV_IFACE] = &remote_usbhid_iface,
                 [CLOCK_DEV_IFACE] = &remote_clock_dev_iface,
+                [LED_DEV_IFACE] = &remote_led_dev_iface,
                 [BATTERY_DEV_IFACE] = &remote_battery_dev_iface,
                 [AHCI_DEV_IFACE] = &remote_ahci_iface,