Changes in uspace/lib/usb/src/hc.c [02fc5c4:8e5ce07] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usb/src/hc.c
r02fc5c4 r8e5ce07 153 153 if (!usb_hc_connection_is_opened(connection)) 154 154 return ENOENT; 155 155 156 156 async_exch_t *exch = async_exchange_begin(connection->hc_sess); 157 if (!exch) 158 return ENOMEM; 159 const int ret = usbhc_get_handle(exch, address, handle); 157 158 sysarg_t tmp; 159 int rc = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), 160 IPC_M_USBHC_GET_HANDLE_BY_ADDRESS, 161 address, &tmp); 162 160 163 async_exchange_end(exch); 161 return ret; 164 165 if ((rc == EOK) && (handle != NULL)) 166 *handle = tmp; 167 168 return rc; 162 169 } 163 170 … … 167 174 * @return USB address or negative error code. 168 175 */ 169 usb_address_t usb_ get_address_by_handle(devman_handle_t dev_handle)176 usb_address_t usb_hc_get_address_by_handle(devman_handle_t dev_handle) 170 177 { 171 178 async_sess_t *parent_sess = … … 174 181 if (!parent_sess) 175 182 return ENOMEM; 176 183 177 184 async_exch_t *exch = async_exchange_begin(parent_sess); 178 if (!exch) { 179 async_hangup(parent_sess); 180 return ENOMEM; 181 } 182 usb_address_t address; 183 const int ret = usb_get_my_address(exch, &address); 184 185 186 sysarg_t address; 187 int rc = async_req_2_1(exch, DEV_IFACE_ID(USB_DEV_IFACE), 188 IPC_M_USB_GET_ADDRESS, 189 dev_handle, &address); 190 185 191 async_exchange_end(exch); 186 192 async_hangup(parent_sess); 187 188 if (r et!= EOK)189 return r et;190 191 return address;193 194 if (rc != EOK) 195 return rc; 196 197 return (usb_address_t) address; 192 198 } 193 199 … … 226 232 if (!parent_sess) 227 233 return ENOMEM; 228 234 229 235 async_exch_t *exch = async_exchange_begin(parent_sess); 230 if (!exch) { 231 async_hangup(parent_sess); 232 return ENOMEM; 233 } 234 const int ret = usb_get_hc_handle(exch, hc_handle); 235 236 237 devman_handle_t h; 238 int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE), 239 IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h); 240 236 241 async_exchange_end(exch); 237 242 async_hangup(parent_sess); 238 239 return ret; 243 244 if (rc != EOK) 245 return rc; 246 247 if (hc_handle != NULL) 248 *hc_handle = h; 249 250 return EOK; 240 251 } 241 252
Note:
See TracChangeset
for help on using the changeset viewer.