refactor(class/cdc): rename usbd_cdc to usbd_cdc_acm

11 files changed, 42 insertions, 29 deletions

diff --git a/SConscript b/SConscript
index 4270ee37..a589f5f1 100644
--- a/SConscript
+++ b/SConscript
@@ -81,7 +81,7 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']):
             LIBS = ['libpusb2_dc_a32_softfp_neon.a']
 
     if GetDepend(['PKG_CHERRYUSB_DEVICE_CDC_ACM']):
-        src += Glob('class/cdc/usbd_cdc.c')
+        src += Glob('class/cdc/usbd_cdc_acm.c')
     if GetDepend(['PKG_CHERRYUSB_DEVICE_HID']):
         src += Glob('class/hid/usbd_hid.c')
     if GetDepend(['PKG_CHERRYUSB_DEVICE_MSC']):
diff --git a/cherryusb.cmake b/cherryusb.cmake
index f82dd86c..f5d6fa51 100644
--- a/cherryusb.cmake
+++ b/cherryusb.cmake
@@ -44,7 +44,7 @@ ${CMAKE_CURRENT_LIST_DIR}/class/vendor/wifi
 if(CONFIG_CHERRYUSB_DEVICE)
     list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/core/usbd_core.c)
     if(CONFIG_CHERRYUSB_DEVICE_CDC_ACM)
-    list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/cdc/usbd_cdc.c)
+    list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/cdc/usbd_cdc_acm.c)
     endif()
     if(CONFIG_CHERRYUSB_DEVICE_HID)
     list(APPEND cherryusb_srcs ${CMAKE_CURRENT_LIST_DIR}/class/hid/usbd_hid.c)
diff --git a/class/cdc/usbd_cdc.h b/class/cdc/usbd_cdc.h
index ebf3d029..2cf3df1a 100644
--- a/class/cdc/usbd_cdc.h
+++ b/class/cdc/usbd_cdc.h
@@ -1,29 +1,13 @@
 /*
- * Copyright (c) 2022, sakumisu
+ * Copyright (c) 2024, sakumisu
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 #ifndef USBD_CDC_H
 #define USBD_CDC_H
 
-#include "usb_cdc.h"
+// legacy for old version
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "usbd_cdc_acm.h"
 
-/* Init cdc acm interface driver */
-struct usbd_interface *usbd_cdc_acm_init_intf(uint8_t busid, struct usbd_interface *intf);
-
-/* Setup request command callback api */
-void usbd_cdc_acm_set_line_coding(uint8_t busid, uint8_t intf, struct cdc_line_coding *line_coding);
-void usbd_cdc_acm_get_line_coding(uint8_t busid, uint8_t intf, struct cdc_line_coding *line_coding);
-void usbd_cdc_acm_set_dtr(uint8_t busid, uint8_t intf, bool dtr);
-void usbd_cdc_acm_set_rts(uint8_t busid, uint8_t intf, bool rts);
-void usbd_cdc_acm_send_break(uint8_t busid, uint8_t intf);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* USBD_CDC_H */
+#endif
\ No newline at end of file
diff --git a/class/cdc/usbd_cdc.c b/class/cdc/usbd_cdc_acm.c
index 50d13d7d..1ef83028 100644
--- a/class/cdc/usbd_cdc.c
+++ b/class/cdc/usbd_cdc_acm.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "usbd_core.h"
-#include "usbd_cdc.h"
+#include "usbd_cdc_acm.h"
 
 const char *stop_name[] = { "1", "1.5", "2" };
 const char *parity_name[] = { "N", "O", "E", "M", "S" };
diff --git a/class/cdc/usbd_cdc_acm.h b/class/cdc/usbd_cdc_acm.h
new file mode 100644
index 00000000..662c238c
--- /dev/null
+++ b/class/cdc/usbd_cdc_acm.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022, sakumisu
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef USBD_CDC_ACM_H
+#define USBD_CDC_ACM_H
+
+#include "usb_cdc.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Init cdc acm interface driver */
+struct usbd_interface *usbd_cdc_acm_init_intf(uint8_t busid, struct usbd_interface *intf);
+
+/* Setup request command callback api */
+void usbd_cdc_acm_set_line_coding(uint8_t busid, uint8_t intf, struct cdc_line_coding *line_coding);
+void usbd_cdc_acm_get_line_coding(uint8_t busid, uint8_t intf, struct cdc_line_coding *line_coding);
+void usbd_cdc_acm_set_dtr(uint8_t busid, uint8_t intf, bool dtr);
+void usbd_cdc_acm_set_rts(uint8_t busid, uint8_t intf, bool rts);
+void usbd_cdc_acm_send_break(uint8_t busid, uint8_t intf);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* USBD_CDC_ACM_H */
diff --git a/demo/cdc_acm_hid_msc_template.c b/demo/cdc_acm_hid_msc_template.c
index 11804144..e64a0a52 100644
--- a/demo/cdc_acm_hid_msc_template.c
+++ b/demo/cdc_acm_hid_msc_template.c
@@ -5,7 +5,7 @@
  */
 #include "usbd_core.h"
 #include "usbd_msc.h"
-#include "usbd_cdc.h"
+#include "usbd_cdc_acm.h"
 #include "usbd_hid.h"
 
 /*!< endpoint address */
diff --git a/demo/cdc_acm_msc_template.c b/demo/cdc_acm_msc_template.c
index be0dc3d5..9b53aa8b 100644
--- a/demo/cdc_acm_msc_template.c
+++ b/demo/cdc_acm_msc_template.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "usbd_core.h"
-#include "usbd_cdc.h"
+#include "usbd_cdc_acm.h"
 #include "usbd_msc.h"
 
 /*!< endpoint address */
diff --git a/demo/cdc_acm_multi_template.c b/demo/cdc_acm_multi_template.c
index ace26368..3d9dabf4 100644
--- a/demo/cdc_acm_multi_template.c
+++ b/demo/cdc_acm_multi_template.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "usbd_core.h"
-#include "usbd_cdc.h"
+#include "usbd_cdc_acm.h"
 
 /*!< endpoint address */
 #define CDC_IN_EP  0x81
diff --git a/demo/cdc_acm_template.c b/demo/cdc_acm_template.c
index c822a436..402f9346 100644
--- a/demo/cdc_acm_template.c
+++ b/demo/cdc_acm_template.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "usbd_core.h"
-#include "usbd_cdc.h"
+#include "usbd_cdc_acm.h"
 
 /*!< endpoint address */
 #define CDC_IN_EP  0x81
diff --git a/demo/winusb1.0_template.c b/demo/winusb1.0_template.c
index 25b6e3b9..fddf8be1 100644
--- a/demo/winusb1.0_template.c
+++ b/demo/winusb1.0_template.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "usbd_core.h"
-#include "usbd_cdc.h"
+#include "usbd_cdc_acm.h"
 
 #define WCID_VENDOR_CODE 0x17
 
diff --git a/demo/winusb2.0_cdc_template.c b/demo/winusb2.0_cdc_template.c
index c4940672..811f6309 100644
--- a/demo/winusb2.0_cdc_template.c
+++ b/demo/winusb2.0_cdc_template.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "usbd_core.h"
-#include "usbd_cdc.h"
+#include "usbd_cdc_acm.h"
 
 #define WINUSB_IN_EP  0x81
 #define WINUSB_OUT_EP 0x02