Commit 12e32c2b authored by Johann Fischer's avatar Johann Fischer Committed by Anas Nashif
Browse files

usb: move USB MSC configuration to its own Kconfig file 



Move USB MSC configuration to its own Kconfig file.

Align with other class designations and rename
mass_storage.c to msc.c

Signed-off-by: default avatarJohann Fischer <johann.fischer@nordicsemi.no>
parent 2feee774

subsys/usb/class/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



zephyr_sources_ifdef(CONFIG_USB_CDC_ACM cdc_acm.c)

zephyr_sources_ifdef(CONFIG_USB_MASS_STORAGE mass_storage.c)

zephyr_sources_ifdef(CONFIG_USB_MASS_STORAGE msc.c)

zephyr_sources_ifdef(CONFIG_USB_DEVICE_BLUETOOTH bluetooth.c)

zephyr_sources_ifdef(CONFIG_USB_DEVICE_BT_H4 bt_h4.c)

zephyr_sources_ifdef(CONFIG_USB_DEVICE_LOOPBACK loopback.c)

subsys/usb/class/Kconfig

+2 −58
Original line number Diff line number Diff line
@@ -3,64 +3,6 @@ 
# Copyright (c) 2016 Wind River Systems, Inc.

# SPDX-License-Identifier: Apache-2.0



config USB_MASS_STORAGE

	bool "USB Mass Storage Device Class Driver"

	select DISK_ACCESS

	help

	  USB Mass Storage device class driver



config MASS_STORAGE_DISK_NAME

	string "Mass storage disk or drive name"

	depends on USB_MASS_STORAGE

	default "RAM"

	help

	  Mass storage device disk or drive name



config MASS_STORAGE_INQ_VENDOR_ID

	string "T10 assigned vendor ID for inquiry (must be 8 characters)"

	depends on USB_MASS_STORAGE

	default "ZEPHYR  "

	help

	  Vendor ID used for enquiry requests.

	  Spaces must be added to bring the string to 8 bytes.



config MASS_STORAGE_INQ_PRODUCT_ID

	string "Product ID for inquiry (must be 16 characters)"

	depends on USB_MASS_STORAGE

	default "ZEPHYR USB DISK "

	help

	  Product ID used for enquiry requests.

	  Spaces must be added to bring the string to 16 bytes.



config MASS_STORAGE_INQ_REVISION

	string "Revision for inquiry (must be 4 characters)"

	depends on USB_MASS_STORAGE

	default "0.01"

	help

	  Revision used for enquiry requests.

	  Spaces must be added to bring the string to 4 bytes.



config MASS_STORAGE_BULK_EP_MPS

	int

	depends on USB_MASS_STORAGE

	default 64

	range 8 64

	help

	  Mass storage device class bulk endpoints size



config MASS_STORAGE_STACK_SIZE

	int

	depends on USB_MASS_STORAGE

	default 512

	help

	  Stack size for mass storage disk operations thread



if USB_MASS_STORAGE

module = USB_MASS_STORAGE

module-str = usb mass storage

source "subsys/logging/Kconfig.template.log_config"

endif



config USB_DEVICE_BLUETOOTH

	bool "USB Bluetooth Device Class Driver"

	select BT
@@ -100,6 +42,8 @@ config LOOPBACK_BULK_EP_MPS 


source "subsys/usb/class/Kconfig.cdc"



source "subsys/usb/class/Kconfig.msc"



source "subsys/usb/class/netusb/Kconfig"



source "subsys/usb/class/hid/Kconfig"

subsys/usb/class/Kconfig.msc

0 → 100644
+55 −0
Original line number Diff line number Diff line 
# Copyright (c) 2016 Wind River Systems, Inc.

# SPDX-License-Identifier: Apache-2.0



menuconfig USB_MASS_STORAGE

	bool "USB Mass Storage Device Class support"

	select DISK_ACCESS

	help

	  USB Mass Storage device class support



if USB_MASS_STORAGE



config MASS_STORAGE_DISK_NAME

	string "Mass storage disk or drive name"

	default "RAM"

	help

	  Mass storage device disk or drive name



config MASS_STORAGE_INQ_VENDOR_ID

	string "T10 assigned vendor ID for inquiry (must be 8 characters)"

	default "ZEPHYR  "

	help

	  Vendor ID used for enquiry requests.

	  Spaces must be added to bring the string to 8 bytes.



config MASS_STORAGE_INQ_PRODUCT_ID

	string "Product ID for inquiry (must be 16 characters)"

	default "ZEPHYR USB DISK "

	help

	  Product ID used for enquiry requests.

	  Spaces must be added to bring the string to 16 bytes.



config MASS_STORAGE_INQ_REVISION

	string "Revision for inquiry (must be 4 characters)"

	default "0.01"

	help

	  Revision used for enquiry requests.

	  Spaces must be added to bring the string to 4 bytes.



config MASS_STORAGE_BULK_EP_MPS

	int

	default 64

	range 8 64

	help

	  Mass storage device class bulk endpoints size



config MASS_STORAGE_STACK_SIZE

	int

	default 512

	help

	  Stack size for mass storage disk operations thread



module = USB_MASS_STORAGE

module-str = usb mass storage

source "subsys/logging/Kconfig.template.log_config"

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE