Changeset 4b4c797 in mainline for uspace/lib/usb

Timestamp:

2010-11-20T14:07:05Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1b22bd4

Parents:

0e126be7

Message:

Directory structure reorganization

USB class-specific headers are in separate directory.

Removed unused/unreachable code.

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• hcd.c (deleted)
• hcd.h (deleted)
• include/usb/classes/classes.h (moved) (moved from uspace/lib/usb/classes.h )
• include/usb/classes/hid.h (moved) (moved from uspace/lib/usb/hid.h )
• include/usb/classes/hidut.h (moved) (moved from uspace/lib/usb/hidut.h )
• include/usb/classes/hidutkbd.h (moved) (moved from uspace/lib/usb/hidutkbd.h )
• include/usb/classes/hub.h (moved) (moved from uspace/lib/usb/hub.h )
• include/usb/descriptor.h (moved) (moved from uspace/lib/usb/descriptor.h )
• include/usb/devreq.h (moved) (moved from uspace/lib/usb/devreq.h ) (1 diff)
• include/usb/hcdhubd.h (moved) (moved from uspace/lib/usb/hcdhubd.h ) (1 diff)
• include/usb/usb.h (moved) (moved from uspace/lib/usb/usb.h ) (1 diff)
• include/usb/usbdrv.h (moved) (moved from uspace/lib/usb/usbdrv.h )
• src/hcdhubd.c (moved) (moved from uspace/lib/usb/hcdhubd.c ) (1 diff)
• src/usb.c (moved) (moved from uspace/lib/usb/usb.c ) (1 diff)
• src/usbdrv.c (moved) (moved from uspace/lib/usb/usbdrv.c ) (1 diff)

uspace/lib/usb/Makefile

@@ -30 +30 @@
 LIBRARY = libusb
 LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIB_PREFIX)
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -Iinclude
 
 SOURCES = \
-        hcd.c \
-        hcdhubd.c \
-        usb.c \
-        usbdrv.c
+        src/hcdhubd.c \
+        src/usb.c \
+        src/usbdrv.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/usb/include/usb/devreq.h

@@ -75 +75 @@
                 uint16_t value;
         };
-        /** Auxilary parameter to the request.
+        /** Auxiliary parameter to the request.
          * Typically, it is offset to something.
          */

uspace/lib/usb/include/usb/hcdhubd.h

@@ -38 +38 @@
 #include <adt/list.h>
 #include <driver.h>
-#include "usb.h"
-#include "hcd.h"
+#include <usb/usb.h>
 
 /** Endpoint properties. */

uspace/lib/usb/include/usb/usb.h

@@ -98 +98 @@
 typedef ipcarg_t usb_handle_t;
 
+/** USB packet identifier. */
+typedef enum {
+#define _MAKE_PID_NIBBLE(tag, type) \
+        ((uint8_t)(((tag) << 2) | (type)))
+#define _MAKE_PID(tag, type) \
+        ( \
+            _MAKE_PID_NIBBLE(tag, type) \
+            | ((~_MAKE_PID_NIBBLE(tag, type)) << 4) \
+        )
+        USB_PID_OUT = _MAKE_PID(0, 1),
+        USB_PID_IN = _MAKE_PID(2, 1),
+        USB_PID_SOF = _MAKE_PID(1, 1),
+        USB_PID_SETUP = _MAKE_PID(3, 1),
+
+        USB_PID_DATA0 = _MAKE_PID(0 ,3),
+        USB_PID_DATA1 = _MAKE_PID(2 ,3),
+
+        USB_PID_ACK = _MAKE_PID(0 ,2),
+        USB_PID_NAK = _MAKE_PID(2 ,2),
+        USB_PID_STALL = _MAKE_PID(3 ,2),
+
+        USB_PID_PRE = _MAKE_PID(3 ,0),
+        /* USB_PID_ = _MAKE_PID( ,), */
+#undef _MAKE_PID
+#undef _MAKE_PID_NIBBLE
+} usb_packet_id;
+
 #endif
 /**

uspace/lib/usb/src/hcdhubd.c

@@ -33 +33 @@
  * @brief HC driver and hub driver (implementation).
  */
-#include "hcdhubd.h"
+#include <usb/hcdhubd.h>
 #include <usb_iface.h>
 #include <driver.h>

uspace/lib/usb/src/usb.c

@@ -33 +33 @@
  * @brief Base USB types.
  */
-#include "usb.h"
+#include <usb/usb.h>
 #include <errno.h>
 

uspace/lib/usb/src/usbdrv.c

@@ -33 +33 @@
  * @brief USB driver (implementation).
  */
-#include "usbdrv.h"
+#include <usb/usbdrv.h>
 #include <usb_iface.h>
 #include <errno.h>