diff options
| author | hathach <[email protected]> | 2025-10-09 12:27:30 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-10-09 12:27:30 +0700 |
| commit | 970384d6dbb012e5b27095b0f065fd73d00ebf4c (patch) | |
| tree | 3f12ef5058f0e7772834b3bc98dceefdba25f8f1 /examples/device/usbtmc/src | |
| parent | b9378eb8e79691907aae40b3fc26cb57d4ffaeb4 (diff) | |
| parent | 87523f2494109b45307644a36f035b5ad11d5ba9 (diff) | |
Merge branch 'master' into fork/ArcaneNibble/ohci-upstream
Diffstat (limited to 'examples/device/usbtmc/src')
| -rw-r--r-- | examples/device/usbtmc/src/main.c | 4 | ||||
| -rw-r--r-- | examples/device/usbtmc/src/usbtmc_app.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/examples/device/usbtmc/src/main.c b/examples/device/usbtmc/src/main.c index aa7902a15..f78cce91f 100644 --- a/examples/device/usbtmc/src/main.c +++ b/examples/device/usbtmc/src/main.c @@ -61,9 +61,7 @@ int main(void) }; tusb_init(BOARD_TUD_RHPORT, &dev_init); - if (board_init_after_tusb) { - board_init_after_tusb(); - } + board_init_after_tusb(); while (1) { diff --git a/examples/device/usbtmc/src/usbtmc_app.c b/examples/device/usbtmc/src/usbtmc_app.c index fb25982c7..e738f1008 100644 --- a/examples/device/usbtmc/src/usbtmc_app.c +++ b/examples/device/usbtmc/src/usbtmc_app.c @@ -99,7 +99,7 @@ usbtmc_response_capabilities_488_t const * #else usbtmc_response_capabilities_t const * #endif -tud_usbtmc_get_capabilities_cb() +tud_usbtmc_get_capabilities_cb(void) { return &tud_usbtmc_app_capabilities; } @@ -161,7 +161,7 @@ bool tud_usbtmc_msg_data_cb(void *data, size_t len, bool transfer_complete) return true; } -bool tud_usbtmc_msgBulkIn_complete_cb() +bool tud_usbtmc_msgBulkIn_complete_cb(void) { if((buffer_tx_ix == buffer_len) || idnQuery) // done { |