andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Change getting the capabilities structure to a callback instead of an extern struct.

Browse Source
This commit is contained in:
Nathan Conrad
2019-09-25 12:17:49 -04:00
parent 2d4352bfe9
commit 3a87dd65d7
3 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/class/usbtmc/usbtmc_device.h
View File

@@ -49,12 +49,6 @@
* Functions to be implemeted by the class implementation
*/
#if (CFG_TUD_USBTMC_ENABLE_488)
extern usbtmc_response_capabilities_488_t const tud_usbtmc_app_capabilities;
#else
extern usbtmc_response_capabilities_t const tud_usbtmc_app_capabilities;
#endif
// In order to proceed, app must call call tud_usbtmc_start_bus_read(rhport) during or soon after:
// * tud_usbtmc_app_open_cb
// * tud_usbtmc_app_msg_data_cb
@@ -64,6 +58,12 @@ extern usbtmc_response_capabilities_t const tud_usbtmc_app_capabilities;
// * (successful) tud_usbtmc_app_check_abort_bulk_in_cb
// * (successful) tud_usmtmc_app_bulkOut_clearFeature_cb
#if (CFG_TUD_USBTMC_ENABLE_488)
usbtmc_response_capabilities_488_t const * tud_usbtmc_get_capabilities_cb(void);
#else
usbtmc_response_capabilities_t const * tud_usbtmc_get_capabilities_cb(void);
#endif
void tud_usbtmc_app_open_cb(uint8_t interface_id);
bool tud_usbtmc_app_msgBulkOut_start_cb(usbtmc_msg_request_dev_dep_out const * msgHeader);