Changeset 8365533 in mainline for uspace/lib/usb/src/usbdrv.c
- Timestamp:
- 2010-12-12T10:54:43Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8dc569a, ec6ab88
- Parents:
- 243cb86 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usb/src/usbdrv.c
r243cb86 r8365533 36 36 #include <usbhc_iface.h> 37 37 #include <errno.h> 38 #include <str_error.h> 38 39 39 40 /** Information about pending transaction on HC. */ … … 90 91 { 91 92 ipcarg_t address; 92 int rc = async_req_1_1(phone, IPC_M_USBHC_GET_ADDRESS, 93 int rc = async_req_2_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE), 94 IPC_M_USBHC_GET_ADDRESS, 93 95 dev->handle, &address); 94 96 95 97 if (rc != EOK) { 98 printf("usb_drv_get_my_address over %d failed: %s\n", phone, str_error(rc)); 96 99 return rc; 97 100 } … … 107 110 int usb_drv_reserve_default_address(int phone) 108 111 { 109 return async_req_0_0(phone, IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS); 112 return async_req_1_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE), 113 IPC_M_USBHC_RESERVE_DEFAULT_ADDRESS); 110 114 } 111 115 … … 117 121 int usb_drv_release_default_address(int phone) 118 122 { 119 return async_req_0_0(phone, IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS); 123 return async_req_1_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE), 124 IPC_M_USBHC_RELEASE_DEFAULT_ADDRESS); 120 125 } 121 126 … … 128 133 { 129 134 ipcarg_t address; 130 int rc = async_req_0_1(phone, IPC_M_USBHC_REQUEST_ADDRESS, &address); 135 int rc = async_req_1_1(phone, DEV_IFACE_ID(USBHC_DEV_IFACE), 136 IPC_M_USBHC_REQUEST_ADDRESS, &address); 131 137 if (rc != EOK) { 132 138 return rc; … … 146 152 devman_handle_t handle) 147 153 { 148 int rc = async_req_2_0(phone, IPC_M_USBHC_BIND_ADDRESS, 154 int rc = async_req_3_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE), 155 IPC_M_USBHC_BIND_ADDRESS, 149 156 address, handle); 150 157 … … 160 167 int usb_drv_release_address(int phone, usb_address_t address) 161 168 { 162 return async_req_1_0(phone, IPC_M_USBHC_RELEASE_ADDRESS, address); 169 return async_req_2_0(phone, DEV_IFACE_ID(USBHC_DEV_IFACE), 170 IPC_M_USBHC_RELEASE_ADDRESS, address); 163 171 } 164 172
Note:
See TracChangeset
for help on using the changeset viewer.