Changeset 0eddb76 in mainline

Timestamp:

2010-11-24T22:10:25Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

56b962d

Parents:

0b749a3

Message:

libusbvirt directoy structure reorganized

Location:

uspace

Files:

• app/virtusbkbd/Makefile (modified) (1 diff)
• drv/vhc/Makefile (modified) (1 diff)
• lib/usbvirt/Makefile (modified) (1 diff)
• lib/usbvirt/include/usbvirt/device.h (moved) (moved from uspace/lib/usbvirt/device.h )
• lib/usbvirt/include/usbvirt/hub.h (moved) (moved from uspace/lib/usbvirt/hub.h )
• lib/usbvirt/src/callback.c (moved) (moved from uspace/lib/usbvirt/callback.c ) (1 diff)
• lib/usbvirt/src/ctrlpipe.c (moved) (moved from uspace/lib/usbvirt/ctrlpipe.c )
• lib/usbvirt/src/debug.c (moved) (moved from uspace/lib/usbvirt/debug.c ) (1 diff)
• lib/usbvirt/src/main.c (moved) (moved from uspace/lib/usbvirt/main.c ) (3 diffs)
• lib/usbvirt/src/private.h (moved) (moved from uspace/lib/usbvirt/private.h ) (1 diff)
• lib/usbvirt/src/stdreq.c (moved) (moved from uspace/lib/usbvirt/stdreq.c )
• lib/usbvirt/src/transaction.c (moved) (moved from uspace/lib/usbvirt/transaction.c ) (1 diff)

uspace/app/virtusbkbd/Makefile

@@ -33 +33 @@
 
 LIBS = $(LIBUSB_PREFIX)/libusb.a $(LIBUSBVIRT_PREFIX)/libusbvirt.a
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIB_PREFIX)
+EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -I$(LIBUSBVIRT_PREFIX)/include
 
 SOURCES = \

uspace/drv/vhc/Makefile

@@ -33 +33 @@
         $(LIBDRV_PREFIX)/libdrv.a
 EXTRA_CFLAGS += \
-        -I$(LIB_PREFIX) \
+        -I$(LIBUSBVIRT_PREFIX)/include \
         -I$(LIBUSB_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include

uspace/lib/usbvirt/Makefile

@@ -31 +31 @@
 
 LIBS = $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include
+EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -Iinclude
 
 SOURCES = \
-        callback.c \
-        ctrlpipe.c \
-        debug.c \
-        main.c \
-        stdreq.c \
-        transaction.c
+        src/callback.c \
+        src/ctrlpipe.c \
+        src/debug.c \
+        src/main.c \
+        src/stdreq.c \
+        src/transaction.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usbvirt/src/callback.c

@@ -40 +40 @@
 #include <mem.h>
 
-#include "hub.h"
-#include "device.h"
 #include "private.h"
 

uspace/lib/usbvirt/src/debug.c

@@ -36 +36 @@
 #include <bool.h>
 
-#include "device.h"
 #include "private.h"
 

uspace/lib/usbvirt/src/main.c

@@ -39 +39 @@
 #include <assert.h>
 
-#include "hub.h"
-#include "device.h"
 #include "private.h"
 
@@ -183 +181 @@
 }
 
-/** Create necessary phones for comunication with virtual HCD.
+/** Create necessary phones for communication with virtual HCD.
  * This function wraps following calls:
- * -# open <code>/dev/devices/\\vhc for reading
+ * -# open <code>/dev/devices/\\vhc</code> for reading
  * -# access phone of file opened in previous step
  * -# create callback through just opened phone
@@ -193 +191 @@
  * @warning This function is wrapper for several actions and therefore
  * it is not possible - in case of error - to determine at which point
- * error occured.
- *
- * @param hcd_path HCD identification under devfs
- *     (without <code>/dev/usb/</code>).
+ * error occurred.
+ *
  * @param dev Device to connect.
  * @return EOK on success or error code from errno.h.

uspace/lib/usbvirt/src/private.h

@@ -36 +36 @@
 #define LIBUSBVIRT_PRIVATE_H_
 
-#include "device.h"
-#include "hub.h"
+#include <usbvirt/device.h>
+#include <usbvirt/hub.h>
 
 

uspace/lib/usbvirt/src/transaction.c

@@ -37 +37 @@
 #include <mem.h>
 
-#include "hub.h"
 #include "private.h"