Changeset b7068da in mainline for uspace/lib/usb/src/ddfiface.c
- Timestamp:
- 2012-02-09T20:35:12Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 591762c6
- Parents:
- 7cede12c (diff), 3d4750f (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
-
TabularUnified uspace/lib/usb/src/ddfiface.c ¶
r7cede12c rb7068da 44 44 #include <assert.h> 45 45 46 #include <usb/dev.h> 47 46 48 /** DDF interface for USB device, implementation for typical hub. */ 47 49 usb_iface_t usb_iface_hub_impl = { … … 66 68 { 67 69 assert(fun); 68 return usb_ hc_find(fun->handle, handle);70 return usb_get_hc_by_handle(fun->handle, handle); 69 71 } 70 72 … … 97 99 { 98 100 assert(fun); 99 100 async_sess_t *parent_sess = 101 devman_parent_device_connect(EXCHANGE_SERIALIZE, fun->handle, 102 IPC_FLAG_BLOCKING); 103 if (!parent_sess) 104 return ENOMEM; 105 106 async_exch_t *exch = async_exchange_begin(parent_sess); 107 if (!exch) { 108 async_hangup(parent_sess); 109 return ENOMEM; 110 } 111 112 const int ret = usb_get_my_address(exch, address); 113 114 async_exchange_end(exch); 115 async_hangup(parent_sess); 116 117 return ret; 101 return usb_get_address_by_handle(fun->handle, address); 118 102 } 119 103 … … 134 118 assert(fun); 135 119 assert(fun->driver_data); 136 usb_hub_attached_device_t *device = fun->driver_data;120 const usb_hub_attached_device_t *device = fun->driver_data; 137 121 assert(device->fun == fun); 138 122 if (address)
Note:
See TracChangeset
for help on using the changeset viewer.