Changeset b7b7898 in mainline for uspace/drv/bus/usb/usbdiag/main.c
- Timestamp:
- 2017-12-22T12:03:16Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 96c416a
- Parents:
- 2986763
- git-author:
- Petr Mánek <petr.manek@…> (2017-12-22 12:02:50)
- git-committer:
- Petr Mánek <petr.manek@…> (2017-12-22 12:03:16)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbdiag/main.c
r2986763 rb7b7898 41 41 #include <str_error.h> 42 42 43 #include "usbdiag.h"44 43 #include "device.h" 45 44 … … 51 50 usb_log_info("Adding device '%s'", usb_device_get_name(dev)); 52 51 53 usb _diag_dev_t *diag_dev;54 if ((rc = usb _diag_dev_create(dev, &diag_dev))) {52 usbdiag_dev_t *diag_dev; 53 if ((rc = usbdiag_dev_create(dev, &diag_dev))) { 55 54 usb_log_error("Failed create device: %s.\n", str_error(rc)); 56 55 goto err; … … 73 72 ddf_fun_unbind(diag_dev->fun); 74 73 err_create: 75 usb _diag_dev_destroy(diag_dev);74 usbdiag_dev_destroy(diag_dev); 76 75 err: 77 76 return rc; … … 83 82 usb_log_info("Removing device '%s'", usb_device_get_name(dev)); 84 83 85 usb _diag_dev_t *diag_dev = usb_device_to_usb_diag_dev(dev);84 usbdiag_dev_t *diag_dev = usb_device_to_usbdiag_dev(dev); 86 85 87 86 /* TODO: Make sure nothing is going on with the device. */ … … 92 91 } 93 92 94 usb _diag_dev_destroy(diag_dev);93 usbdiag_dev_destroy(diag_dev); 95 94 96 95 return EOK; … … 104 103 usb_log_info("Device '%s' gone.", usb_device_get_name(dev)); 105 104 106 usb _diag_dev_t *diag_dev = usb_device_to_usb_diag_dev(dev);105 usbdiag_dev_t *diag_dev = usb_device_to_usbdiag_dev(dev); 107 106 108 107 /* TODO: Make sure nothing is going on with the device. */ … … 110 109 /* TODO: Remove device from list */ 111 110 112 usb _diag_dev_destroy(diag_dev);111 usbdiag_dev_destroy(diag_dev); 113 112 114 113 return EOK; … … 175 174 176 175 static const usb_endpoint_description_t *diag_endpoints[] = { 177 [USB _DIAG_EP_INTR_IN] = &intr_in_ep,178 [USB _DIAG_EP_INTR_OUT] = &intr_out_ep,179 [USB _DIAG_EP_BULK_IN] = &bulk_in_ep,180 [USB _DIAG_EP_BULK_OUT] = &bulk_out_ep,181 [USB _DIAG_EP_ISOCH_IN] = &isoch_in_ep,182 [USB _DIAG_EP_ISOCH_OUT] = &isoch_out_ep,176 [USBDIAG_EP_INTR_IN] = &intr_in_ep, 177 [USBDIAG_EP_INTR_OUT] = &intr_out_ep, 178 [USBDIAG_EP_BULK_IN] = &bulk_in_ep, 179 [USBDIAG_EP_BULK_OUT] = &bulk_out_ep, 180 [USBDIAG_EP_ISOCH_IN] = &isoch_in_ep, 181 [USBDIAG_EP_ISOCH_OUT] = &isoch_out_ep, 183 182 NULL 184 183 };
Note:
See TracChangeset
for help on using the changeset viewer.