Changeset 3e4f2e0 in mainline for uspace/lib/usb

Timestamp:

2011-05-08T20:00:07Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

55054db0, 9212f8a

Parents:

19065c7

Message:

libusb divided into sublibraries

Also removed address keeper test from tester as it is useless.

Directory reorganization of the include/ will follow.

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/ddfiface.h (modified) (1 diff)
• include/usb/descriptor.h (modified) (1 diff)
• include/usb/driver.h (added)
• src/ddfiface.c (modified) (1 diff)
• src/driver.c (moved) (moved from uspace/app/tester/adt/usbaddrkeep.c ) (2 diffs)
• src/dump.c (modified) (1 diff)

uspace/lib/usb/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBRARY = libusb
-LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -Iinclude
+EXTRA_CFLAGS += \
+        -I$(LIBDRV_PREFIX)/include \
+        -Iinclude
 
 SOURCES = \
-        src/addrkeep.c \
-        src/altiface.c \
         src/class.c \
         src/ddfiface.c \
         src/debug.c \
-        src/devdrv.c \
-        src/devpoll.c \
-        src/dp.c \
+        src/driver.c \
         src/dump.c \
-        src/hidiface.c \
-        src/hidpath.c \
-        src/hidparser.c \
-        src/hiddescriptor.c \
         src/host.c \
-        src/hub.c \
-        src/pipepriv.c \
-        src/pipes.c \
-        src/pipesinit.c \
-        src/pipesio.c \
-        src/recognise.c \
-        src/request.c \
-        src/usb.c \
-        src/usbdevice.c \
-        src/hidreq.c \
-        src/hidreport.c \
-        src/host/device_keeper.c \
-        src/host/batch.c \
-        src/host/endpoint.c \
-        src/host/usb_endpoint_manager.c
+        src/usb.c
 
 include $(USPACE_PREFIX)/Makefile.common

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

@@ -37 +37 @@
 
 #include <sys/types.h>
-#include <usb/usbdevice.h>
 #include <usb_iface.h>
 

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

@@ -167 +167 @@
 } __attribute__ ((packed)) usb_standard_endpoint_descriptor_t;
 
+/** Part of standard USB HID descriptor specifying one class descriptor.
+ *
+ * (See HID Specification, p.22)
+ */
+typedef struct {
+        /** Type of class-specific descriptor (Report or Physical). */
+        uint8_t type;
+        /** Length of class-specific descriptor in bytes. */
+        uint16_t length;
+} __attribute__ ((packed)) usb_standard_hid_class_descriptor_info_t;
+
+/** Standard USB HID descriptor.
+ *
+ * (See HID Specification, p.22)
+ *
+ * It is actually only the "header" of the descriptor, it does not contain
+ * the last two mandatory fields (type and length of the first class-specific
+ * descriptor).
+ */
+typedef struct {
+        /** Total size of this descriptor in bytes.
+         *
+         * This includes all class-specific descriptor info - type + length
+         * for each descriptor.
+         */
+        uint8_t length;
+        /** Descriptor type (USB_DESCTYPE_HID). */
+        uint8_t descriptor_type;
+        /** HID Class Specification release. */
+        uint16_t spec_release;
+        /** Country code of localized hardware. */
+        uint8_t country_code;
+        /** Total number of class-specific (i.e. Report and Physical)
+         * descriptors.
+         *
+         * @note There is always only one Report descriptor.
+         */
+        uint8_t class_desc_count;
+        /** First mandatory class descriptor (Report) info. */
+        usb_standard_hid_class_descriptor_info_t report_desc_info;
+} __attribute__ ((packed)) usb_standard_hid_descriptor_t;
+
 #endif
 /**

uspace/lib/usb/src/ddfiface.c

@@ -37 +37 @@
 #include <async.h>
 #include <usb/ddfiface.h>
+#include <usb/driver.h>
 #include <usb/debug.h>
 #include <errno.h>

uspace/lib/usb/src/driver.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <usb/addrkeep.h>
+/** @addtogroup libusb
+ * @{
+ */
+/** @file
+ *
+ */
+#include <devman.h>
+#include <dev_iface.h>
+#include <usb_iface.h>
+#include <usb/driver.h>
 #include <errno.h>
-#include "../tester.h"
-
-#define MAX_ADDRESS 5
 
 
-const char *test_usbaddrkeep(void)
+/** Find host controller handle that is ancestor of given device.
+ *
+ * @param[in] device_handle Device devman handle.
+ * @param[out] hc_handle Where to store handle of host controller
+ *      controlling device with @p device_handle handle.
+ * @return Error code.
+ */
+int usb_hc_find(devman_handle_t device_handle, devman_handle_t *hc_handle)
 {
-        int rc;
-        usb_address_keeping_t addresses;
-
-        TPRINTF("Initializing addresses keeping structure...\n");
-        usb_address_keeping_init(&addresses, MAX_ADDRESS);
-        
-        TPRINTF("Requesting address...\n");
-        usb_address_t addr = usb_address_keeping_request(&addresses);
-        TPRINTF("Address assigned: %d\n", (int) addr);
-        if (addr != 1) {
-                return "have not received expected address 1";
+        int parent_phone = devman_parent_device_connect(device_handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
         }
 
-        TPRINTF("Releasing not assigned address...\n");
-        rc = usb_address_keeping_release(&addresses, 2);
-        if (rc != ENOENT) {
-                return "have not received expected ENOENT";
+        devman_handle_t h;
+        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
+
+        async_hangup(parent_phone);
+
+        if (rc != EOK) {
+                return rc;
         }
 
-        TPRINTF("Releasing acquired address...\n");
-        rc = usb_address_keeping_release(&addresses, addr);
-        if (rc != EOK) {
-                return "have not received expected EOK";
+        if (hc_handle != NULL) {
+                *hc_handle = h;
         }
 
-        return NULL;
+        return EOK;
 }
+
+/**
+ * @}
+ */

uspace/lib/usb/src/dump.c

@@ -41 +41 @@
 #include <usb/descriptor.h>
 #include <usb/classes/classes.h>
-#include <usb/classes/hid.h>
 
 /** Mapping between descriptor id and dumping function. */