Changes in uspace/lib/usbdev/src/devpoll.c [56fd7cf:bb70637] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbdev/src/devpoll.c
r56fd7cf rbb70637 51 51 /** USB device to poll. */ 52 52 usb_device_t *dev; 53 /** Device pipeto use for polling. */54 size_t pipe_index;53 /** Device enpoint mapping to use for polling. */ 54 usb_endpoint_mapping_t *polling_mapping; 55 55 /** Size of the recieved data. */ 56 56 size_t request_size; … … 72 72 const usb_device_auto_polling_t *params = &data->auto_polling; 73 73 74 usb_pipe_t *pipe 75 = &data->dev->pipes[data->pipe_index].pipe; 74 usb_pipe_t *pipe = &data->polling_mapping->pipe; 76 75 77 76 if (params->debug > 0) { 78 77 const usb_endpoint_mapping_t *mapping 79 = &data->dev->pipes[data->pipe_index];78 = data->polling_mapping; 80 79 usb_log_debug("Poll%p: started polling of `%s' - " \ 81 80 "interface %d (%s,%d,%d), %zuB/%zu.\n", 82 data, ddf_dev_get_name(data->dev->ddf_dev),81 data, usb_device_get_name(data->dev), 83 82 (int) mapping->interface->interface_number, 84 83 usb_str_class(mapping->interface->interface_class), … … 117 116 */ 118 117 usb_request_clear_endpoint_halt( 119 &data->dev->ctrl_pipe, pipe->endpoint_no); 118 usb_device_get_default_pipe(data->dev), 119 pipe->endpoint_no); 120 120 } 121 121 … … 159 159 if (failed) { 160 160 usb_log_error("Polling of device `%s' terminated: " 161 "recurring failures.\n", ddf_dev_get_name(162 data->dev->ddf_dev));161 "recurring failures.\n", 162 usb_device_get_name(data->dev)); 163 163 } else { 164 164 usb_log_debug("Polling of device `%s' terminated: " 165 "driver request.\n", ddf_dev_get_name(166 data->dev->ddf_dev));165 "driver request.\n", 166 usb_device_get_name(data->dev)); 167 167 } 168 168 } … … 175 175 } 176 176 177 177 178 /** Start automatic device polling over interrupt in pipe. 178 179 * 179 * @warning It is up to the callback to produce delays between individual180 * requests.180 * The polling settings is copied thus it is okay to destroy the structure 181 * after this function returns. 181 182 * 182 183 * @warning There is no guarantee when the request to the device … … 185 186 * 186 187 * @param dev Device to be periodically polled. 188 * @param epm Endpoint mapping to use. 189 * @param polling Polling settings. 190 * @param request_size How many bytes to ask for in each request. 191 * @param arg Custom argument (passed as is to the callbacks). 192 * @return Error code. 193 * @retval EOK New fibril polling the device was already started. 194 */ 195 static int usb_device_auto_polling_internal(usb_device_t *dev, 196 usb_endpoint_mapping_t *epm, const usb_device_auto_polling_t *polling, 197 size_t request_size) 198 { 199 if ((dev == NULL) || (polling == NULL) || (polling->on_data == NULL)) { 200 return EBADMEM; 201 } 202 203 if (request_size == 0) 204 return EINVAL; 205 206 if (!epm || (epm->pipe.transfer_type != USB_TRANSFER_INTERRUPT) || 207 (epm->pipe.direction != USB_DIRECTION_IN)) 208 return EINVAL; 209 210 211 polling_data_t *polling_data = malloc(sizeof(polling_data_t)); 212 if (polling_data == NULL) { 213 return ENOMEM; 214 } 215 216 /* Fill-in the data. */ 217 polling_data->buffer = malloc(sizeof(request_size)); 218 if (polling_data->buffer == NULL) { 219 free(polling_data); 220 return ENOMEM; 221 } 222 polling_data->request_size = request_size; 223 polling_data->dev = dev; 224 polling_data->polling_mapping = epm; 225 226 /* Copy provided settings. */ 227 polling_data->auto_polling = *polling; 228 229 /* Negative value means use descriptor provided value. */ 230 if (polling->delay < 0) { 231 polling_data->auto_polling.delay = 232 epm->descriptor->poll_interval; 233 } 234 235 fid_t fibril = fibril_create(polling_fibril, polling_data); 236 if (fibril == 0) { 237 free(polling_data->buffer); 238 free(polling_data); 239 return ENOMEM; 240 } 241 fibril_add_ready(fibril); 242 243 /* Fibril launched. That fibril will free the allocated data. */ 244 245 return EOK; 246 } 247 /** Start automatic device polling over interrupt in pipe. 248 * 249 * The polling settings is copied thus it is okay to destroy the structure 250 * after this function returns. 251 * 252 * @warning There is no guarantee when the request to the device 253 * will be sent for the first time (it is possible that this 254 * first request would be executed prior to return from this function). 255 * 256 * @param dev Device to be periodically polled. 187 257 * @param pipe_index Index of the endpoint pipe used for polling. 258 * @param polling Polling settings. 259 * @param req_size How many bytes to ask for in each request. 260 * @param arg Custom argument (passed as is to the callbacks). 261 * @return Error code. 262 * @retval EOK New fibril polling the device was already started. 263 */ 264 int usb_device_auto_polling(usb_device_t *usb_dev, usb_endpoint_t ep, 265 const usb_device_auto_polling_t *polling, size_t req_size) 266 { 267 usb_endpoint_mapping_t *epm = usb_device_get_mapped_ep(usb_dev, ep); 268 return usb_device_auto_polling_internal(usb_dev, epm, polling, req_size); 269 } 270 271 /** Start automatic device polling over interrupt in pipe. 272 * 273 * @warning It is up to the callback to produce delays between individual 274 * requests. 275 * 276 * @warning There is no guarantee when the request to the device 277 * will be sent for the first time (it is possible that this 278 * first request would be executed prior to return from this function). 279 * 280 * @param dev Device to be periodically polled. 281 * @param ep Endpoint used for polling. 188 282 * @param callback Callback when data are available. 189 283 * @param request_size How many bytes to ask for in each request. 284 * @param delay NUmber of ms to wait between queries, -1 to use descriptor val. 190 285 * @param terminated_callback Callback when polling is terminated. 191 286 * @param arg Custom argument (passed as is to the callbacks). … … 193 288 * @retval EOK New fibril polling the device was already started. 194 289 */ 195 int usb_device_auto_poll(usb_device_t *dev, size_t pipe_index,196 usb_polling_callback_t callback, size_t request_size, 290 int usb_device_auto_poll(usb_device_t *dev, usb_endpoint_t ep, 291 usb_polling_callback_t callback, size_t request_size, int delay, 197 292 usb_polling_terminted_callback_t terminated_callback, void *arg) 198 293 { … … 200 295 .debug = 1, 201 296 .auto_clear_halt = true, 202 .delay = 0,297 .delay = delay, 203 298 .max_failures = MAX_FAILED_ATTEMPTS, 204 299 .on_data = callback, … … 208 303 }; 209 304 210 return usb_device_auto_polling(dev, pipe_index, &auto_polling, 211 request_size); 212 } 213 214 /** Start automatic device polling over interrupt in pipe. 215 * 216 * The polling settings is copied thus it is okay to destroy the structure 217 * after this function returns. 218 * 219 * @warning There is no guarantee when the request to the device 220 * will be sent for the first time (it is possible that this 221 * first request would be executed prior to return from this function). 222 * 223 * @param dev Device to be periodically polled. 224 * @param pipe_index Index of the endpoint pipe used for polling. 225 * @param polling Polling settings. 226 * @param request_size How many bytes to ask for in each request. 227 * @param arg Custom argument (passed as is to the callbacks). 228 * @return Error code. 229 * @retval EOK New fibril polling the device was already started. 230 */ 231 int usb_device_auto_polling(usb_device_t *dev, size_t pipe_index, 232 const usb_device_auto_polling_t *polling, 233 size_t request_size) 234 { 235 if ((dev == NULL) || (polling == NULL) || (polling->on_data == NULL)) { 236 return EBADMEM; 237 } 238 239 if (pipe_index >= dev->pipes_count || request_size == 0) { 240 return EINVAL; 241 } 242 if ((dev->pipes[pipe_index].pipe.transfer_type != USB_TRANSFER_INTERRUPT) 243 || (dev->pipes[pipe_index].pipe.direction != USB_DIRECTION_IN)) { 244 return EINVAL; 245 } 246 247 polling_data_t *polling_data = malloc(sizeof(polling_data_t)); 248 if (polling_data == NULL) { 249 return ENOMEM; 250 } 251 252 /* Fill-in the data. */ 253 polling_data->buffer = malloc(sizeof(request_size)); 254 if (polling_data->buffer == NULL) { 255 free(polling_data); 256 return ENOMEM; 257 } 258 polling_data->request_size = request_size; 259 polling_data->dev = dev; 260 polling_data->pipe_index = pipe_index; 261 262 /* Copy provided settings. */ 263 polling_data->auto_polling = *polling; 264 265 /* Negative value means use descriptor provided value. */ 266 if (polling->delay < 0) { 267 polling_data->auto_polling.delay = 268 (int) dev->pipes[pipe_index].descriptor->poll_interval; 269 } 270 271 fid_t fibril = fibril_create(polling_fibril, polling_data); 272 if (fibril == 0) { 273 free(polling_data->buffer); 274 free(polling_data); 275 return ENOMEM; 276 } 277 fibril_add_ready(fibril); 278 279 /* Fibril launched. That fibril will free the allocated data. */ 280 281 return EOK; 305 usb_endpoint_mapping_t *epm = usb_device_get_mapped_ep(dev, ep); 306 return usb_device_auto_polling_internal( 307 dev, epm, &auto_polling, request_size); 308 } 309 310 int usb_device_auto_polling_desc(usb_device_t *usb_dev, 311 const usb_endpoint_description_t *desc, 312 const usb_device_auto_polling_t *polling, size_t req_size) 313 { 314 usb_endpoint_mapping_t *epm = 315 usb_device_get_mapped_ep_desc(usb_dev, desc); 316 return usb_device_auto_polling_internal(usb_dev, epm, polling, req_size); 317 } 318 319 int usb_device_auto_poll_desc(usb_device_t * usb_dev, 320 const usb_endpoint_description_t *desc, usb_polling_callback_t callback, 321 size_t req_size, int delay, 322 usb_polling_terminted_callback_t terminated_callback, void *arg) 323 { 324 const usb_device_auto_polling_t auto_polling = { 325 .debug = 1, 326 .auto_clear_halt = true, 327 .delay = delay, 328 .max_failures = MAX_FAILED_ATTEMPTS, 329 .on_data = callback, 330 .on_polling_end = terminated_callback, 331 .on_error = NULL, 332 .arg = arg, 333 }; 334 335 usb_endpoint_mapping_t *epm = 336 usb_device_get_mapped_ep_desc(usb_dev, desc); 337 return usb_device_auto_polling_internal( 338 usb_dev, epm, &auto_polling, req_size); 282 339 } 283 340
Note:
See TracChangeset
for help on using the changeset viewer.