Merge pull request #648 from hathach/rename-dfu-rt-to-runtime

Rename dfu rt to runtime

11 files changed, 11 insertions, 11 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 567f31d54..5ec29686a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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'
diff --git a/examples/device/dfu_rt/CMakeLists.txt b/examples/device/dfu_runtime/CMakeLists.txt
index f4bf75c26..f4bf75c26 100644
--- a/examples/device/dfu_rt/CMakeLists.txt
+++ b/examples/device/dfu_runtime/CMakeLists.txt
diff --git a/examples/device/dfu_rt/Makefile b/examples/device/dfu_runtime/Makefile
index 69b633fea..69b633fea 100644
--- a/examples/device/dfu_rt/Makefile
+++ b/examples/device/dfu_runtime/Makefile
diff --git a/examples/device/dfu_rt/src/main.c b/examples/device/dfu_runtime/src/main.c
index 029ff7312..823c71ae5 100644
--- a/examples/device/dfu_rt/src/main.c
+++ b/examples/device/dfu_runtime/src/main.c
@@ -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;
 }
diff --git a/examples/device/dfu_rt/src/tusb_config.h b/examples/device/dfu_runtime/src/tusb_config.h
index abdbe7526..bdae1d2e9 100644
--- a/examples/device/dfu_rt/src/tusb_config.h
+++ b/examples/device/dfu_runtime/src/tusb_config.h
@@ -78,7 +78,7 @@
 
 //------------- CLASS -------------//
 
-#define CFG_TUD_DFU_RT 1
+#define CFG_TUD_DFU_RUNTIME 1
 
 #ifdef __cplusplus
  }
diff --git a/examples/device/dfu_rt/src/usb_descriptors.c b/examples/device/dfu_runtime/src/usb_descriptors.c
index 8b2bd265d..8b2bd265d 100644
--- a/examples/device/dfu_rt/src/usb_descriptors.c
+++ b/examples/device/dfu_runtime/src/usb_descriptors.c
diff --git a/src/class/dfu/dfu_rt_device.c b/src/class/dfu/dfu_rt_device.c
index 38644615a..5700615be 100644
--- a/src/class/dfu/dfu_rt_device.c
+++ b/src/class/dfu/dfu_rt_device.c
@@ -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:
diff --git a/src/class/dfu/dfu_rt_device.h b/src/class/dfu/dfu_rt_device.h
index 643e25d8f..cff43d035 100644
--- a/src/class/dfu/dfu_rt_device.h
+++ b/src/class/dfu/dfu_rt_device.h
@@ -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
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 252e4f709..4fc221888 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -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,
diff --git a/src/tusb.h b/src/tusb.h
index 8b0dd103c..cc82c440d 100644
--- a/src/tusb.h
+++ b/src/tusb.h
@@ -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
 
diff --git a/src/tusb_option.h b/src/tusb_option.h
index 73daf8592..6cbdefbf1 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -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