Changeset 74d6e90 in mainline for uspace/lib/usb

Timestamp:

2011-02-04T13:07:32Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

97e87de

Parents:

621afdb (diff), ff244e6 (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:

Merge devel branch

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/classes/hid.h (modified) (2 diffs)
• include/usb/debug.h (modified) (1 diff)
• include/usb/pipes.h (added)
• include/usb/request.h (added)
• include/usb/usb.h (modified) (2 diffs)
• include/usb/usbdrv.h (modified) (3 diffs)
• src/debug.c (modified) (4 diffs)
• src/pipes.c (added)
• src/request.c (added)
• src/usbdrv.c (modified) (2 diffs)

uspace/lib/usb/Makefile

@@ -43 +43 @@
         src/hidparser.c \
         src/localdrv.c \
+        src/pipes.c \
         src/recognise.c \
         src/remotedrv.c \
+        src/request.c \
         src/usb.c \
         src/usbdrvreq.c \

uspace/lib/usb/include/usb/classes/hid.h

@@ -37 +37 @@
 
 #include <usb/usb.h>
-#include <driver.h>
 #include <usb/classes/hidparser.h>
 #include <usb/descriptor.h>
@@ -101 +100 @@
 } __attribute__ ((packed)) usb_standard_hid_descriptor_t;
 
-/**
- *
- */
-typedef struct {
-        usb_standard_interface_descriptor_t iface_desc;
-        usb_standard_endpoint_descriptor_t *endpoints;
-        usb_standard_hid_descriptor_t hid_desc;
-        uint8_t *report_desc;
-        //usb_standard_hid_class_descriptor_info_t *class_desc_info;
-        //uint8_t **class_descs;
-} usb_hid_iface_t;
-
-/**
- *
- */
-typedef struct {
-        usb_standard_configuration_descriptor_t config_descriptor;
-        usb_hid_iface_t *interfaces;
-} usb_hid_configuration_t;
-
-/**
- * @brief USB/HID keyboard device type.
- *
- * Quite dummy right now.
- */
-typedef struct {
-        device_t *device;
-        usb_hid_configuration_t *conf;
-        usb_address_t address;
-        usb_endpoint_t poll_endpoint;
-        usb_hid_report_parser_t *parser;
-} usb_hid_dev_kbd_t;
-
-// TODO: more configurations!
 
 #endif

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

@@ -47 +47 @@
 /** Logging level. */
 typedef enum {
-    USB_LOG_LEVEL_FATAL,
-    USB_LOG_LEVEL_ERROR,
-    USB_LOG_LEVEL_WARNING,
-    USB_LOG_LEVEL_INFO,
-    USB_LOG_LEVEL_DEBUG,
-    USB_LOG_LEVEL_DEBUG2
+        USB_LOG_LEVEL_FATAL,
+        USB_LOG_LEVEL_ERROR,
+        USB_LOG_LEVEL_WARNING,
+        USB_LOG_LEVEL_INFO,
+        USB_LOG_LEVEL_DEBUG,
+        USB_LOG_LEVEL_DEBUG2,
+        USB_LOG_LEVEL_MAX
 } usb_log_level_t;
 

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

@@ -37 +37 @@
 
 #include <sys/types.h>
+#include <byteorder.h>
 #include <ipc/ipc.h>
+
+/** Convert 16bit value from native (host) endianness to USB endianness. */
+#define uint16_host2usb(n) host2uint16_t_le((n))
+
+/** Convert 32bit value from native (host) endianness to USB endianness. */
+#define uint32_host2usb(n) host2uint32_t_le((n))
+
+/** Convert 16bit value from USB endianness into native (host) one. */
+#define uint16_usb2host(n) uint16_t_le2host((n))
+
+/** Convert 32bit value from USB endianness into native (host) one. */
+#define uint32_usb2host(n) uint32_t_le2host((n))
+
 
 /** USB transfer type. */
@@ -52 +66 @@
 typedef enum {
         USB_DIRECTION_IN,
-        USB_DIRECTION_OUT
+        USB_DIRECTION_OUT,
+        USB_DIRECTION_BOTH
 } usb_direction_t;
 

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

@@ -70 +70 @@
     usb_handle_t *);
 
+int usb_drv_async_control_write(int, usb_target_t,
+    void *, size_t, void *, size_t, usb_handle_t *);
+
 int usb_drv_psync_control_write_setup(int, usb_target_t, void *, size_t);
 int usb_drv_psync_control_write_data(int, usb_target_t, void *, size_t);
@@ -77 +80 @@
     void *, size_t, void *, size_t);
 
-
 int usb_drv_async_control_read_setup(int, usb_target_t,
     void *, size_t, usb_handle_t *);
@@ -84 +86 @@
 int usb_drv_async_control_read_status(int, usb_target_t,
     usb_handle_t *);
+
+int usb_drv_async_control_read(int, usb_target_t,
+    void *, size_t, void *, size_t, size_t *, usb_handle_t *);
 
 int usb_drv_psync_control_read_setup(int, usb_target_t, void *, size_t);

uspace/lib/usb/src/debug.c

@@ -67 +67 @@
 /** Serialization mutex for logging functions. */
 static FIBRIL_MUTEX_INITIALIZE(log_serializer);
+static FILE *log_stream = NULL;
 
 /** Find or create new tag with given name.
@@ -171 +172 @@
         log_prefix = message_prefix;
         log_level = level;
+        if (log_stream == NULL) {
+                char *fname;
+                int rc = asprintf(&fname, "/log/%s", message_prefix);
+                if (rc > 0) {
+                        log_stream = fopen(fname, "w");
+                        free(fname);
+                }
+        }
 }
 
@@ -197 +206 @@
 void usb_log_printf(usb_log_level_t level, const char *format, ...)
 {
-        if (level > log_level) {
-                return;
-        }
-
         FILE *stream = NULL;
         switch (level) {
@@ -216 +221 @@
         va_start(args, format);
 
+        /*
+         * Serialize access to log files.
+         * Always print to log file, to screen print only when the enabled
+         * log level is high enough.
+         */
         fibril_mutex_lock(&log_serializer);
-        fprintf(stream, "[%s]%s: ", log_prefix, log_level_name(level));
-        vfprintf(stream, format, args);
+
+        const char *level_name = log_level_name(level);
+
+        if (log_stream != NULL) {
+                fprintf(log_stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(log_stream, format, args);
+        }
+
+        if (level <= log_level) {
+                fprintf(stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(stream, format, args);
+        }
+
         fibril_mutex_unlock(&log_serializer);
 

uspace/lib/usb/src/usbdrv.c

@@ -495 +495 @@
 }
 
+/** Issue whole control write transfer. */
+int usb_drv_async_control_write(int phone, usb_target_t target,
+    void *setup_packet, size_t setup_packet_size,
+    void *buffer, size_t buffer_size,
+    usb_handle_t *handle)
+{
+        // FIXME - check input parameters instead of asserting them
+        assert(phone > 0);
+        assert(setup_packet != NULL);
+        assert(setup_packet_size > 0);
+        assert(buffer != NULL);
+        assert(buffer_size > 0);
+        assert(handle != NULL);
+
+        transfer_info_t *transfer
+            = (transfer_info_t *) malloc(sizeof(transfer_info_t));
+        if (transfer == NULL) {
+                return ENOMEM;
+        }
+
+        transfer->size_transferred = NULL;
+        transfer->buffer = NULL;
+        transfer->size = 0;
+        transfer->phone = phone;
+
+        int rc;
+
+        transfer->request = async_send_3(phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_CONTROL_WRITE,
+            target.address, target.endpoint,
+            &transfer->reply);
+
+        rc = async_data_write_start(phone, setup_packet, setup_packet_size);
+        if (rc != EOK) {
+                async_wait_for(transfer->request, NULL);
+                return rc;
+        }
+
+        rc = async_data_write_start(phone, buffer, buffer_size);
+        if (rc != EOK) {
+                async_wait_for(transfer->request, NULL);
+                return rc;
+        }
+
+        *handle = (usb_handle_t) transfer;
+
+        return EOK;
+}
+
 /** Start control read transfer. */
 int usb_drv_async_control_read_setup(int phone, usb_target_t target,
@@ -530 +580 @@
 }
 
+/** Issue whole control read transfer. */
+int usb_drv_async_control_read(int phone, usb_target_t target,
+    void *setup_packet, size_t setup_packet_size,
+    void *buffer, size_t buffer_size, size_t *actual_size,
+    usb_handle_t *handle)
+{
+        // FIXME - check input parameters instead of asserting them
+        assert(phone > 0);
+        assert(setup_packet != NULL);
+        assert(setup_packet_size > 0);
+        assert(buffer != NULL);
+        assert(buffer_size > 0);
+        assert(handle != NULL);
+
+        transfer_info_t *transfer
+            = (transfer_info_t *) malloc(sizeof(transfer_info_t));
+        if (transfer == NULL) {
+                return ENOMEM;
+        }
+
+        transfer->size_transferred = actual_size;
+        transfer->buffer = buffer;
+        transfer->size = buffer_size;
+        transfer->phone = phone;
+
+        int rc;
+
+        transfer->request = async_send_4(phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_CONTROL_READ,
+            target.address, target.endpoint,
+            buffer_size,
+            &transfer->reply);
+
+        rc = async_data_write_start(phone, setup_packet, setup_packet_size);
+        if (rc != EOK) {
+                async_wait_for(transfer->request, NULL);
+                return rc;
+        }
+
+        *handle = (usb_handle_t) transfer;
+
+        return EOK;
+}
+
 /**
  * @}