Changeset 3a0a4d8 in mainline for uspace/lib/c/include/ipc/dev_iface.h

Timestamp:

2013-09-12T07:54:05Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

95027b5

Parents:

47f5a77 (diff), 64f3d3b (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

File:

• uspace/lib/c/include/ipc/dev_iface.h (modified) (3 diffs)

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

@@ -36 +36 @@
 typedef enum {
         HW_RES_DEV_IFACE = 0,
+        PIO_WINDOW_DEV_IFACE,
+
         /** Character device interface */
         CHAR_DEV_IFACE,
@@ -41 +43 @@
         /** Graphic device interface */
         GRAPH_DEV_IFACE,
+
+        /** Audio device mixer interface */
+        AUDIO_MIXER_IFACE,
+        /** Audio device pcm buffer interface */
+        AUDIO_PCM_BUFFER_IFACE,
         
         /** Network interface controller interface */
@@ -54 +61 @@
         /** 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,