Changes in uspace/drv/uhci-hcd/iface.c [61bb85d:6427cf67] in mainline
- File:
-
- 1 edited
-
uspace/drv/uhci-hcd/iface.c (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/uhci-hcd/iface.c
r61bb85d r6427cf67 54 54 } 55 55 /*----------------------------------------------------------------------------*/ 56 static int reserve_default_address(device_t *dev )56 static int reserve_default_address(device_t *dev, bool full_speed) 57 57 { 58 58 assert(dev); … … 72 72 } 73 73 /*----------------------------------------------------------------------------*/ 74 static int request_address(device_t *dev, usb_address_t *address) 74 static int request_address(device_t *dev, bool full_speed, 75 usb_address_t *address) 75 76 { 76 77 assert(dev); … … 109 110 dev_speed_t speed = FULL_SPEED; 110 111 111 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_INTERRUPT,112 max_packet_size, speed, data, size, NULL, callback, arg);113 if (! tracker)114 return ENOMEM; 115 tracker_interrupt_out(tracker);112 batch_t *batch = batch_get(dev, target, USB_TRANSFER_INTERRUPT, 113 max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg); 114 if (!batch) 115 return ENOMEM; 116 batch_interrupt_out(batch); 116 117 return EOK; 117 118 } … … 124 125 dev_speed_t speed = FULL_SPEED; 125 126 126 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_INTERRUPT,127 max_packet_size, speed, data, size, callback, NULL, arg);128 if (! tracker)129 return ENOMEM; 130 tracker_interrupt_in(tracker);127 batch_t *batch = batch_get(dev, target, USB_TRANSFER_INTERRUPT, 128 max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg); 129 if (!batch) 130 return ENOMEM; 131 batch_interrupt_in(batch); 131 132 return EOK; 132 133 } … … 139 140 dev_speed_t speed = FULL_SPEED; 140 141 141 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 142 max_packet_size, speed, data, size, NULL, callback, arg); 143 if (!tracker) 144 return ENOMEM; 145 tracker_control_write(tracker, setup_data, setup_size); 142 batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, 143 max_packet_size, speed, data, size, setup_data, setup_size, 144 NULL, callback, arg); 145 if (!batch) 146 return ENOMEM; 147 batch_control_write(batch); 146 148 return EOK; 147 149 } … … 154 156 dev_speed_t speed = FULL_SPEED; 155 157 156 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 157 max_packet_size, speed, data, size, callback, NULL, arg); 158 if (!tracker) 159 return ENOMEM; 160 tracker_control_read(tracker, setup_data, setup_size); 158 batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, 159 max_packet_size, speed, data, size, setup_data, setup_size, callback, 160 NULL, arg); 161 if (!batch) 162 return ENOMEM; 163 batch_control_read(batch); 161 164 return EOK; 162 165 } … … 166 169 usbhc_iface_transfer_out_callback_t callback, void *arg) 167 170 { 168 usb_log_warning("Using deprecated API control write setup.\n"); 169 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 170 8, FULL_SPEED, data, size, NULL, callback, arg); 171 if (!tracker) 172 return ENOMEM; 173 tracker_control_setup_old(tracker); 171 size_t max_packet_size = 8; 172 dev_speed_t speed = FULL_SPEED; 173 174 usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); 175 batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, 176 max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg); 177 if (!batch) 178 return ENOMEM; 179 batch_control_setup_old(batch); 174 180 return EOK; 175 181 } … … 179 185 usbhc_iface_transfer_out_callback_t callback, void *arg) 180 186 { 181 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 182 size, FULL_SPEED, data, size, NULL, callback, arg); 183 if (!tracker) 184 return ENOMEM; 185 tracker_control_write_data_old(tracker); 187 size_t max_packet_size = 8; 188 dev_speed_t speed = FULL_SPEED; 189 190 usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); 191 batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, 192 max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg); 193 if (!batch) 194 return ENOMEM; 195 batch_control_write_data_old(batch); 186 196 return EOK; 187 197 } … … 190 200 usbhc_iface_transfer_in_callback_t callback, void *arg) 191 201 { 192 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 193 0, FULL_SPEED, NULL, 0, callback, NULL, arg); 194 if (!tracker) 195 return ENOMEM; 196 tracker_control_write_status_old(tracker); 202 size_t max_packet_size = 8; 203 dev_speed_t speed = FULL_SPEED; 204 205 usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); 206 batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, 207 max_packet_size, speed, NULL, 0, NULL, 0, callback, NULL, arg); 208 if (!batch) 209 return ENOMEM; 210 batch_control_write_status_old(batch); 197 211 return EOK; 198 212 } … … 202 216 usbhc_iface_transfer_out_callback_t callback, void *arg) 203 217 { 204 usb_log_warning("Using deprecated API control read setup.\n"); 205 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 206 8, FULL_SPEED, data, size, NULL, callback, arg); 207 if (!tracker) 208 return ENOMEM; 209 tracker_control_setup_old(tracker); 218 size_t max_packet_size = 8; 219 dev_speed_t speed = FULL_SPEED; 220 221 usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); 222 batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, 223 max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg); 224 if (!batch) 225 return ENOMEM; 226 batch_control_setup_old(batch); 210 227 return EOK; 211 228 } … … 215 232 usbhc_iface_transfer_in_callback_t callback, void *arg) 216 233 { 217 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 218 size, FULL_SPEED, data, size, callback, NULL, arg); 219 if (!tracker) 220 return ENOMEM; 221 tracker_control_read_data_old(tracker); 234 size_t max_packet_size = 8; 235 dev_speed_t speed = FULL_SPEED; 236 237 usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); 238 batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, 239 max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg); 240 if (!batch) 241 return ENOMEM; 242 batch_control_read_data_old(batch); 222 243 return EOK; 223 244 } … … 226 247 usbhc_iface_transfer_out_callback_t callback, void *arg) 227 248 { 228 tracker_t *tracker = tracker_get(dev, target, USB_TRANSFER_CONTROL, 229 0, FULL_SPEED, NULL, 0, NULL, callback, arg); 230 if (!tracker) 231 return ENOMEM; 232 tracker_control_read_status_old(tracker); 249 size_t max_packet_size = 8; 250 dev_speed_t speed = FULL_SPEED; 251 252 usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); 253 batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, 254 max_packet_size, speed, NULL, 0, NULL, 0, NULL, callback, arg); 255 if (!batch) 256 return ENOMEM; 257 batch_control_read_status_old(batch); 233 258 return EOK; 234 259 }
Note:
See TracChangeset
for help on using the changeset viewer.
