Changeset 03362fbd in mainline for uspace/lib/c/include/ipc/dev_iface.h

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/c/include/ipc/dev_iface.h (modified) (2 diffs)

uspace/lib/c/include/ipc/dev_iface.h

@@ -44 +44 @@
         /** Character device interface */
         CHAR_DEV_IFACE,
+
+        /** Graphic device interface */
+        GRAPH_DEV_IFACE,
         
         /** Network interface controller interface */
@@ -57 +60 @@
         /** Interface provided by USB HID devices. */
         USBHID_DEV_IFACE,
+        /** Interface provided by Real Time Clock devices */
+        CLOCK_DEV_IFACE,
+        /** Interface provided by battery powered devices */
+        BATTERY_DEV_IFACE,
         /** Interface provided by AHCI devices. */
         AHCI_DEV_IFACE,