Changeset 2e1d5d70 in mainline for uspace/lib/usb

Timestamp:

2011-03-21T10:30:06Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0e45e7f, f8e1a2c

Parents:

f0fdc7d (diff), 79c8a96 (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:

Host controller refactoring, move shared stuff to libusb/host

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/host/batch.h (added)
• include/usb/host/device_keeper.h (moved) (moved from uspace/drv/uhci-hcd/utils/device_keeper.h ) (2 diffs)
• src/host/batch.c (added)
• src/host/device_keeper.c (moved) (moved from uspace/drv/uhci-hcd/utils/device_keeper.c ) (2 diffs)

uspace/lib/usb/Makefile

@@ -49 +49 @@
         src/request.c \
         src/usb.c \
-        src/usbdevice.c
+        src/usbdevice.c \
+        src/host/device_keeper.c \
+        src/host/batch.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usb/include/usb/host/device_keeper.h

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbuhcihc
+/** @addtogroup libusb
  * @{
  */
@@ -33 +33 @@
  * @brief UHCI driver
  */
-#ifndef UTILS_DEVICE_KEEPER_H
-#define UTILS_DEVICE_KEEPER_H
+#ifndef LIBUSB_HOST_DEVICE_KEEPER_H
+#define LIBUSB_HOST_DEVICE_KEEPER_H
 #include <devman.h>
 #include <fibril_synch.h>

uspace/lib/usb/src/host/device_keeper.c

@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbuhcihc
+/** @addtogroup libusb
  * @{
  */
@@ -36 +36 @@
 #include <errno.h>
 #include <usb/debug.h>
-
-#include "device_keeper.h"
+#include <usb/host/device_keeper.h>
 
 /*----------------------------------------------------------------------------*/