From f8ea5c12faf3ea9693b9c9af0b1a1a1dd3bb855f Mon Sep 17 00:00:00 2001
From: sakimusu <1203593632@qq.com>
Date: Sun, 30 Jan 2022 21:13:58 +0800
Subject: [PATCH] rename paramater named class with devclass instead

---
 class/audio/usbd_audio.c | 10 +++++-----
 class/audio/usbd_audio.h |  2 +-
 class/cdc/usbd_cdc.c     | 10 +++++-----
 class/cdc/usbd_cdc.h     |  2 +-
 class/dfu/usbd_dfu.c     | 10 +++++-----
 class/dfu/usbd_dfu.h     |  2 +-
 class/hid/usbd_hid.c     | 10 +++++-----
 class/hid/usbd_hid.h     |  2 +-
 class/hub/usbd_hub.c     | 10 +++++-----
 class/hub/usbd_hub.h     |  2 +-
 class/video/usbd_video.c | 10 +++++-----
 class/video/usbd_video.h |  2 +-
 core/usbd_core.c         | 38 +++++++++++++++++++-------------------
 core/usbd_core.h         |  4 ++--
 docs/usb_device.md       | 20 ++++++++++----------
 15 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/class/audio/usbd_audio.c b/class/audio/usbd_audio.c
index fe46d3d9..0ec73c77 100644
--- a/class/audio/usbd_audio.c
+++ b/class/audio/usbd_audio.c
@@ -115,20 +115,20 @@ void audio_notify_handler(uint8_t event, void *arg)
     }
 }
 
-void usbd_audio_add_interface(usbd_class_t *class, usbd_interface_t *intf)
+void usbd_audio_add_interface(usbd_class_t *devclass, usbd_interface_t *intf)
 {
     static usbd_class_t *last_class = NULL;
 
-    if (last_class != class) {
-        last_class = class;
-        usbd_class_register(class);
+    if (last_class != devclass) {
+        last_class = devclass;
+        usbd_class_register(devclass);
     }
 
     intf->class_handler = audio_class_request_handler;
     intf->custom_handler = NULL;
     intf->vendor_handler = NULL;
     intf->notify_handler = audio_notify_handler;
-    usbd_class_add_interface(class, intf);
+    usbd_class_add_interface(devclass, intf);
 }
 
 __WEAK void usbd_audio_set_volume(uint8_t vol)
diff --git a/class/audio/usbd_audio.h b/class/audio/usbd_audio.h
index 66cb58be..c1d4e8cd 100644
--- a/class/audio/usbd_audio.h
+++ b/class/audio/usbd_audio.h
@@ -37,7 +37,7 @@ struct usbd_audio_control_info {
     uint8_t mute;
 };
 
-void usbd_audio_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+void usbd_audio_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 void usbd_audio_set_interface_callback(uint8_t value);
 void usbd_audio_set_volume(uint8_t vol);
 #ifdef __cplusplus
diff --git a/class/cdc/usbd_cdc.c b/class/cdc/usbd_cdc.c
index c0bfd205..a47a35d0 100644
--- a/class/cdc/usbd_cdc.c
+++ b/class/cdc/usbd_cdc.c
@@ -154,18 +154,18 @@ __WEAK void usbd_cdc_acm_set_rts(bool rts)
 {
 }
 
-void usbd_cdc_add_acm_interface(usbd_class_t *class, usbd_interface_t *intf)
+void usbd_cdc_add_acm_interface(usbd_class_t *devclass, usbd_interface_t *intf)
 {
     static usbd_class_t *last_class = NULL;
 
-    if (last_class != class) {
-        last_class = class;
-        usbd_class_register(class);
+    if (last_class != devclass) {
+        last_class = devclass;
+        usbd_class_register(devclass);
     }
 
     intf->class_handler = cdc_acm_class_request_handler;
     intf->custom_handler = NULL;
     intf->vendor_handler = NULL;
     intf->notify_handler = cdc_notify_handler;
-    usbd_class_add_interface(class, intf);
+    usbd_class_add_interface(devclass, intf);
 }
diff --git a/class/cdc/usbd_cdc.h b/class/cdc/usbd_cdc.h
index cb8ceea0..707e15eb 100644
--- a/class/cdc/usbd_cdc.h
+++ b/class/cdc/usbd_cdc.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-void usbd_cdc_add_acm_interface(usbd_class_t *class, usbd_interface_t *intf);
+void usbd_cdc_add_acm_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 
 void usbd_cdc_acm_set_line_coding(uint32_t baudrate, uint8_t databits, uint8_t parity, uint8_t stopbits);
 void usbd_cdc_acm_set_dtr(bool dtr);
diff --git a/class/dfu/usbd_dfu.c b/class/dfu/usbd_dfu.c
index 2842aaa9..c6af4793 100644
--- a/class/dfu/usbd_dfu.c
+++ b/class/dfu/usbd_dfu.c
@@ -69,18 +69,18 @@ void dfu_notify_handler(uint8_t event, void *arg)
     }
 }
 
-void usbd_dfu_add_interface(usbd_class_t *class, usbd_interface_t *intf)
+void usbd_dfu_add_interface(usbd_class_t *devclass, usbd_interface_t *intf)
 {
     static usbd_class_t *last_class = NULL;
 
-    if (last_class != class) {
-        last_class = class;
-        usbd_class_register(class);
+    if (last_class != devclass) {
+        last_class = devclass;
+        usbd_class_register(devclass);
     }
 
     intf->class_handler = dfu_class_request_handler;
     intf->custom_handler = NULL;
     intf->vendor_handler = NULL;
     intf->notify_handler = dfu_notify_handler;
-    usbd_class_add_interface(class, intf);
+    usbd_class_add_interface(devclass, intf);
 }
\ No newline at end of file
diff --git a/class/dfu/usbd_dfu.h b/class/dfu/usbd_dfu.h
index 0206609f..75905823 100644
--- a/class/dfu/usbd_dfu.h
+++ b/class/dfu/usbd_dfu.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-void usbd_dfu_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+void usbd_dfu_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 
 #ifdef __cplusplus
 }
diff --git a/class/hid/usbd_hid.c b/class/hid/usbd_hid.c
index cbba6ab9..52a1b265 100644
--- a/class/hid/usbd_hid.c
+++ b/class/hid/usbd_hid.c
@@ -265,20 +265,20 @@ void usbd_hid_set_request_callback( uint8_t intf_num,
     }
 }
 
-void usbd_hid_add_interface(usbd_class_t *class, usbd_interface_t *intf)
+void usbd_hid_add_interface(usbd_class_t *devclass, usbd_interface_t *intf)
 {
     static usbd_class_t *last_class = NULL;
     static uint8_t hid_num = 0;
-    if (last_class != class) {
-        last_class = class;
-        usbd_class_register(class);
+    if (last_class != devclass) {
+        last_class = devclass;
+        usbd_class_register(devclass);
     }
 
     intf->class_handler = hid_class_request_handler;
     intf->custom_handler = hid_custom_request_handler;
     intf->vendor_handler = NULL;
     intf->notify_handler = hid_notify_handler;
-    usbd_class_add_interface(class, intf);
+    usbd_class_add_interface(devclass, intf);
 
     usbd_hid_cfg[hid_num].current_intf_num = intf->intf_num;
     usb_slist_add_tail(&usbd_hid_class_head, &usbd_hid_cfg[hid_num].list);
diff --git a/class/hid/usbd_hid.h b/class/hid/usbd_hid.h
index 55037663..1259e4ff 100644
--- a/class/hid/usbd_hid.h
+++ b/class/hid/usbd_hid.h
@@ -31,7 +31,7 @@ extern "C" {
 
 void usbd_hid_descriptor_register(uint8_t intf_num, const uint8_t *desc);
 void usbd_hid_report_descriptor_register(uint8_t intf_num, const uint8_t *desc, uint32_t desc_len);
-void usbd_hid_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+void usbd_hid_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 void usbd_hid_reset_state(void);
 void usbd_hid_send_report(uint8_t ep, uint8_t *data, uint8_t len);
 // clang-format off
diff --git a/class/hub/usbd_hub.c b/class/hub/usbd_hub.c
index f5968ce3..a3c1d4f4 100644
--- a/class/hub/usbd_hub.c
+++ b/class/hub/usbd_hub.c
@@ -89,18 +89,18 @@ void hub_notify_handler(uint8_t event, void *arg)
     }
 }
 
-void usbd_hub_add_interface(usbd_class_t *class, usbd_interface_t *intf)
+void usbd_hub_add_interface(usbd_class_t *devclass, usbd_interface_t *intf)
 {
     static usbd_class_t *last_class = NULL;
 
-    if (last_class != class) {
-        last_class = class;
-        usbd_class_register(class);
+    if (last_class != devclass) {
+        last_class = devclass;
+        usbd_class_register(devclass);
     }
 
     intf->class_handler = NULL;
     intf->custom_handler = hub_custom_request_handler;
     intf->vendor_handler = NULL;
     intf->notify_handler = hub_notify_handler;
-    usbd_class_add_interface(class, intf);
+    usbd_class_add_interface(devclass, intf);
 }
\ No newline at end of file
diff --git a/class/hub/usbd_hub.h b/class/hub/usbd_hub.h
index 1bdb768f..d505c288 100644
--- a/class/hub/usbd_hub.h
+++ b/class/hub/usbd_hub.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-void usbd_hub_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+void usbd_hub_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 
 #ifdef __cplusplus
 }
diff --git a/class/video/usbd_video.c b/class/video/usbd_video.c
index edf9cb9b..ae71171d 100644
--- a/class/video/usbd_video.c
+++ b/class/video/usbd_video.c
@@ -117,18 +117,18 @@ void video_notify_handler(uint8_t event, void *arg)
     }
 }
 
-void usbd_video_add_interface(usbd_class_t *class, usbd_interface_t *intf)
+void usbd_video_add_interface(usbd_class_t *devclass, usbd_interface_t *intf)
 {
     static usbd_class_t *last_class = NULL;
 
-    if (last_class != class) {
-        last_class = class;
-        usbd_class_register(class);
+    if (last_class != devclass) {
+        last_class = devclass;
+        usbd_class_register(devclass);
     }
 
     intf->class_handler = video_class_request_handler;
     intf->custom_handler = NULL;
     intf->vendor_handler = NULL;
     intf->notify_handler = video_notify_handler;
-    usbd_class_add_interface(class, intf);
+    usbd_class_add_interface(devclass, intf);
 }
\ No newline at end of file
diff --git a/class/video/usbd_video.h b/class/video/usbd_video.h
index 7fea7b97..c36bee78 100644
--- a/class/video/usbd_video.h
+++ b/class/video/usbd_video.h
@@ -31,7 +31,7 @@ extern "C" {
 
 void usbd_video_sof_callback(void);
 void usbd_video_set_interface_callback(uint8_t value);
-void usbd_video_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+void usbd_video_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 
 #ifdef __cplusplus
 }
diff --git a/core/usbd_core.c b/core/usbd_core.c
index 37698c6b..34daa302 100644
--- a/core/usbd_core.c
+++ b/core/usbd_core.c
@@ -159,9 +159,9 @@ static void usbd_ep_callback_register(void)
     usb_slist_t *i, *j, *k;
     usb_slist_for_each(i, &usbd_class_head)
     {
-        usbd_class_t *class = usb_slist_entry(i, struct usbd_class, list);
+        usbd_class_t *devclass = usb_slist_entry(i, struct usbd_class, list);
 
-        usb_slist_for_each(j, &class->intf_list)
+        usb_slist_for_each(j, &devclass->intf_list)
         {
             usbd_interface_t *intf = usb_slist_entry(j, struct usbd_interface, list);
 
@@ -786,9 +786,9 @@ static int usbd_class_request_handler(struct usb_setup_packet *setup, uint8_t **
     usb_slist_t *i, *j;
     usb_slist_for_each(i, &usbd_class_head)
     {
-        usbd_class_t *class = usb_slist_entry(i, struct usbd_class, list);
+        usbd_class_t *devclass = usb_slist_entry(i, struct usbd_class, list);
 
-        usb_slist_for_each(j, &class->intf_list)
+        usb_slist_for_each(j, &devclass->intf_list)
         {
             usbd_interface_t *intf = usb_slist_entry(j, struct usbd_interface, list);
 
@@ -859,9 +859,9 @@ static int usbd_vendor_request_handler(struct usb_setup_packet *setup, uint8_t *
 
     usb_slist_for_each(i, &usbd_class_head)
     {
-        usbd_class_t *class = usb_slist_entry(i, struct usbd_class, list);
+        usbd_class_t *devclass = usb_slist_entry(i, struct usbd_class, list);
 
-        usb_slist_for_each(j, &class->intf_list)
+        usb_slist_for_each(j, &devclass->intf_list)
         {
             usbd_interface_t *intf = usb_slist_entry(j, struct usbd_interface, list);
 
@@ -896,9 +896,9 @@ static int usbd_custom_request_handler(struct usb_setup_packet *setup, uint8_t *
     usb_slist_t *i, *j;
     usb_slist_for_each(i, &usbd_class_head)
     {
-        usbd_class_t *class = usb_slist_entry(i, struct usbd_class, list);
+        usbd_class_t *devclass = usb_slist_entry(i, struct usbd_class, list);
 
-        usb_slist_for_each(j, &class->intf_list)
+        usb_slist_for_each(j, &devclass->intf_list)
         {
             usbd_interface_t *intf = usb_slist_entry(j, struct usbd_interface, list);
 
@@ -1116,9 +1116,9 @@ static void usbd_ep_out_handler(uint8_t ep)
     usb_slist_t *i, *j, *k;
     usb_slist_for_each(i, &usbd_class_head)
     {
-        usbd_class_t *class = usb_slist_entry(i, struct usbd_class, list);
+        usbd_class_t *devclass = usb_slist_entry(i, struct usbd_class, list);
 
-        usb_slist_for_each(j, &class->intf_list)
+        usb_slist_for_each(j, &devclass->intf_list)
         {
             usbd_interface_t *intf = usb_slist_entry(j, struct usbd_interface, list);
 
@@ -1147,9 +1147,9 @@ static void usbd_ep_in_handler(uint8_t ep)
     usb_slist_t *i, *j, *k;
     usb_slist_for_each(i, &usbd_class_head)
     {
-        usbd_class_t *class = usb_slist_entry(i, struct usbd_class, list);
+        usbd_class_t *devclass = usb_slist_entry(i, struct usbd_class, list);
 
-        usb_slist_for_each(j, &class->intf_list)
+        usb_slist_for_each(j, &devclass->intf_list)
         {
             usbd_interface_t *intf = usb_slist_entry(j, struct usbd_interface, list);
 
@@ -1177,9 +1177,9 @@ static void usbd_class_event_notify_handler(uint8_t event, void *arg)
     usb_slist_t *i, *j;
     usb_slist_for_each(i, &usbd_class_head)
     {
-        usbd_class_t *class = usb_slist_entry(i, struct usbd_class, list);
+        usbd_class_t *devclass = usb_slist_entry(i, struct usbd_class, list);
 
-        usb_slist_for_each(j, &class->intf_list)
+        usb_slist_for_each(j, &devclass->intf_list)
         {
             usbd_interface_t *intf = usb_slist_entry(j, struct usbd_interface, list);
 
@@ -1273,17 +1273,17 @@ void usbd_bos_desc_register(struct usb_bos_descriptor *desc)
     bos_desc = desc;
 }
 
-void usbd_class_register(usbd_class_t *class)
+void usbd_class_register(usbd_class_t *devclass)
 {
-    usb_slist_add_tail(&usbd_class_head, &class->list);
-    usb_slist_init(&class->intf_list);
+    usb_slist_add_tail(&usbd_class_head, &devclass->list);
+    usb_slist_init(&devclass->intf_list);
 }
 
-void usbd_class_add_interface(usbd_class_t *class, usbd_interface_t *intf)
+void usbd_class_add_interface(usbd_class_t *devclass, usbd_interface_t *intf)
 {
     static uint8_t intf_offset = 0;
     intf->intf_num = intf_offset;
-    usb_slist_add_tail(&class->intf_list, &intf->list);
+    usb_slist_add_tail(&devclass->intf_list, &intf->list);
     usb_slist_init(&intf->ep_list);
     intf_offset++;
 }
diff --git a/core/usbd_core.h b/core/usbd_core.h
index 6b502aaa..0cc33179 100644
--- a/core/usbd_core.h
+++ b/core/usbd_core.h
@@ -123,11 +123,11 @@ typedef struct usbd_class {
 void usbd_event_notify_handler(uint8_t event, void *arg);
 
 void usbd_desc_register(const uint8_t *desc);
-void usbd_class_register(usbd_class_t *class);
+void usbd_class_register(usbd_class_t *devclass);
 void usbd_msosv1_desc_register(struct usb_msosv1_descriptor *desc);
 void usbd_msosv2_desc_register(struct usb_msosv2_descriptor *desc);
 void usbd_bos_desc_register(struct usb_bos_descriptor *desc);
-void usbd_class_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+void usbd_class_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 void usbd_interface_add_endpoint(usbd_interface_t *intf, usbd_endpoint_t *ep);
 bool usb_device_is_configured(void);
 
diff --git a/docs/usb_device.md b/docs/usb_device.md
index 960cdc7f..865f8936 100644
--- a/docs/usb_device.md
+++ b/docs/usb_device.md
@@ -48,10 +48,10 @@ USB Device controller porting 接口在 `usb_stack/common/usb_dc.h` 文件中声
 `usbd_class_add_interface` 用来给 USB 设备类增加接口，并将接口信息挂载在类的链表上。
 
 ```
-    void usbd_class_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+    void usbd_class_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 ```
 
-- **class**  USB 设备类的句柄
+- **devclass**  USB 设备类的句柄
 - **intf**   USB 设备接口的句柄
 
 `usbd_class_t` 定义如下
@@ -141,10 +141,10 @@ USB Device controller porting 接口在 `usb_stack/common/usb_dc.h` 文件中声
 其中 `cdc_acm_class_request_handler` 用于处理 USB CDC ACM Setup 中断请求， `cdc_notify_handler` 用于实现 USB CDC 其他中断回调函数。
 
 ```
-    void usbd_cdc_add_acm_interface(usbd_class_t *class, usbd_interface_t *intf);
+    void usbd_cdc_add_acm_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 ```
 
-- **class** 类的句柄
+- **devclass** 类的句柄
 - **intf**  接口句柄
 
 #### **usbd_cdc_acm_set_line_coding**
@@ -242,10 +242,10 @@ USB Device controller porting 接口在 `usb_stack/common/usb_dc.h` 文件中声
 `hid_notify_handler`  用来处理 USB HID 类的其他中断回调函数。
 
 ```
-    void usbd_hid_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+    void usbd_hid_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 ```
 
-- **class** 类的句柄
+- **devclass** 类的句柄
 - **intf**  接口句柄
 
 #### **usbd_hid_report_descriptor_register**
@@ -291,10 +291,10 @@ USB Device controller porting 接口在 `usb_stack/common/usb_dc.h` 文件中声
 `usbd_audio_add_interface`  用来给 USB Audio 类添加接口，并重写该接口相关的函数。重写的函数包括 `audio_class_request_handler` 和 `audio_notify_handler`。
 
 ```
-    void usbd_audio_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+    void usbd_audio_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 ```
 
-- **class** 类的句柄
+- **devclass** 类的句柄
 - **intf**  接口句柄
 
 
@@ -305,10 +305,10 @@ USB Device controller porting 接口在 `usb_stack/common/usb_dc.h` 文件中声
 `usbd_video_add_interface`  用来给 USB Video 类添加接口，并重写该接口相关的函数。重写的函数包括 `video_class_request_handler` 和 `video_notify_handler`。
 
 ```
-    void usbd_video_add_interface(usbd_class_t *class, usbd_interface_t *intf);
+    void usbd_video_add_interface(usbd_class_t *devclass, usbd_interface_t *intf);
 ```
 
-- **class** 类的句柄
+- **devclass** 类的句柄
 - **intf**  接口句柄