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

Timestamp:

2011-06-07T21:31:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

75608143

Parents:

ff4f073 (diff), eb522e8 (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 USB support.

Changes from bzr://helenos-usb.bzr.sourceforge.net/bzrroot/helenos-usb/mainline:

• replaced '-' with '_' in new driver names
• USB libs are built for each architecture
• devman starts early
• sys_thread_udelay() uses generic delay()
• sys_as_create_area() now creates cacheable areas by default

File:

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

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

@@ -37 +37 @@
         HW_RES_DEV_IFACE = 0,
         CHAR_DEV_IFACE,
+
+        /** 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;
@@ -48 +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