Changeset 1d5a540 in mainline for uspace/lib/usb/src/ddfiface.c
- Timestamp:
- 2012-08-17T11:52:20Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 034c4202
- Parents:
- 8312577 (diff), 56fd7cf (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/ddfiface.c
r8312577 r1d5a540 68 68 { 69 69 assert(fun); 70 return usb_get_hc_by_handle( fun->handle, handle);70 return usb_get_hc_by_handle(ddf_fun_get_handle(fun), handle); 71 71 } 72 72 … … 82 82 83 83 if (handle != NULL) { 84 *handle = fun->handle;84 *handle = ddf_fun_get_handle(fun); 85 85 } 86 86 … … 99 99 { 100 100 assert(fun); 101 return usb_get_address_by_handle( fun->handle, address);101 return usb_get_address_by_handle(ddf_fun_get_handle(fun), address); 102 102 } 103 103 … … 116 116 usb_address_t *address) 117 117 { 118 assert(fun); 119 assert(fun->driver_data); 120 const usb_hub_attached_device_t *device = fun->driver_data; 118 const usb_hub_attached_device_t *device = ddf_fun_data_get(fun); 121 119 assert(device->fun == fun); 122 120 if (address)
Note:
See TracChangeset
for help on using the changeset viewer.