Changeset 818dc00 in mainline for uspace/lib

Timestamp:

2010-12-09T00:02:25Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

040068c

Parents:

aca85e4 (diff), 07b9203e (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 with vojtechhorky/

Location:

uspace/lib

Files:

• c/include/ipc/dev_iface.h (modified) (1 diff)
• drv/generic/remote_usbhc.c (modified) (8 diffs)
• usb/Makefile (modified) (1 diff)
• usb/include/usb/debug.h (added)
• usb/include/usb/usb.h (modified) (1 diff)
• usb/include/usb/usbdrv.h (modified) (4 diffs)
• usb/src/debug.c (added)
• usb/src/drvpsync.c (added)
• usb/src/usbdrvreq.c (modified) (2 diffs)

uspace/lib/c/include/ipc/dev_iface.h

@@ -54 +54 @@
         DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX)
 
+/*
+ * The first argument is actually method (as the "real" method is used
+ * for indexing into interfaces.
+ */
+
+#define DEV_IPC_GET_ARG1(call) IPC_GET_ARG2((call))
+#define DEV_IPC_GET_ARG2(call) IPC_GET_ARG3((call))
+#define DEV_IPC_GET_ARG3(call) IPC_GET_ARG4((call))
+#define DEV_IPC_GET_ARG4(call) IPC_GET_ARG5((call))
+
 
 #endif

uspace/lib/drv/generic/remote_usbhc.c

@@ -108 +108 @@
         }
 
-        devman_handle_t handle = IPC_GET_ARG1(*call);
+        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
 
         usb_address_t address;
@@ -122 +122 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        ipcarg_t buffer_hash = IPC_GET_ARG1(*call);
+        ipcarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
         async_transaction_t * trans = (async_transaction_t *)buffer_hash;
         if (trans == NULL) {
@@ -144 +144 @@
                 accepted_size = trans->size;
         }
-        async_data_read_finalize(callid, trans->buffer, accepted_size);
+        async_data_read_finalize(cid, trans->buffer, accepted_size);
 
         ipc_answer_1(callid, EOK, accepted_size);
@@ -211 +211 @@
         }
 
-        usb_address_t address = (usb_address_t) IPC_GET_ARG1(*call);
-        devman_handle_t handle = (devman_handle_t) IPC_GET_ARG2(*call);
+        usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call);
+        devman_handle_t handle = (devman_handle_t) DEV_IPC_GET_ARG2(*call);
 
         int rc = usb_iface->bind_address(device, address, handle);
@@ -229 +229 @@
         }
 
-        usb_address_t address = (usb_address_t) IPC_GET_ARG1(*call);
+        usb_address_t address = (usb_address_t) DEV_IPC_GET_ARG1(*call);
 
         int rc = usb_iface->release_address(device, address);
@@ -275 +275 @@
         }
 
-        size_t expected_len = IPC_GET_ARG3(*call);
+        size_t expected_len = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
-                .address = IPC_GET_ARG1(*call),
-                .endpoint = IPC_GET_ARG2(*call)
+                .address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call)
         };
 
@@ -327 +327 @@
         }
 
-        size_t len = IPC_GET_ARG3(*call);
+        size_t len = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
-                .address = IPC_GET_ARG1(*call),
-                .endpoint = IPC_GET_ARG2(*call)
+                .address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call)
         };
 
@@ -384 +384 @@
 
         usb_target_t target = {
-                .address = IPC_GET_ARG1(*call),
-                .endpoint = IPC_GET_ARG2(*call)
+                .address = DEV_IPC_GET_ARG1(*call),
+                .endpoint = DEV_IPC_GET_ARG2(*call)
         };
 

uspace/lib/usb/Makefile

@@ -34 +34 @@
 SOURCES = \
         src/addrkeep.c \
+        src/debug.c \
+        src/drvpsync.c \
         src/hcdhubd.c \
         src/hcdrv.c \

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

@@ -71 +71 @@
 /** Default USB address. */
 #define USB_ADDRESS_DEFAULT 0
+/** Maximum address number in USB 1.1. */
+#define USB11_ADDRESS_MAX 128
 
 /** USB endpoint number type.

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

@@ -38 +38 @@
 #include <usb/usb.h>
 #include <driver.h>
+#include <usb/devreq.h>
+#include <usb/descriptor.h>
 
 int usb_drv_hc_connect(device_t *, unsigned int);
@@ -54 +56 @@
     void *, size_t, size_t *, usb_handle_t *);
 
+int usb_drv_psync_interrupt_out(int, usb_target_t, void *, size_t);
+int usb_drv_psync_interrupt_in(int, usb_target_t, void *, size_t, size_t *);
+
+
+
 int usb_drv_async_control_write_setup(int, usb_target_t,
     void *, size_t, usb_handle_t *);
@@ -60 +67 @@
 int usb_drv_async_control_write_status(int, usb_target_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);
+int usb_drv_psync_control_write_status(int, usb_target_t);
+
 
 int usb_drv_async_control_read_setup(int, usb_target_t,
@@ -68 +80 @@
     usb_handle_t *);
 
+int usb_drv_psync_control_read_setup(int, usb_target_t, void *, size_t);
+int usb_drv_psync_control_read_data(int, usb_target_t, void *, size_t, size_t *);
+int usb_drv_psync_control_read_status(int, usb_target_t);
+
+
 int usb_drv_async_wait_for(usb_handle_t);
 
 
 int usb_drv_req_set_address(int, usb_address_t, usb_address_t);
+int usb_drv_req_get_device_descriptor(int, usb_address_t,
+    usb_standard_device_descriptor_t *);
 
 #endif

uspace/lib/usb/src/usbdrvreq.c

@@ -34 +34 @@
  */
 #include <usb/usbdrv.h>
-#include <usb/devreq.h>
 #include <errno.h>
 
@@ -95 +94 @@
 }
 
+/** Retrieve device descriptor of connected USB device.
+ *
+ * @param[in] phone Open phone to HC driver.
+ * @param[in] address Device USB address.
+ * @param[out] descriptor Storage for the device descriptor.
+ * @return Error code.
+ * @retval EBADMEM @p descriptor is NULL.
+ */
+int usb_drv_req_get_device_descriptor(int phone, usb_address_t address,
+    usb_standard_device_descriptor_t *descriptor)
+{
+        if (descriptor == NULL) {
+                return EBADMEM;
+        }
+
+        /* Prepare the target. */
+        usb_target_t target = {
+                .address = address,
+                .endpoint = 0
+        };
+
+        /* Prepare the setup packet. */
+        usb_device_request_setup_packet_t setup_packet = {
+                .request_type = 128,
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                .index = 0,
+                .length = sizeof(usb_standard_device_descriptor_t)
+        };
+        setup_packet.value_high = USB_DESCTYPE_DEVICE;
+        setup_packet.value_low = 0;
+
+        usb_handle_t handle;
+        int rc;
+
+        /* Start the control read transfer. */
+        rc = usb_drv_async_control_read_setup(phone, target,
+            &setup_packet, sizeof(usb_device_request_setup_packet_t), &handle);
+        if (rc != EOK) {
+                return rc;
+        }
+        rc = usb_drv_async_wait_for(handle);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        /* Retrieve the descriptor. */
+        size_t actually_transferred = 0;
+        usb_standard_device_descriptor_t descriptor_tmp;
+        rc = usb_drv_async_control_read_data(phone, target,
+            &descriptor_tmp, sizeof(usb_standard_device_descriptor_t),
+            &actually_transferred, &handle);
+        if (rc != EOK) {
+                return rc;
+        }
+        rc = usb_drv_async_wait_for(handle);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        /* Finish the control read transfer. */
+        rc = usb_drv_async_control_read_status(phone, target, &handle);
+        if (rc != EOK) {
+                return rc;
+        }
+        rc = usb_drv_async_wait_for(handle);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        if (actually_transferred < sizeof(usb_standard_device_descriptor_t)) {
+                return ELIMIT;
+        }
+
+        /*
+         * Everything is okay, copy the descriptor.
+         */
+        memcpy(descriptor, &descriptor_tmp,
+            sizeof(usb_standard_device_descriptor_t));
+
+        return EOK;
+}
+
+
+
 /**
  * @}