Changeset d08b1603 in mainline

Timestamp:

2010-12-10T17:42:26Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b9eb93f

Parents:

39701ed

Message:

Fix wrong phone calling

Forget to add real method (for DDF interface).

File:

• uspace/lib/usb/src/usbdrv.c (modified) (7 diffs)

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);
 }