Changeset 7cba9f7 in mainline
- Timestamp:
- 2018-02-03T10:30:48Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 298e010
- Parents:
- f5718c79
- git-author:
- Petr Manek <petr.manek@…> (2018-02-03 10:30:37)
- git-committer:
- Petr Manek <petr.manek@…> (2018-02-03 10:30:48)
- Location:
- uspace/drv/bus/usb/usbdiag
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbdiag/device.c
rf5718c79 r7cba9f7 54 54 }; 55 55 56 static int device_init(usbdiag_dev_t *dev, const usb_endpoint_description_t **endpoints)56 static errno_t device_init(usbdiag_dev_t *dev, const usb_endpoint_description_t **endpoints) 57 57 { 58 int rc;58 errno_t rc; 59 59 ddf_fun_t *fun = usb_device_ddf_fun_create(dev->usb_dev, fun_exposed, "tmon"); 60 60 if (!fun) { … … 104 104 } 105 105 106 int usbdiag_dev_create(usb_device_t *dev, usbdiag_dev_t **out_diag_dev, const usb_endpoint_description_t **endpoints)106 errno_t usbdiag_dev_create(usb_device_t *dev, usbdiag_dev_t **out_diag_dev, const usb_endpoint_description_t **endpoints) 107 107 { 108 108 assert(dev); … … 115 115 diag_dev->usb_dev = dev; 116 116 117 int err;117 errno_t err; 118 118 if ((err = device_init(diag_dev, endpoints))) 119 119 goto err_init; -
uspace/drv/bus/usb/usbdiag/device.h
rf5718c79 r7cba9f7 77 77 } usbdiag_dev_t; 78 78 79 int usbdiag_dev_create(usb_device_t *, usbdiag_dev_t **, const usb_endpoint_description_t **);79 errno_t usbdiag_dev_create(usb_device_t *, usbdiag_dev_t **, const usb_endpoint_description_t **); 80 80 void usbdiag_dev_destroy(usbdiag_dev_t *); 81 81 -
uspace/drv/bus/usb/usbdiag/main.c
rf5718c79 r7cba9f7 47 47 static const usb_endpoint_description_t *diag_endpoints[]; 48 48 49 static int device_add(usb_device_t *dev)50 { 51 int rc;49 static errno_t device_add(usb_device_t *dev) 50 { 51 errno_t rc; 52 52 usb_log_info("Adding device '%s'", usb_device_get_name(dev)); 53 53 … … 79 79 } 80 80 81 static int device_cleanup(usbdiag_dev_t *diag_dev)81 static errno_t device_cleanup(usbdiag_dev_t *diag_dev) 82 82 { 83 83 /* TODO: Join some fibrils? */ … … 88 88 } 89 89 90 static int device_remove(usb_device_t *dev)91 { 92 int rc;90 static errno_t device_remove(usb_device_t *dev) 91 { 92 errno_t rc; 93 93 usb_log_info("Removing device '%s'", usb_device_get_name(dev)); 94 94 … … 109 109 } 110 110 111 static int device_gone(usb_device_t *dev)112 { 113 int rc;111 static errno_t device_gone(usb_device_t *dev) 112 { 113 errno_t rc; 114 114 usb_log_info("Device '%s' gone.", usb_device_get_name(dev)); 115 115 … … 129 129 } 130 130 131 static int function_online(ddf_fun_t *fun)131 static errno_t function_online(ddf_fun_t *fun) 132 132 { 133 133 return ddf_fun_online(fun); 134 134 } 135 135 136 static int function_offline(ddf_fun_t *fun)136 static errno_t function_offline(ddf_fun_t *fun) 137 137 { 138 138 return ddf_fun_offline(fun); -
uspace/drv/bus/usb/usbdiag/tests.c
rf5718c79 r7cba9f7 46 46 static const uint32_t test_data_src = 0xDEADBEEF; 47 47 48 static int test_in(usb_pipe_t *pipe, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)48 static errno_t test_in(usb_pipe_t *pipe, const usbdiag_test_params_t *params, usbdiag_test_results_t *results) 49 49 { 50 50 if (!pipe) … … 69 69 usb_log_info("Performing %s IN test with duration %ld ms.", usb_str_transfer_type(pipe->desc.transfer_type), params->min_duration); 70 70 71 int rc = EOK;71 errno_t rc = EOK; 72 72 uint32_t transfer_count = 0; 73 73 … … 138 138 } 139 139 140 static int test_out(usb_pipe_t *pipe, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)140 static errno_t test_out(usb_pipe_t *pipe, const usbdiag_test_params_t *params, usbdiag_test_results_t *results) 141 141 { 142 142 if (!pipe) … … 167 167 usb_log_info("Performing %s OUT test.", usb_str_transfer_type(pipe->desc.transfer_type)); 168 168 169 int rc = EOK;169 errno_t rc = EOK; 170 170 uint32_t transfer_count = 0; 171 171 … … 203 203 } 204 204 205 int usbdiag_dev_test_in(ddf_fun_t *fun, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)205 errno_t usbdiag_dev_test_in(ddf_fun_t *fun, const usbdiag_test_params_t *params, usbdiag_test_results_t *results) 206 206 { 207 207 usbdiag_dev_t *dev = ddf_fun_to_usbdiag_dev(fun); … … 228 228 } 229 229 230 int usbdiag_dev_test_out(ddf_fun_t *fun, const usbdiag_test_params_t *params, usbdiag_test_results_t *results)230 errno_t usbdiag_dev_test_out(ddf_fun_t *fun, const usbdiag_test_params_t *params, usbdiag_test_results_t *results) 231 231 { 232 232 usbdiag_dev_t *dev = ddf_fun_to_usbdiag_dev(fun); -
uspace/drv/bus/usb/usbdiag/tests.h
rf5718c79 r7cba9f7 39 39 #include <ddf/driver.h> 40 40 41 int usbdiag_dev_test_in(ddf_fun_t *, const usbdiag_test_params_t *, usbdiag_test_results_t *);42 int usbdiag_dev_test_out(ddf_fun_t *, const usbdiag_test_params_t *, usbdiag_test_results_t *);41 errno_t usbdiag_dev_test_in(ddf_fun_t *, const usbdiag_test_params_t *, usbdiag_test_results_t *); 42 errno_t usbdiag_dev_test_out(ddf_fun_t *, const usbdiag_test_params_t *, usbdiag_test_results_t *); 43 43 44 44 #endif /* USBDIAG_TESTS_H_ */
Note:
See TracChangeset
for help on using the changeset viewer.