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

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

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

@@ -30 +30 @@
 #define LIBC_IPC_DEV_IFACE_H_
 
-#include <ipc/ipc.h>
 #include <malloc.h>
 #include <unistd.h>
 #include <libarch/types.h>
 
-typedef enum {  
-        HW_RES_DEV_IFACE = 0,   
+typedef enum {
+        HW_RES_DEV_IFACE = 0,
         CHAR_DEV_IFACE,
-        // TODO add more interfaces
+
+        /** Interface provided by any PCI device. */
+        PCI_DEV_IFACE,
+
+        /** Interface provided by any USB device. */
+        USB_DEV_IFACE,
+        /** Interface provided by USB host controller. */
+        USBHC_DEV_IFACE,
+        /** Interface provided by USB HID devices. */
+        USBHID_DEV_IFACE,
+
         DEV_IFACE_MAX
 } dev_inferface_idx_t;
@@ -50 +59 @@
         DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX)
 
+/*
+ * The first argument is actually method (as the "real" method is used
+ * for indexing into interfaces.
+ */
+
+#define DEV_IPC_GET_ARG1(call) IPC_GET_ARG2((call))
+#define DEV_IPC_GET_ARG2(call) IPC_GET_ARG3((call))
+#define DEV_IPC_GET_ARG3(call) IPC_GET_ARG4((call))
+#define DEV_IPC_GET_ARG4(call) IPC_GET_ARG5((call))
+
 
 #endif