update(demo): change string index max to sizeof(string_descriptors) / sizeof(char *))

Signed-off-by: sakumisu <[email protected]>

32 files changed, 31 insertions, 33 deletions

diff --git a/demo/adb/usbd_adb_template.c b/demo/adb/usbd_adb_template.c
index 9f77e73d..acce1e35 100644
--- a/demo/adb/usbd_adb_template.c
+++ b/demo/adb/usbd_adb_template.c
@@ -157,7 +157,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/audio_v1_mic_multichan_template.c b/demo/audio_v1_mic_multichan_template.c
index aad917ab..c4b68c55 100644
--- a/demo/audio_v1_mic_multichan_template.c
+++ b/demo/audio_v1_mic_multichan_template.c
@@ -122,7 +122,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/audio_v1_mic_speaker_multichan_template.c b/demo/audio_v1_mic_speaker_multichan_template.c
index 872a6cde..d7fb3a41 100644
--- a/demo/audio_v1_mic_speaker_multichan_template.c
+++ b/demo/audio_v1_mic_speaker_multichan_template.c
@@ -195,7 +195,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/audio_v2_mic_multichan_template.c b/demo/audio_v2_mic_multichan_template.c
index c9044550..4fd156f7 100644
--- a/demo/audio_v2_mic_multichan_template.c
+++ b/demo/audio_v2_mic_multichan_template.c
@@ -126,7 +126,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/audio_v2_mic_speaker_multichan_template.c b/demo/audio_v2_mic_speaker_multichan_template.c
index 38c1dbbe..a929a39b 100644
--- a/demo/audio_v2_mic_speaker_multichan_template.c
+++ b/demo/audio_v2_mic_speaker_multichan_template.c
@@ -201,7 +201,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/audio_v2_speaker_multichan_template.c b/demo/audio_v2_speaker_multichan_template.c
index 54206192..bec8445e 100644
--- a/demo/audio_v2_speaker_multichan_template.c
+++ b/demo/audio_v2_speaker_multichan_template.c
@@ -145,7 +145,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/bootuf2/msc_bootuf2_template.c b/demo/bootuf2/msc_bootuf2_template.c
index 2584d3ae..73dfe577 100644
--- a/demo/bootuf2/msc_bootuf2_template.c
+++ b/demo/bootuf2/msc_bootuf2_template.c
@@ -72,7 +72,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/cdc_acm_hid_msc_template.c b/demo/cdc_acm_hid_msc_template.c
index 4798346f..93f3fb3b 100644
--- a/demo/cdc_acm_hid_msc_template.c
+++ b/demo/cdc_acm_hid_msc_template.c
@@ -94,7 +94,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/cdc_acm_mavlink_template.c b/demo/cdc_acm_mavlink_template.c
index c941b350..c680b7e8 100644
--- a/demo/cdc_acm_mavlink_template.c
+++ b/demo/cdc_acm_mavlink_template.c
@@ -76,7 +76,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/cdc_acm_msc_template.c b/demo/cdc_acm_msc_template.c
index 4c805835..e8dc06ca 100644
--- a/demo/cdc_acm_msc_template.c
+++ b/demo/cdc_acm_msc_template.c
@@ -85,7 +85,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/cdc_acm_multi_template.c b/demo/cdc_acm_multi_template.c
index 753e8172..7753439a 100644
--- a/demo/cdc_acm_multi_template.c
+++ b/demo/cdc_acm_multi_template.c
@@ -89,7 +89,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/cdc_acm_rttchardev_template.c b/demo/cdc_acm_rttchardev_template.c
index 2fed1cfc..d251f458 100644
--- a/demo/cdc_acm_rttchardev_template.c
+++ b/demo/cdc_acm_rttchardev_template.c
@@ -74,7 +74,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/cdc_acm_template.c b/demo/cdc_acm_template.c
index e98287c9..610df928 100644
--- a/demo/cdc_acm_template.c
+++ b/demo/cdc_acm_template.c
@@ -74,7 +74,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/cdc_ecm_template.c b/demo/cdc_ecm_template.c
index 528ed9f6..512725ed 100644
--- a/demo/cdc_ecm_template.c
+++ b/demo/cdc_ecm_template.c
@@ -82,7 +82,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 4) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
@@ -351,7 +351,7 @@ struct usbd_interface intf1;
 /* ecm only supports in linux, and you should input the following command
  *
  * sudo ifconfig enxaabbccddeeff up
- * sudo dhcpclient enxaabbccddeeff
+ * sudo dhclient enxaabbccddeeff
 */
 void cdc_ecm_init(uint8_t busid, uintptr_t reg_base)
 {
diff --git a/demo/cdc_rndis_template.c b/demo/cdc_rndis_template.c
index 1b587493..570064eb 100644
--- a/demo/cdc_rndis_template.c
+++ b/demo/cdc_rndis_template.c
@@ -78,7 +78,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/dfu_template.c b/demo/dfu_template.c
index 0c0402e1..faa6a0c8 100644
--- a/demo/dfu_template.c
+++ b/demo/dfu_template.c
@@ -68,7 +68,6 @@ static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
     if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
-
     return string_descriptors[index];
 }
 
diff --git a/demo/display/usbdisplay_template.c b/demo/display/usbdisplay_template.c
index 3d670258..be7ef3a0 100644
--- a/demo/display/usbdisplay_template.c
+++ b/demo/display/usbdisplay_template.c
@@ -77,7 +77,6 @@ static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
     if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
-
     return string_descriptors[index];
 }
 
diff --git a/demo/gamepad_template.c b/demo/gamepad_template.c
index 2decbc7c..171ab517 100644
--- a/demo/gamepad_template.c
+++ b/demo/gamepad_template.c
@@ -89,7 +89,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
 
diff --git a/demo/hid_custom_inout_template.c b/demo/hid_custom_inout_template.c
index 8a43d0a5..f493bd6c 100644
--- a/demo/hid_custom_inout_template.c
+++ b/demo/hid_custom_inout_template.c
@@ -79,7 +79,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/hid_keyboard_template.c b/demo/hid_keyboard_template.c
index 843a7267..2faa6a5a 100644
--- a/demo/hid_keyboard_template.c
+++ b/demo/hid_keyboard_template.c
@@ -67,7 +67,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/hid_mouse_template.c b/demo/hid_mouse_template.c
index 533d0212..9e9e902b 100644
--- a/demo/hid_mouse_template.c
+++ b/demo/hid_mouse_template.c
@@ -70,7 +70,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/hid_remote_wakeup_template.c b/demo/hid_remote_wakeup_template.c
index f7c7bc8d..b1170798 100644
--- a/demo/hid_remote_wakeup_template.c
+++ b/demo/hid_remote_wakeup_template.c
@@ -70,7 +70,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/midi_template.c b/demo/midi_template.c
index f0e66c4b..6e522d44 100644
--- a/demo/midi_template.c
+++ b/demo/midi_template.c
@@ -87,7 +87,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/msc_ram_template.c b/demo/msc_ram_template.c
index 38c80820..cd93b2b2 100644
--- a/demo/msc_ram_template.c
+++ b/demo/msc_ram_template.c
@@ -71,7 +71,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/video_audiov1_hid_template.c b/demo/video_audiov1_hid_template.c
index fab4044f..0ab81775 100644
--- a/demo/video_audiov1_hid_template.c
+++ b/demo/video_audiov1_hid_template.c
@@ -172,7 +172,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/video_static_h264_template.c b/demo/video_static_h264_template.c
index a45566f6..825e94e9 100644
--- a/demo/video_static_h264_template.c
+++ b/demo/video_static_h264_template.c
@@ -105,7 +105,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/video_static_mjpeg_template.c b/demo/video_static_mjpeg_template.c
index 0f1bcef6..8f76ce7b 100644
--- a/demo/video_static_mjpeg_template.c
+++ b/demo/video_static_mjpeg_template.c
@@ -105,7 +105,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/video_static_yuyv_template.c b/demo/video_static_yuyv_template.c
index 1d51d8db..9cda27bc 100644
--- a/demo/video_static_yuyv_template.c
+++ b/demo/video_static_yuyv_template.c
@@ -108,7 +108,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/webusb_hid_template.c b/demo/webusb_hid_template.c
index ffb2498b..d5d3443c 100644
--- a/demo/webusb_hid_template.c
+++ b/demo/webusb_hid_template.c
@@ -114,7 +114,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/winusb1.0_template.c b/demo/winusb1.0_template.c
index f203f210..367d3da0 100644
--- a/demo/winusb1.0_template.c
+++ b/demo/winusb1.0_template.c
@@ -191,7 +191,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 5) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/winusb2.0_cdc_template.c b/demo/winusb2.0_cdc_template.c
index 13d6eb07..89441b8c 100644
--- a/demo/winusb2.0_cdc_template.c
+++ b/demo/winusb2.0_cdc_template.c
@@ -106,7 +106,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 3) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];
diff --git a/demo/winusb2.0_template.c b/demo/winusb2.0_template.c
index 0530d0d1..2fde386f 100644
--- a/demo/winusb2.0_template.c
+++ b/demo/winusb2.0_template.c
@@ -120,7 +120,7 @@ static const uint8_t *device_quality_descriptor_callback(uint8_t speed)
 
 static const char *string_descriptor_callback(uint8_t speed, uint8_t index)
 {
-    if (index > 5) {
+    if (index >= (sizeof(string_descriptors) / sizeof(char *))) {
         return NULL;
     }
     return string_descriptors[index];