Changeset 3f03199 in mainline for uspace/lib/drv/generic/dev_iface.c

Timestamp:

2013-09-15T06:33:53Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/lib/drv/generic/dev_iface.c (modified) (3 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -40 +40 @@
 #include "dev_iface.h"
 #include "remote_hw_res.h"
+#include "remote_pio_window.h"
 #include "remote_char_dev.h"
 #include "remote_clock_dev.h"
@@ -58 +59 @@
                 [AUDIO_PCM_BUFFER_IFACE] = &remote_audio_pcm_iface,
                 [HW_RES_DEV_IFACE] = &remote_hw_res_iface,
+                [PIO_WINDOW_DEV_IFACE] = &remote_pio_window_iface,
                 [CHAR_DEV_IFACE] = &remote_char_dev_iface,
                 [GRAPH_DEV_IFACE] = &remote_graph_dev_iface,
@@ -67 +69 @@
                 [CLOCK_DEV_IFACE] = &remote_clock_dev_iface,
                 [BATTERY_DEV_IFACE] = &remote_battery_dev_iface,
-                [AHCI_DEV_IFACE] = &remote_ahci_iface,
+                [AHCI_DEV_IFACE] = &remote_ahci_iface
         }
 };