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

Rename USBTMC functions.

Browse Source
This commit is contained in:
Nathan Conrad
2019-09-25 11:34:27 -04:00
parent 412a279073
commit 2d4352bfe9
4 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,8 @@
#include "usbtmc.h"
// Enable 488 mode by default
#if !defined(CFG_USBTMC_CFG_ENABLE_488)
#define CFG_CFG_USBTMC_CFG_ENABLE_488 (1)
#if !defined(CFG_TUD_USBTMC_ENABLE_488)
#define CFG_TUD_USBTMC_ENABLE_488 (1)
#endif
// USB spec says that full-speed must be 8,16,32, or 64.
@@ -49,31 +49,31 @@
* Functions to be implemeted by the class implementation
*/
#if (CFG_USBTMC_CFG_ENABLE_488)
#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 usbtmcd_start_bus_read(rhport) during or soon after:
// 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
// * tud_usbtmc_app_msgBulkIn_complete_cb
// * tud_usbtmc_app_msg_trigger_cb
// * (successful) tud_usbtmc_app_check_abort_bulk_out_cb
// * (successful) tud_usbtmc_app_check_abort_bulk_in_cb
// * (successful) usmtmcd_app_bulkOut_clearFeature_cb
// * (successful) tud_usmtmc_app_bulkOut_clearFeature_cb
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);
// transfer_complete does not imply that a message is complete.
bool tud_usbtmc_app_msg_data_cb( void *data, size_t len, bool transfer_complete);
void usmtmcd_app_bulkOut_clearFeature_cb(void); // Notice to clear and abort the pending BULK out transfer
void tud_usmtmc_app_bulkOut_clearFeature_cb(void); // Notice to clear and abort the pending BULK out transfer
bool tud_usbtmc_app_msgBulkIn_request_cb(usbtmc_msg_request_dev_dep_in const * request);
bool tud_usbtmc_app_msgBulkIn_complete_cb(void);
void usmtmcd_app_bulkIn_clearFeature_cb(void); // Notice to clear and abort the pending BULK out transfer
void tud_usbtmc_app_bulkIn_clearFeature_cb(void); // Notice to clear and abort the pending BULK out transfer
bool tud_usbtmc_app_initiate_abort_bulk_in_cb(uint8_t *tmcResult);
bool tud_usbtmc_app_initiate_abort_bulk_out_cb(uint8_t *tmcResult);
@@ -86,7 +86,7 @@ bool tud_usbtmc_app_check_clear_cb(usbtmc_get_clear_status_rsp_t *rsp);
// Indicator pulse should be 0.5 to 1.0 seconds long
TU_ATTR_WEAK bool tud_usbtmc_app_indicator_pulse_cb(tusb_control_request_t const * msg, uint8_t *tmcResult);
#if (CFG_USBTMC_CFG_ENABLE_488)
#if (CFG_TUD_USBTMC_ENABLE_488)
uint8_t tud_usbtmc_app_get_stb_cb(uint8_t *tmcResult);
TU_ATTR_WEAK bool tud_usbtmc_app_msg_trigger_cb(usbtmc_msg_generic_t* msg);
//TU_ATTR_WEAK bool tud_usbtmc_app_go_to_local_cb();
@@ -99,11 +99,11 @@ TU_ATTR_WEAK bool tud_usbtmc_app_msg_trigger_cb(usbtmc_msg_generic_t* msg);
* notified that the transfer is complete.
******************************************/
bool usbtmcd_transmit_dev_msg_data(
bool tud_usbtmc_transmit_dev_msg_data(
const void * data, size_t len,
bool endOfMessage, bool usingTermChar);
bool usbtmcd_start_bus_read(void);
bool tud_usbtmc_start_bus_read(void);
/* "callbacks" from USB device core */