From 9cf8ce936c22b6e6c67f852da64de3653e328b5a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 2 Sep 2013 12:25:17 -0600 Subject: [PATCH] Add example configurations that enable USB trace options must have Kconfig options to select the trace output --- examples/cdcacm/Kconfig | 59 +++++++++++++++++++++++++++++++++++++ examples/composite/Kconfig | 50 +++++++++++++++++++++++++++++++ examples/usbserial/Kconfig | 51 ++++++++++++++++++++++++++++++++ examples/usbstorage/Kconfig | 18 ++++------- examples/usbterm/Kconfig | 51 ++++++++++++++++++++++++++++++++ 5 files changed, 216 insertions(+), 13 deletions(-) diff --git a/examples/cdcacm/Kconfig b/examples/cdcacm/Kconfig index 78fea4d0d..fcb7a1e01 100644 --- a/examples/cdcacm/Kconfig +++ b/examples/cdcacm/Kconfig @@ -11,5 +11,64 @@ config EXAMPLES_CDCACM Enable the USB CDC/ACM class driver example if EXAMPLES_CDCACM + +config EXAMPLES_CDCACM_DEVMINOR + int "CDC/ACM Minor Device Number" + default 0 + ---help--- + The minor device number of the serial driver for the CDC/ACM device. + For example, N in /dev/ttyACMN. Used for registering the serial + driver. Default is zero. + +config EXAMPLES_CDCACM_TRACEINIT + bool "USB Trace Initialization" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB initialization events + +config EXAMPLES_CDCACM_TRACECLASS + bool "USB Trace Class" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB class driver events + +config EXAMPLES_CDCACM_TRACETRANSFERS + bool "USB Trace Transfers" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB data transfer events + +config EXAMPLES_CDCACM_TRACECONTROLLER + bool "USB Trace Device Controller Events" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB device controller events + +config EXAMPLES_CDCACM_TRACEINTERRUPTS + bool "USB Trace Device Controller Interrupt Events" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB device controller interrupt-related events. + endif diff --git a/examples/composite/Kconfig b/examples/composite/Kconfig index d2d62043c..4d55d5548 100644 --- a/examples/composite/Kconfig +++ b/examples/composite/Kconfig @@ -10,5 +10,55 @@ config EXAMPLES_COMPOSITE Enable the USB compsite class driver example if EXAMPLES_COMPOSITE +config EXAMPLES_COMPOSITE_TRACEINIT + bool "USB Trace Initialization" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB initialization events + +config EXAMPLES_COMPOSITE_TRACECLASS + bool "USB Trace Class" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB class driver events + +config EXAMPLES_COMPOSITE_TRACETRANSFERS + bool "USB Trace Transfers" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB data transfer events + +config EXAMPLES_COMPOSITE_TRACECONTROLLER + bool "USB Trace Device Controller Events" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB device controller events + +config EXAMPLES_COMPOSITE_TRACEINTERRUPTS + bool "USB Trace Device Controller Interrupt Events" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB device controller interrupt-related events. + endif diff --git a/examples/usbserial/Kconfig b/examples/usbserial/Kconfig index 33a0243eb..2154eb39d 100644 --- a/examples/usbserial/Kconfig +++ b/examples/usbserial/Kconfig @@ -10,4 +10,55 @@ config EXAMPLES_USBSERIAL Enable the USB serial test example if EXAMPLES_USBSERIAL + +config EXAMPLES_USBSERIAL_TRACEINIT + bool "USB Trace Initialization" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB initialization events + +config EXAMPLES_USBSERIAL_TRACECLASS + bool "USB Trace Class" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB class driver events + +config EXAMPLES_USBSERIAL_TRACETRANSFERS + bool "USB Trace Transfers" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB data transfer events + +config EXAMPLES_USBSERIAL_TRACECONTROLLER + bool "USB Trace Device Controller Events" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB device controller events + +config EXAMPLES_USBSERIAL_TRACEINTERRUPTS + bool "USB Trace Device Controller Interrupt Events" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB device controller interrupt-related events. + endif diff --git a/examples/usbstorage/Kconfig b/examples/usbstorage/Kconfig index c338ae99e..1681b181f 100644 --- a/examples/usbstorage/Kconfig +++ b/examples/usbstorage/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_USBMSC config EXAMPLES_USBMSC_NLUNS int "Number of LUNs" default 1 - depends on EXAMPLES_USBMSC ---help--- Defines the number of logical units (LUNs) exported by the USB storage driver. Each LUN corresponds to one exported block driver @@ -23,7 +22,6 @@ config EXAMPLES_USBMSC_NLUNS config EXAMPLES_USBMSC_DEVMINOR1 int "LUN1 Minor Device Number" default 0 - depends on EXAMPLES_USBMSC ---help--- The minor device number of the block driver for the first LUN. For example, N in /dev/mmcsdN. Used for registering the block driver. @@ -32,7 +30,6 @@ config EXAMPLES_USBMSC_DEVMINOR1 config EXAMPLES_USBMSC_DEVPATH1 string "LUN1 Device Path" default "/dev/mmcsd0" - depends on EXAMPLES_USBMSC ---help--- The full path to the registered block driver. Default is "/dev/mmcsd0" @@ -40,7 +37,6 @@ config EXAMPLES_USBMSC_DEVPATH1 config EXAMPLES_USBMSC_DEVMINOR2 int "LUN2 Minor Device Number" default 1 - depends on EXAMPLES_USBMSC ---help--- The minor device number of the block driver for the second LUN. For example, N in /dev/mmcsdN. Used for registering the block driver. @@ -49,7 +45,6 @@ config EXAMPLES_USBMSC_DEVMINOR2 config EXAMPLES_USBMSC_DEVPATH2 string "LUN2 Device Path" default "/dev/mmcsd1" - depends on EXAMPLES_USBMSC ---help--- The full path to the registered block driver. Ignored if EXAMPLES_USBMSC_NLUNS < 2. Default is "/dev/mmcsd1" @@ -57,7 +52,6 @@ config EXAMPLES_USBMSC_DEVPATH2 config EXAMPLES_USBMSC_DEVMINOR3 int "LUN3 Minor Device Number" default 2 - depends on EXAMPLES_USBMSC ---help--- The minor device number of the block driver for the third LUN. For example, N in /dev/mmcsdN. Used for registering the block driver. @@ -66,7 +60,6 @@ config EXAMPLES_USBMSC_DEVMINOR3 config EXAMPLES_USBMSC_DEVPATH3 string "LUN3 Device Path" default "/dev/mmcsd2" - depends on EXAMPLES_USBMSC ---help--- The full path to the registered block driver. Ignored if EXAMPLES_USBMSC_NLUNS < 2. Default is "/dev/mmcsd2" @@ -74,14 +67,13 @@ config EXAMPLES_USBMSC_DEVPATH3 config EXAMPLES_USBMSC_DEBUGMM bool "USB MSC MM Debug" default n - depends on EXAMPLES_USBMSC ---help--- Enables some debug tests to check for memory usage and memory leaks. config EXAMPLES_USBMSC_TRACEINIT bool "USB Trace Initialization" default n - depends on EXAMPLES_USBMSC + depends on USBDEV_TRACE || DEBUG_USB ---help--- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), then the example code will also manage the USB trace output. The @@ -91,7 +83,7 @@ config EXAMPLES_USBMSC_TRACEINIT config EXAMPLES_USBMSC_TRACECLASS bool "USB Trace Class" default n - depends on EXAMPLES_USBMSC + depends on USBDEV_TRACE || DEBUG_USB ---help--- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), then the example code will also manage the USB trace output. The @@ -101,7 +93,7 @@ config EXAMPLES_USBMSC_TRACECLASS config EXAMPLES_USBMSC_TRACETRANSFERS bool "USB Trace Transfers" default n - depends on EXAMPLES_USBMSC + depends on USBDEV_TRACE || DEBUG_USB ---help--- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), then the example code will also manage the USB trace output. The @@ -111,7 +103,7 @@ config EXAMPLES_USBMSC_TRACETRANSFERS config EXAMPLES_USBMSC_TRACECONTROLLER bool "USB Trace Device Controller Events" default n - depends on EXAMPLES_USBMSC + depends on USBDEV_TRACE || DEBUG_USB ---help--- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), then the example code will also manage the USB trace output. The @@ -121,7 +113,7 @@ config EXAMPLES_USBMSC_TRACECONTROLLER config EXAMPLES_USBMSC_TRACEINTERRUPTS bool "USB Trace Device Controller Interrupt Events" default n - depends on EXAMPLES_USBMSC + depends on USBDEV_TRACE || DEBUG_USB ---help--- If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), then the example code will also manage the USB trace output. The diff --git a/examples/usbterm/Kconfig b/examples/usbterm/Kconfig index 622b7ad88..cf891c905 100644 --- a/examples/usbterm/Kconfig +++ b/examples/usbterm/Kconfig @@ -10,4 +10,55 @@ config EXAMPLES_USBTERM Enable the USB serial terminal example if EXAMPLES_USBTERM + +config EXAMPLES_USBTERM_TRACEINIT + bool "USB Trace Initialization" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB initialization events + +config EXAMPLES_USBTERM_TRACECLASS + bool "USB Trace Class" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB class driver events + +config EXAMPLES_USBTERM_TRACETRANSFERS + bool "USB Trace Transfers" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB data transfer events + +config EXAMPLES_USBTERM_TRACECONTROLLER + bool "USB Trace Device Controller Events" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB device controller events + +config EXAMPLES_USBTERM_TRACEINTERRUPTS + bool "USB Trace Device Controller Interrupt Events" + default n + depends on USBDEV_TRACE || DEBUG_USB + ---help--- + If USBDEV_TRACE is enabled (or DEBUG and DEBUG_USB), + then the example code will also manage the USB trace output. The + amount of trace output can be controlled this configuration value: + This setting will show USB device controller interrupt-related events. + endif