Changeset 1fe9bf6 in mainline for uspace/lib

Timestamp:

2010-11-21T17:13:32Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

31860b7

Parents:

8b3bff5 (diff), 4087a33 (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:

Merged updates from HelenOS mainline + changes from branch

/vojtechhorky/ddf_proposal/

Location:

uspace/lib

Files:

• c/include/ipc/dev_iface.h (modified) (1 diff)
• drv/Makefile (modified) (2 diffs)
• drv/generic/dev_iface.c (modified) (1 diff)
• drv/generic/remote_usbhc.c (added)
• drv/include/remote_usbhc.h (added)
• drv/include/usbhc_iface.h (added)
• usb/Makefile (added)
• usb/include/usb/classes/classes.h (added)
• usb/include/usb/classes/hid.h (added)
• usb/include/usb/classes/hidut.h (added)
• usb/include/usb/classes/hidutkbd.h (added)
• usb/include/usb/classes/hub.h (added)
• usb/include/usb/descriptor.h (added)
• usb/include/usb/devreq.h (added)
• usb/include/usb/hcdhubd.h (added)
• usb/include/usb/usb.h (added)
• usb/include/usb/usbdrv.h (added)
• usb/src/hcdhubd.c (added)
• usb/src/usb.c (added)
• usb/src/usbdrv.c (added)
• usbvirt/Makefile (added)
• usbvirt/callback.c (added)
• usbvirt/ctrlpipe.c (added)
• usbvirt/debug.c (added)
• usbvirt/device.h (added)
• usbvirt/hub.h (added)
• usbvirt/main.c (added)
• usbvirt/private.h (added)
• usbvirt/stdreq.c (added)
• usbvirt/transaction.c (added)

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

@@ -38 +38 @@
         HW_RES_DEV_IFACE = 0,   
         CHAR_DEV_IFACE,
+
+        /** Interface provided by USB host controller. */
+        USBHC_DEV_IFACE,
+
         // TODO add more interfaces
         DEV_IFACE_MAX

uspace/lib/drv/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-EXTRA_CFLAGS = -Iinclude
+EXTRA_CFLAGS = -Iinclude -I$(LIBUSB_PREFIX)/include
 LIBRARY = libdrv
 
@@ -36 +36 @@
         generic/dev_iface.c \
         generic/remote_res.c \
+        generic/remote_usbhc.c \
         generic/remote_char.c
 

uspace/lib/drv/generic/dev_iface.c

@@ -39 +39 @@
 #include "remote_res.h"
 #include "remote_char.h"
+#include "remote_usbhc.h"
 
 static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
                 &remote_res_iface,
-                &remote_char_iface
+                &remote_char_iface,
+                &remote_usbhc_iface
         }
 };