Changeset 1537ba6 in mainline for uspace/lib

Timestamp:

2011-02-02T10:19:13Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

93f8da1

Parents:

0b31409 (diff), b00849e (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 development/ changes

Location:

uspace/lib

Files:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2010-2011 Vojtech Horky
  * All rights reserved.
  *
@@ -52 +52 @@
 static void remote_usbhc_control_read_data(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_read_status(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_control_write(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_control_read(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_reserve_default_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_release_default_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -81 +83 @@
         remote_usbhc_control_read_setup,
         remote_usbhc_control_read_data,
-        remote_usbhc_control_read_status
+        remote_usbhc_control_read_status,
+
+        remote_usbhc_control_write,
+        remote_usbhc_control_read
 };
 
@@ -95 +100 @@
         ipc_callid_t caller;
         void *buffer;
+        void *setup_packet;
         size_t size;
 } async_transaction_t;
@@ -297 +303 @@
         trans->caller = callid;
         trans->buffer = buffer;
+        trans->setup_packet = NULL;
         trans->size = len;
 
@@ -336 +343 @@
         trans->caller = callid;
         trans->buffer = malloc(len);
+        trans->setup_packet = NULL;
         trans->size = len;
 
@@ -391 +399 @@
         trans->caller = callid;
         trans->buffer = NULL;
+        trans->setup_packet = NULL;
         trans->size = 0;
 
@@ -496 +505 @@
 }
 
+void remote_usbhc_control_write(device_t *device, void *iface,
+ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+        assert(usb_iface != NULL);
+
+        if (!usb_iface->control_write) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        usb_target_t target = {
+                .address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call)
+        };
+
+        int rc;
+
+        void *setup_packet = NULL;
+        void *data_buffer = NULL;
+        size_t setup_packet_len = 0;
+        size_t data_buffer_len = 0;
+
+        rc = async_data_write_accept(&setup_packet, false,
+            1, USB_MAX_PAYLOAD_SIZE, 0, &setup_packet_len);
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
+                return;
+        }
+        rc = async_data_write_accept(&data_buffer, false,
+            1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len);
+        if (rc != EOK) {
+                free(setup_packet);
+                ipc_answer_0(callid, rc);
+                return;
+        }
+
+        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
+        trans->caller = callid;
+        trans->setup_packet = setup_packet;
+        trans->buffer = data_buffer;
+        trans->size = data_buffer_len;
+
+        rc = usb_iface->control_write(device, target,
+            setup_packet, setup_packet_len,
+            data_buffer, data_buffer_len,
+            callback_out, trans);
+
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
+                free(setup_packet);
+                free(data_buffer);
+                free(trans);
+        }
+}
+
+
+void remote_usbhc_control_read(device_t *device, void *iface,
+ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+        assert(usb_iface != NULL);
+
+        if (!usb_iface->control_read) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        size_t data_len = DEV_IPC_GET_ARG3(*call);
+        usb_target_t target = {
+                .address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call)
+        };
+
+        int rc;
+
+        void *setup_packet = NULL;
+        size_t setup_packet_len = 0;
+
+        rc = async_data_write_accept(&setup_packet, false,
+            1, USB_MAX_PAYLOAD_SIZE, 0, &setup_packet_len);
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
+                return;
+        }
+
+        async_transaction_t *trans = malloc(sizeof(async_transaction_t));
+        trans->caller = callid;
+        trans->setup_packet = setup_packet;
+        trans->buffer = malloc(data_len);
+        trans->size = data_len;
+
+        rc = usb_iface->control_read(device, target,
+            setup_packet, setup_packet_len,
+            trans->buffer, trans->size,
+            callback_in, trans);
+
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
+                free(setup_packet);
+                free(trans->buffer);
+                free(trans);
+        }
+}
+
 
 

uspace/lib/drv/include/usbhc_iface.h

@@ -201 +201 @@
         IPC_M_USBHC_CONTROL_READ_STATUS,
 
+        /** Issue control WRITE transfer.
+         * See explanation at usb_iface_funcs_t (OUT transaction) for
+         * call parameters.
+         * This call is immediately followed by two IPC data writes
+         * from the caller (setup packet and actual data).
+         */
+        IPC_M_USBHC_CONTROL_WRITE,
+
+        /** Issue control WRITE transfer.
+         * See explanation at usb_iface_funcs_t (IN transaction) for
+         * call parameters.
+         * This call is immediately followed by IPC data read from the caller
+         * (setup packet).
+         * Actual data are retrieved through IPC_M_USBHC_GET_BUFFER.
+         */
+        IPC_M_USBHC_CONTROL_READ,
 
         /* IPC_M_USB_ */
@@ -249 +265 @@
         int (*control_read_status)(device_t *, usb_target_t,
             usbhc_iface_transfer_out_callback_t, void *);
+
+        int (*control_write)(device_t *, usb_target_t,
+            void *, size_t, void *, size_t,
+            usbhc_iface_transfer_out_callback_t, void *);
+
+        int (*control_read)(device_t *, usb_target_t,
+            void *, size_t, void *, size_t,
+            usbhc_iface_transfer_in_callback_t, void *);
 } usbhc_iface_t;
 

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/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;
+}
+
 /**
  * @}