Merge pull request #648 from hathach/rename-dfu-rt-to-runtime
Rename dfu rt to runtime
This commit is contained in:
commit
04ab6b4082
|
@ -107,7 +107,7 @@ jobs:
|
|||
- 'device/cdc_dual_ports'
|
||||
- 'device/cdc_msc'
|
||||
- 'device/cdc_msc_freertos'
|
||||
- 'device/dfu_rt'
|
||||
- 'device/dfu_runtime'
|
||||
- 'device/hid_composite'
|
||||
- 'device/hid_composite_freertos'
|
||||
- 'device/hid_generic_inout'
|
||||
|
|
|
@ -112,7 +112,7 @@ void tud_resume_cb(void)
|
|||
}
|
||||
|
||||
// Invoked on DFU_DETACH request to reboot to the bootloader
|
||||
void tud_dfu_rt_reboot_to_dfu(void)
|
||||
void tud_dfu_runtime_reboot_to_dfu_cb(void)
|
||||
{
|
||||
blink_interval_ms = BLINK_DFU_MODE;
|
||||
}
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
//------------- CLASS -------------//
|
||||
|
||||
#define CFG_TUD_DFU_RT 1
|
||||
#define CFG_TUD_DFU_RUNTIME 1
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include "tusb_option.h"
|
||||
|
||||
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_DFU_RT)
|
||||
#if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_DFU_RUNTIME)
|
||||
|
||||
#include "dfu_rt_device.h"
|
||||
#include "device/usbd_pvt.h"
|
||||
|
@ -110,7 +110,7 @@ bool dfu_rtd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request
|
|||
{
|
||||
case DFU_REQUEST_DETACH:
|
||||
tud_control_status(rhport, request);
|
||||
tud_dfu_rt_reboot_to_dfu();
|
||||
tud_dfu_runtime_reboot_to_dfu_cb();
|
||||
break;
|
||||
|
||||
case DFU_REQUEST_GETSTATUS:
|
||||
|
|
|
@ -58,7 +58,7 @@ typedef enum
|
|||
//--------------------------------------------------------------------+
|
||||
|
||||
// Invoked when received new data
|
||||
TU_ATTR_WEAK void tud_dfu_rt_reboot_to_dfu(void); // TODO rename to _cb convention
|
||||
TU_ATTR_WEAK void tud_dfu_runtime_reboot_to_dfu_cb(void);
|
||||
|
||||
//--------------------------------------------------------------------+
|
||||
// Internal Class Driver API
|
||||
|
|
|
@ -175,9 +175,9 @@ static usbd_class_driver_t const _usbd_driver[] =
|
|||
},
|
||||
#endif
|
||||
|
||||
#if CFG_TUD_DFU_RT
|
||||
#if CFG_TUD_DFU_RUNTIME
|
||||
{
|
||||
DRIVER_NAME("DFU-RT")
|
||||
DRIVER_NAME("DFU-RUNTIME")
|
||||
.init = dfu_rtd_init,
|
||||
.reset = dfu_rtd_reset,
|
||||
.open = dfu_rtd_open,
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
#include "class/usbtmc/usbtmc_device.h"
|
||||
#endif
|
||||
|
||||
#if CFG_TUD_DFU_RT
|
||||
#if CFG_TUD_DFU_RUNTIME
|
||||
#include "class/dfu/dfu_rt_device.h"
|
||||
#endif
|
||||
|
||||
|
|
|
@ -233,8 +233,8 @@
|
|||
#define CFG_TUD_USBTMC 0
|
||||
#endif
|
||||
|
||||
#ifndef CFG_TUD_DFU_RT
|
||||
#define CFG_TUD_DFU_RT 0
|
||||
#ifndef CFG_TUD_DFU_RUNTIME
|
||||
#define CFG_TUD_DFU_RUNTIME 0
|
||||
#endif
|
||||
|
||||
#ifndef CFG_TUD_NET
|
||||
|
|
Loading…
Reference in New Issue