This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 7322eafba7 drivers/usb: Fix the typo error in Kconfig
7322eafba7 is described below
commit 7322eafba799137d7c4360c462e07de282014c8d
Author: Xiang Xiao <[email protected]>
AuthorDate: Sun Dec 25 00:33:10 2022 +0800
drivers/usb: Fix the typo error in Kconfig
Signed-off-by: Xiang Xiao <[email protected]>
---
.../olimexino-stm32/configs/composite/defconfig | 2 --
.../arm/stm32f7/stm32f746-ws/configs/nsh/defconfig | 1 -
drivers/usbdev/Kconfig | 34 +++++++++++++++++-----
3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
index fb3b1b115f..4eb052cf8e 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
@@ -45,8 +45,6 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
CONFIG_BUILTIN=y
CONFIG_CDCACM=y
CONFIG_CDCACM_COMPOSITE=y
-CONFIG_CDCACM_EPBULKIN_HSSIZE=64
-CONFIG_CDCACM_EPBULKOUT_HSSIZE=64
CONFIG_CDCACM_NRDREQS=2
CONFIG_CDCACM_NWRREQS=2
CONFIG_CDCACM_RXBUFSIZE=96
diff --git a/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig
b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig
index d3e5722d40..73575b2482 100644
--- a/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig
+++ b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_ARMV7M_USEBASEPRI=y
CONFIG_BOARD_LOOPSPERMSEC=43103
CONFIG_BUILTIN=y
CONFIG_CDCACM=y
-CONFIG_CDCACM_EPINTIN_HSSIZE=512
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DRIVER_NOTE=y
CONFIG_DRIVER_NOTERAM_BUFSIZE=512
diff --git a/drivers/usbdev/Kconfig b/drivers/usbdev/Kconfig
index 1d7a418f51..e4807d47f8 100644
--- a/drivers/usbdev/Kconfig
+++ b/drivers/usbdev/Kconfig
@@ -438,6 +438,8 @@ config CDCACM_EPINTIN_FSSIZE
Max package size for the interrupt IN endpoint if full speed
mode.
Default 64.
+if USBDEV_DUALSPEED
+
config CDCACM_EPINTIN_HSSIZE
int "Interrupt IN high speed MAXPACKET size"
default 64
@@ -445,6 +447,8 @@ config CDCACM_EPINTIN_HSSIZE
Max package size for the interrupt IN endpoint if high speed
mode.
Default 64.
+endif # USBDEV_DUALSPEED
+
if !CDCACM_COMPOSITE
# In a composite device the EP-Number is configured dynamically via
@@ -466,6 +470,8 @@ config CDCACM_EPBULKOUT_FSSIZE
Max package size for the bulk OUT endpoint if full speed mode.
Default 64.
+if USBDEV_DUALSPEED
+
config CDCACM_EPBULKOUT_HSSIZE
int "Bulk OUT out high speed MAXPACKET size"
default 512
@@ -473,6 +479,8 @@ config CDCACM_EPBULKOUT_HSSIZE
Max package size for the bulk OUT endpoint if high speed mode.
Default 512.
+endif # USBDEV_DUALSPEED
+
if !CDCACM_COMPOSITE
# In a composite device the EP-Number is configured dynamically via
@@ -494,6 +502,8 @@ config CDCACM_EPBULKIN_FSSIZE
Max package size for the bulk IN endpoint if full speed mode.
Default 64.
+if USBDEV_DUALSPEED
+
config CDCACM_EPBULKIN_HSSIZE
int "Bulk IN high speed MAXPACKET size"
default 512
@@ -501,6 +511,8 @@ config CDCACM_EPBULKIN_HSSIZE
Max package size for the bulk IN endpoint if high speed mode.
Default 512.
+endif # USBDEV_DUALSPEED
+
config CDCACM_NRDREQS
int "Number of read requests that can be in flight"
default 4
@@ -642,6 +654,8 @@ config USBADB_EPBULKOUT_FSSIZE
Max package size for the bulk OUT endpoint if full speed mode.
Default 64.
+if USBDEV_DUALSPEED
+
config USBADB_EPBULKOUT_HSSIZE
int "Bulk OUT out high speed MAXPACKET size"
default 512
@@ -649,6 +663,8 @@ config USBADB_EPBULKOUT_HSSIZE
Max package size for the bulk OUT endpoint if high speed mode.
Default 512.
+endif # USBDEV_DUALSPEED
+
config USBADB_EPBULKIN_FSSIZE
int "Bulk IN full speed MAXPACKET size"
default 64
@@ -656,6 +672,8 @@ config USBADB_EPBULKIN_FSSIZE
Max package size for the bulk IN endpoint if full speed mode.
Default 64.
+if USBDEV_DUALSPEED
+
config USBADB_EPBULKIN_HSSIZE
int "Bulk IN high speed MAXPACKET size"
default 512
@@ -663,6 +681,8 @@ config USBADB_EPBULKIN_HSSIZE
Max package size for the bulk IN endpoint if high speed mode.
Default 512.
+endif # USBDEV_DUALSPEED
+
config USBADB_NRDREQS
int "Number of read requests that can be in flight"
default 4
@@ -700,7 +720,7 @@ config USBADB_PRODUCTSTR
config USBADB_BOARD_SERIALSTR
bool "Enable board unique ID to USBADB serial string"
default n
- select BOARD_USBDEV_SERIALSTR
+ select BOARD_USBDEV_SERIALSTR
---help---
Use board unique serial number to iSerialNumber in the device
descriptor.
@@ -760,17 +780,17 @@ config USBMSC_COMPOSITE
Configure the mass storage driver as part of a composite driver
(only if USBDEV_COMPOSITE is also defined)
+if !USBMSC_COMPOSITE
+
+# In a composite device the EP-Number and STR-Number is configured
+# dynamically via composite_initialize
+
config USBMSC_EP0MAXPACKET
int "Max packet size for endpoint 0"
default 64
---help---
Max packet size for endpoint 0
-if !USBMSC_COMPOSITE
-
-# In a composite device the EP-Number and STR-Number is configured
-# dynamically via composite_initialize
-
config USBMSC_EPBULKOUT
int "Bulk OUT endpoint number"
default 2
@@ -885,7 +905,7 @@ config USBMSC_PRODUCTSTR
config USBMSC_BOARD_SERIALSTR
bool "Enable board unique ID to mass storage serial string"
default n
- select BOARD_USBDEV_SERIALSTR
+ select BOARD_USBDEV_SERIALSTR
---help---
Use board unique serial number to iSerialNumber in the device
descriptor.
