Changeset 8d6c1f1 in mainline for uspace/lib/drv/generic/dev_iface.c

Timestamp:

2011-06-07T21:31:35Z (14 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/drv/generic/dev_iface.c (modified) (2 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -41 +41 @@
 #include "remote_hw_res.h"
 #include "remote_char_dev.h"
+#include "remote_usb.h"
+#include "remote_usbhc.h"
+#include "remote_usbhid.h"
+#include "remote_pci.h"
+
+#include <stdio.h>
 
 static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
                 &remote_hw_res_iface,
-                &remote_char_dev_iface
+                &remote_char_dev_iface,
+                &remote_pci_iface,
+                &remote_usb_iface,
+                &remote_usbhc_iface,
+                &remote_usbhid_iface
         }
 };
@@ -52 +62 @@
 {
         assert(is_valid_iface_idx(idx));
+        
         return remote_ifaces.ifaces[idx];
 }