Changeset 03362fbd in mainline for uspace/lib/drv/generic/dev_iface.c

Timestamp:

2013-02-09T23:14:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

uspace/lib/drv/generic/dev_iface.c

@@ -41 +41 @@
 #include "remote_hw_res.h"
 #include "remote_char_dev.h"
+#include "remote_clock_dev.h"
+#include "remote_battery_dev.h"
+#include "remote_graph_dev.h"
 #include "remote_nic.h"
 #include "remote_usb.h"
@@ -56 +59 @@
                 [HW_RES_DEV_IFACE] = &remote_hw_res_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,
@@ -61 +65 @@
                 [USBHC_DEV_IFACE] = &remote_usbhc_iface,
                 [USBHID_DEV_IFACE] = &remote_usbhid_iface,
+                [CLOCK_DEV_IFACE] = &remote_clock_dev_iface,
+                [BATTERY_DEV_IFACE] = &remote_battery_dev_iface,
                 [AHCI_DEV_IFACE] = &remote_ahci_iface,
         }