Changeset dad6e8a in mainline for uspace/lib

Timestamp:

2010-12-12T10:34:48Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

14388b4

Parents:

cf978f2 (diff), 5174c62 (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:

• usb/include/usb/classes/hub.h (modified) (2 diffs)
• usb/include/usb/hcdhubd.h (modified) (1 diff)
• usb/src/usbdrv.c (modified) (7 diffs)
• usbvirt/transaction.c (modified) (1 diff)

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

@@ -177 +177 @@
 
 /** @brief hub class request codes*/
+/// \TODO these are duplicit to standart descriptors
 typedef enum {
     /**  */
@@ -213 +214 @@
 usb_hub_descriptor_t * usb_deserialize_hub_desriptor(void * sdescriptor);
 
-/**
- * @brief create hub structure instance
- * 
- * @param device
- * @return
- */
-usb_hcd_hub_info_t * usb_create_hub_info(device_t * device);
 
 

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

@@ -65 +65 @@
 } usb_hcd_attached_device_info_t;
 
-/** Information about attached hub. */
-typedef struct {
-        /** Number of ports. */
-        size_t port_count;
-        /** General device info. */
-        usb_hcd_attached_device_info_t *device;
-        /** Link to other hubs. */
-        link_t link;
-} usb_hcd_hub_info_t;
 
 /** Host controller device. */

uspace/lib/usb/src/usbdrv.c

@@ -36 +36 @@
 #include <usbhc_iface.h>
 #include <errno.h>
+#include <str_error.h>
 
 /** Information about pending transaction on HC. */
@@ -90 +91 @@
 {
         ipcarg_t address;
-        int rc = async_req_1_1(phone, IPC_M_USBHC_GET_ADDRESS,
+        int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_GET_ADDRESS,
             dev->handle, &address);
 
         if (rc != EOK) {
+                printf("usb_drv_get_my_address over %d failed: %s\n", phone, str_error(rc));
                 return rc;
         }
@@ -107 +110 @@
 int usb_drv_reserve_default_address(int phone)
 {
-        return async_req_0_0(phone, IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS);
+        return async_req_1_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS);
 }
 
@@ -117 +121 @@
 int usb_drv_release_default_address(int phone)
 {
-        return async_req_0_0(phone, IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
+        return async_req_1_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS);
 }
 
@@ -128 +133 @@
 {
         ipcarg_t address;
-        int rc = async_req_0_1(phone, IPC_M_USBHC_REQUEST_ADDRESS, &address);
+        int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_REQUEST_ADDRESS, &address);
         if (rc != EOK) {
                 return rc;
@@ -146 +152 @@
     devman_handle_t handle)
 {
-        int rc = async_req_2_0(phone, IPC_M_USBHC_BIND_ADDRESS,
+        int rc = async_req_3_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_BIND_ADDRESS,
             address, handle);
 
@@ -160 +167 @@
 int usb_drv_release_address(int phone, usb_address_t address)
 {
-        return async_req_1_0(phone, IPC_M_USBHC_RELEASE_ADDRESS, address);
+        return async_req_2_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_RELEASE_ADDRESS, address);
 }
 

uspace/lib/usbvirt/transaction.c

@@ -184 +184 @@
                                 actual_size = size;
                         }
+                        device->lib_debug(device, 1, USBVIRT_DEBUGTAG_TRANSACTION,
+                            "in transaction: will copy %zu bytes", actual_size);
                         if (actual_size > 0) {
                                 memcpy(buffer, transfer->data, actual_size);