From e9bab613ccb2b244a976508c95776656d7f95d60 Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Wed, 21 Dec 2022 21:31:30 +0100 Subject: [PATCH] usb: device_next: rename Kconfig template instances count The name and wording used in template can be misleading. Use more accurate word instance instead of device since an implementation does not necessarily have to implement a device (in the sense of Zephyr device model), and if it does then devicetree should be used to describe number of instances as in the case of CDC ACM implementation. Signed-off-by: Johann Fischer --- subsys/usb/device_next/class/Kconfig.loopback | 2 +- .../class/Kconfig.template.composite_device_number | 11 ----------- .../class/Kconfig.template.instances_count | 10 ++++++++++ subsys/usb/device_next/class/loopback.c | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 subsys/usb/device_next/class/Kconfig.template.composite_device_number create mode 100644 subsys/usb/device_next/class/Kconfig.template.instances_count diff --git a/subsys/usb/device_next/class/Kconfig.loopback b/subsys/usb/device_next/class/Kconfig.loopback index d46434d5ef9..16a90df93cb 100644 --- a/subsys/usb/device_next/class/Kconfig.loopback +++ b/subsys/usb/device_next/class/Kconfig.loopback @@ -14,5 +14,5 @@ module-str = usbd loopback default-count = 1 source "subsys/logging/Kconfig.template.log_config" -rsource "Kconfig.template.composite_device_number" +rsource "Kconfig.template.instances_count" endif diff --git a/subsys/usb/device_next/class/Kconfig.template.composite_device_number b/subsys/usb/device_next/class/Kconfig.template.composite_device_number deleted file mode 100644 index 5d1368afe04..00000000000 --- a/subsys/usb/device_next/class/Kconfig.template.composite_device_number +++ /dev/null @@ -1,11 +0,0 @@ -# Kconfig template file for setting device count for -# various USB classes. - -# Copyright (c) 2019 Intel Corporation. -# SPDX-License-Identifier: Apache-2.0 - -config $(module)_DEVICE_COUNT - int "Number of $(module) Devices" - default $(default-count) - help - Number of instances of this USB Device class. diff --git a/subsys/usb/device_next/class/Kconfig.template.instances_count b/subsys/usb/device_next/class/Kconfig.template.instances_count new file mode 100644 index 00000000000..64792401fa1 --- /dev/null +++ b/subsys/usb/device_next/class/Kconfig.template.instances_count @@ -0,0 +1,10 @@ +# Kconfig template file for setting instances count for various USB classes. + +# Copyright (c) 2019 Intel Corporation. +# SPDX-License-Identifier: Apache-2.0 + +config $(module)_INSTANCES_COUNT + int "Number of $(module) instances" + default $(default-count) + help + Number of instances of this USB class implementation. diff --git a/subsys/usb/device_next/class/loopback.c b/subsys/usb/device_next/class/loopback.c index ac9fa2b15dc..db72caf339e 100644 --- a/subsys/usb/device_next/class/loopback.c +++ b/subsys/usb/device_next/class/loopback.c @@ -297,5 +297,5 @@ struct usbd_class_api lb_api = { \ USBD_DEFINE_CLASS(loopback_##x, &lb_api, &lb_class_##x); -LISTIFY(CONFIG_USBD_LOOPBACK_DEVICE_COUNT, DEFINE_LOOPBACK_DESCRIPTOR, ()) -LISTIFY(CONFIG_USBD_LOOPBACK_DEVICE_COUNT, DEFINE_LOOPBACK_CLASS_DATA, ()) +LISTIFY(CONFIG_USBD_LOOPBACK_INSTANCES_COUNT, DEFINE_LOOPBACK_DESCRIPTOR, ()) +LISTIFY(CONFIG_USBD_LOOPBACK_INSTANCES_COUNT, DEFINE_LOOPBACK_CLASS_DATA, ())