diff --git a/Kconfig b/Kconfig index 2881c6cce83..4d132bbcd46 100644 --- a/Kconfig +++ b/Kconfig @@ -452,51 +452,227 @@ config DEBUG_ASSERTIONS comment "Subsystem Debug Options" config DEBUG_AUDIO - bool "Audio Device Debug Output" + bool "Audio Device Debug Features" default n depends on AUDIO ---help--- - Enable low level debug SYSLOG output from the audio subsystem and + Enable audio device debug features. + Enable low level debug featurs for the audio subsystem and for audio device drivers. (disabled by default). Support for this debug option is architecture-specific and may not be available for some MCUs. +if DEBUG_AUDIO + +config DEBUG_AUDIO_ERROR + bool "Audio Device Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable audio device error output to SYSLOG. + +config DEBUG_AUDIO_WARN + bool "Audio Device Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable audio device warning output to SYSLOG. + +config DEBUG_AUDIO_INFO + bool "Audio Device Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable audio device informational output to SYSLOG. + +endif # DEBUG_AUDIO + config DEBUG_BINFMT - bool "Binary Loader Debug Output" + bool "Binary Loader Debug Features" default n depends on !BINFMT_DISABLE ---help--- - Enable binary loader debug SYSLOG output (disabled by default) + Enable binary loader debug features. + +if DEBUG_BINFMT + +config DEBUG_BINFMT_ERROR + bool "Binary Loader Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable binary loader error output to SYSLOG. + +config DEBUG_BINFMT_WARN + bool "Binary Loader Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable binary loader warning output to SYSLOG. + +config DEBUG_BINFMT_INFO + bool "Binary Loader Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable binary loader informational output to SYSLOG. + +endif # DEBUG_BINFMT config DEBUG_CRYPTO - bool "Crypto Debug Output" + bool "Crypto Debug Features" default n depends on CRYPTO ---help--- - Enable Crypto debug SYSLOG output (disabled by default) + Enable cryptographic debug features. + +if DEBUG_CRYPTO + +config DEBUG_CRYPTO_ERROR + bool "Crypto Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable cryptographic error output to SYSLOG. + +config DEBUG_CRYPTO_WARN + bool "Crypto Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable cryptographic warning output to SYSLOG. + +config DEBUG_CRYPTO_INFO + bool "Crypto Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable cryptographic informational output to SYSLOG. + +endif # DEBUG_CRYPTO config DEBUG_FS - bool "File System Debug Output" + bool "File System Debug Features" default n ---help--- - Enable file system debug SYSLOG output (disabled by default) + Enable file system debug features. + +if DEBUG_FS + +config DEBUG_FS_ERROR + bool "File System Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable file system error output to SYSLOG. + +config DEBUG_FS_WARN + bool "File System Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable file system warning output to SYSLOG. + +config DEBUG_FS_INFO + bool "File System Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable file system informational output to SYSLOG. + +endif # DEBUG_FS config DEBUG_GRAPHICS - bool "Graphics Debug Output" + bool "Graphics Debug Features" default n ---help--- - Enable NX graphics debug SYSLOG output (disabled by default) + Enable NX graphics subsystem debug features. + +if DEBUG_GRAPHICS + +config DEBUG_GRAPHICS_ERROR + bool "Graphics Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable NX graphics subsystem error output to SYSLOG. + +config DEBUG_GRAPHICS_WARN + bool "Graphics Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable NX graphics subsystem warning output to SYSLOG. + +config DEBUG_GRAPHICS_INFO + bool "Graphics Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable NX graphics subsystem informational output to SYSLOG. + +endif # DEBUG_GRAPHICS config DEBUG_LIB - bool "C Library Debug Output" + bool "C Library Debug Features" default n ---help--- - Enable C library debug SYSLOG output (disabled by default) + Enable C library debug features. + +if DEBUG_LIB + +config DEBUG_LIB_ERROR + bool "C Library Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable C library error output to SYSLOG. + +config DEBUG_LIB_WARN + bool "C Library Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable C library warning output to SYSLOG. + +config DEBUG_LIB_INFO + bool "C Library Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable C library informational output to SYSLOG. + +endif # DEBUG_LIB config DEBUG_MM - bool "Memory Manager Debug Output" + bool "Memory Manager Debug Features" default n ---help--- - Enable memory management debug SYSLOG output (disabled by default) + Enable memory management debug features. + +if DEBUG_MM + +config DEBUG_MM_ERROR + bool "Memory Manager Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable memory management error output to SYSLOG. + +config DEBUG_MM_WARN + bool "Memory Manager Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable memory management warning output to SYSLOG. + +config DEBUG_MM_INFO + bool "Memory Manager Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable memory management informational output to SYSLOG. + +endif # DEBUG_MM config DEBUG_SHM bool "Shared Memory Debug Output" @@ -506,17 +682,67 @@ config DEBUG_SHM Enable shared memory management debug SYSLOG output (disabled by default) config DEBUG_NET - bool "Network Debug Output" + bool "Network Debug Features" default n depends on ARCH_HAVE_NET ---help--- - Enable network debug SYSLOG output (disabled by default) + Enable network debug features. + +if DEBUG_NET + +config DEBUG_NET_ERROR + bool "Network Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable network error output to SYSLOG. + +config DEBUG_NET_WARN + bool "Network Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable network warning output to SYSLOG. + +config DEBUG_NET_INFO + bool "Network Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable network informational output to SYSLOG. + +endif # DEBUG_NET config DEBUG_SCHED - bool "Scheduler Debug Output" + bool "Scheduler Debug Features" default n ---help--- - Enable OS debug SYSLOG output (disabled by default) + Enable OS scheduler debug features. + +if DEBUG_SCHED + +config DEBUG_SCHED_ERROR + bool "Scheduler Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable OS scheduler error output to SYSLOG. + +config DEBUG_SCHED_WARN + bool "Scheduler Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable OS scheduler warning output to SYSLOG. + +config DEBUG_SCHED_INFO + bool "Scheduler Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable OS scheduler informational output to SYSLOG. + +endif # DEBUG_SCHED config DEBUG_SYSCALL bool "SYSCALL Debug Output" @@ -538,14 +764,40 @@ config DEBUG_WIRELESS comment "OS Function Debug Options" config DEBUG_DMA - bool "DMA Debug Output" + bool "DMA Debug Features" default n depends on ARCH_DMA ---help--- - Enable DMA-releated debug SYSLOG output (disabled by default). + Enable DMA debug features. + Support for this debug option is architecture-specific and may not be available for some MCUs. +if DEBUG_DMA + +config DEBUG_DMA_ERROR + bool "DMA Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable DMA error output to SYSLOG. + +config DEBUG_DMA_WARN + bool "DMA Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable DMA warning output to SYSLOG. + +config DEBUG_DMA_INFO + bool "DMA Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable DMA informational output to SYSLOG. + +endif # DEBUG_DMA + config DEBUG_HEAP bool "Heap usage debug hooks" default n @@ -565,11 +817,36 @@ config DEBUG_IRQ option may even cause crashes! Use with care! config DEBUG_PAGING - bool "Demand Paging Debug Output" + bool "Paging Debug Features" default n depends on PAGING ---help--- - Enable demand paging debug SYSLOG output (disabled by default) + Enable OS demand paging debug features. + +if DEBUG_PAGING + +config DEBUG_PAGING_ERROR + bool "Paging Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable OS demand paging error output to SYSLOG. + +config DEBUG_PAGING_WARN + bool "Paging Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable OS demand paging warning output to SYSLOG. + +config DEBUG_PAGING_INFO + bool "Paging Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable OS demand paging informational output to SYSLOG. + +endif # DEBUG_PAGING comment "Driver Debug Options" @@ -592,23 +869,76 @@ config DEBUG_LEDS some boards. config DEBUG_INPUT - bool "Input Device Debug Output" + bool "Input Device Debug Features" default n depends on INPUT ---help--- - Enable low level debug SYSLOG output from the input device drivers + Enable input d. + Enable low level evice debug features for the input device drivers such as mice and touchscreens (disabled by default). Support for this debug option is board-specific and may not be available for some boards. -config DEBUG_ANALOG - bool "Analog Device Debug Output" +if DEBUG_INPUT + +config DEBUG_INPUT_ERROR + bool "Input Device Error Output" default n + depends on DEBUG_ERROR ---help--- - Enable low level debug SYSLOG output from the analog device drivers - such as A/D and D/A converters (disabled by default). Support for - this debug option is architecture-specific and may not be available - for some MCUs. + Enable input device error output to SYSLOG. + +config DEBUG_INPUT_WARN + bool "Input Device Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable input device warning output to SYSLOG. + +config DEBUG_INPUT_INFO + bool "Input Device Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable input device informational output to SYSLOG. + +endif # DEBUG_INPUT + +config DEBUG_ANALOG + bool "Analog Device Debug Features" + default n + depends on ANALOG + ---help--- + Enable debug features. + Enable low level debug features the analog device drivers such as + A/D and D/A converters (disabled by default). Support for this + debug option is architecture-specific and may not be available for + some MCUs. + +if DEBUG_ANALOG + +config DEBUG_ANALOG_ERROR + bool "Analog Device Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable analog device error output to SYSLOG. + +config DEBUG_ANALOG_WARN + bool "Analog Device Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable analog device warning output to SYSLOG. + +config DEBUG_ANALOG_INFO + bool "Analog Device Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable analog device informational output to SYSLOG. + +endif # DEBUG_ANALOG config DEBUG_CAN bool "CAN Debug Output" @@ -673,14 +1003,40 @@ config DEBUG_SDIO be available for some MCUs. config DEBUG_SENSORS - bool "Sensor Debug Output" + bool "Sensor Debug Features" default n depends on SENSORS ---help--- - Enable sensor driver debug SYSLOG output (disabled by default). + Enable sensor driver debug features. + Support for this debug option is architecture-specific and may not be available for some MCUs. +if DEBUG_SENSORS + +config DEBUG_SENSORS_ERROR + bool "Sensor Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable sensor driver error output to SYSLOG. + +config DEBUG_SENSORS_WARN + bool "Sensor Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable sensor driver warning output to SYSLOG. + +config DEBUG_SENSORS_INFO + bool "Sensor Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable sensor driver informational output to SYSLOG. + +endif # DEBUG_SENSORS + config DEBUG_SPI bool "SPI Debug Output" default n @@ -700,11 +1056,36 @@ config DEBUG_TIMER be available for some MCUs. config DEBUG_USB - bool "USB Debug Output" + bool "USB Debug Features" default n depends on USBDEV || USBHOST ---help--- - Enable usb debug SYSLOG output (disabled by default) + Enable USB debug features. + +if DEBUG_USB + +config DEBUG_USB_ERROR + bool "USB Error Output" + default n + depends on DEBUG_ERROR + ---help--- + Enable USB error output to SYSLOG. + +config DEBUG_USB_WARN + bool "USB Warnings Output" + default n + depends on DEBUG_WARN + ---help--- + Enable USB warning output to SYSLOG. + +config DEBUG_USB_INFO + bool "USB Informational Output" + default n + depends on DEBUG_INFO + ---help--- + Enable USB informational output to SYSLOG. + +endif # DEBUG_USB config DEBUG_WATCHDOG bool "Watchdog Timer Debug Output" diff --git a/include/debug.h b/include/debug.h index 5fe9af5f88b..43f27a6cf54 100644 --- a/include/debug.h +++ b/include/debug.h @@ -179,242 +179,362 @@ /* Subsystem specific debug */ -#ifdef CONFIG_DEBUG_MM +#ifdef CONFIG_DEBUG_MM_ERROR # define merr(format, ...) err(format, ##__VA_ARGS__) # define mllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define mwarn(format, ...) warn(format, ##__VA_ARGS__) -# define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define minfo(format, ...) info(format, ##__VA_ARGS__) -# define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define merr(x...) # define mllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_MM_WARN +# define mwarn(format, ...) warn(format, ##__VA_ARGS__) +# define mllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define mwarn(x...) # define mllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_MM_INFO +# define minfo(format, ...) info(format, ##__VA_ARGS__) +# define mllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define minfo(x...) # define mllinfo(x...) #endif -#ifdef CONFIG_DEBUG_SCHED +#ifdef CONFIG_DEBUG_SCHED_ERROR # define serr(format, ...) err(format, ##__VA_ARGS__) # define sllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define swarn(format, ...) warn(format, ##__VA_ARGS__) -# define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define sinfo(format, ...) info(format, ##__VA_ARGS__) -# define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define serr(x...) # define sllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_SCHED_WARN +# define swarn(format, ...) warn(format, ##__VA_ARGS__) +# define sllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define swarn(x...) # define sllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_SCHED_INFO +# define sinfo(format, ...) info(format, ##__VA_ARGS__) +# define sllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define sinfo(x...) # define sllinfo(x...) #endif -#ifdef CONFIG_DEBUG_PAGING +#ifdef CONFIG_DEBUG_PAGING_ERROR # define pgerr(format, ...) err(format, ##__VA_ARGS__) # define pgllerr(format, ...) llerr(format, ##__VA_ARGS__) +#else +# define pgerr(x...) +# define pgllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_PAGING_WARN # define pgwarn(format, ...) warn(format, ##__VA_ARGS__) # define pgllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else +# define pgwarn(x...) +# define pgllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_PAGING_INFO # define pginfo(format, ...) info(format, ##__VA_ARGS__) # define pgllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define pgerr(x...) # define pgllerr(x...) -# define pgwarn(x...) -# define pgllwarn(x...) -# define pginfo(x...) -# define pgllinfo(x...) #endif -#ifdef CONFIG_DEBUG_DMA +#ifdef CONFIG_DEBUG_DMA_ERROR # define dmaerr(format, ...) err(format, ##__VA_ARGS__) # define dmallerr(format, ...) llerr(format, ##__VA_ARGS__) -# define dmawarn(format, ...) warn(format, ##__VA_ARGS__) -# define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define dmainfo(format, ...) info(format, ##__VA_ARGS__) -# define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define dmaerr(x...) # define dmallerr(x...) +#endif + +#ifdef CONFIG_DEBUG_DMA_WARN +# define dmawarn(format, ...) warn(format, ##__VA_ARGS__) +# define dmallwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define dmawarn(x...) # define dmallwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_DMA_INFO +# define dmainfo(format, ...) info(format, ##__VA_ARGS__) +# define dmallinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define dmainfo(x...) # define dmallinfo(x...) #endif -#ifdef CONFIG_DEBUG_NET +#ifdef CONFIG_DEBUG_NET_ERROR # define nerr(format, ...) err(format, ##__VA_ARGS__) # define nllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define nwarn(format, ...) warn(format, ##__VA_ARGS__) -# define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define ninfo(format, ...) info(format, ##__VA_ARGS__) -# define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define nerr(x...) # define nllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_NET_WARN +# define nwarn(format, ...) warn(format, ##__VA_ARGS__) +# define nllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define nwarn(x...) # define nllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_NET_INFO +# define ninfo(format, ...) info(format, ##__VA_ARGS__) +# define nllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define ninfo(x...) # define nllinfo(x...) #endif -#ifdef CONFIG_DEBUG_USB +#ifdef CONFIG_DEBUG_USB_ERROR # define uerr(format, ...) err(format, ##__VA_ARGS__) # define ullerr(format, ...) llerr(format, ##__VA_ARGS__) -# define uwarn(format, ...) warn(format, ##__VA_ARGS__) -# define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define uinfo(format, ...) info(format, ##__VA_ARGS__) -# define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define uerr(x...) # define ullerr(x...) +#endif + +#ifdef CONFIG_DEBUG_USB_WARN +# define uwarn(format, ...) warn(format, ##__VA_ARGS__) +# define ullwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define uwarn(x...) # define ullwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_USB_INFO +# define uinfo(format, ...) info(format, ##__VA_ARGS__) +# define ullinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define uinfo(x...) # define ullinfo(x...) #endif -#ifdef CONFIG_DEBUG_FS +#ifdef CONFIG_DEBUG_FS_ERROR # define ferr(format, ...) err(format, ##__VA_ARGS__) # define fllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define fwarn(format, ...) warn(format, ##__VA_ARGS__) -# define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define finfo(format, ...) info(format, ##__VA_ARGS__) -# define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define ferr(x...) # define fllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_FS_WARN +# define fwarn(format, ...) warn(format, ##__VA_ARGS__) +# define fllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define fwarn(x...) # define fllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_FS_INFO +# define finfo(format, ...) info(format, ##__VA_ARGS__) +# define fllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define finfo(x...) # define fllinfo(x...) #endif -#ifdef CONFIG_DEBUG_CRYPTO +#ifdef CONFIG_DEBUG_CRYPTO_ERROR # define crypterr(format, ...) err(format, ##__VA_ARGS__) # define cryptllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define cryptwarn(format, ...) warn(format, ##__VA_ARGS__) -# define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define cryptinfo(format, ...) info(format, ##__VA_ARGS__) -# define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define crypterr(x...) # define cryptllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_CRYPTO_WARN +# define cryptwarn(format, ...) warn(format, ##__VA_ARGS__) +# define cryptllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define cryptwarn(x...) # define cryptllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_CRYPTO_INFO +# define cryptinfo(format, ...) info(format, ##__VA_ARGS__) +# define cryptllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define cryptinfo(x...) # define cryptllinfo(x...) #endif -#ifdef CONFIG_DEBUG_INPUT +#ifdef CONFIG_DEBUG_INPUT_ERROR # define ierr(format, ...) err(format, ##__VA_ARGS__) # define illerr(format, ...) llerr(format, ##__VA_ARGS__) -# define iwarn(format, ...) warn(format, ##__VA_ARGS__) -# define illwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define iinfo(format, ...) info(format, ##__VA_ARGS__) -# define illinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define ierr(x...) # define illerr(x...) +#endif + +#ifdef CONFIG_DEBUG_INPUT_WARN +# define iwarn(format, ...) warn(format, ##__VA_ARGS__) +# define illwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define iwarn(x...) # define illwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_INPUT_INFO +# define iinfo(format, ...) info(format, ##__VA_ARGS__) +# define illinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define iinfo(x...) # define illinfo(x...) #endif -#ifdef CONFIG_DEBUG_SENSORS +#ifdef CONFIG_DEBUG_SENSORS_ERROR # define snerr(format, ...) err(format, ##__VA_ARGS__) # define snllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define snwarn(format, ...) warn(format, ##__VA_ARGS__) -# define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define sninfo(format, ...) info(format, ##__VA_ARGS__) -# define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define snerr(x...) # define snllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_SENSORS_WARN +# define snwarn(format, ...) warn(format, ##__VA_ARGS__) +# define snllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define snwarn(x...) # define snllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_SENSORS_INFO +# define sninfo(format, ...) info(format, ##__VA_ARGS__) +# define snllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define sninfo(x...) # define snllinfo(x...) #endif -#ifdef CONFIG_DEBUG_ANALOG +#ifdef CONFIG_DEBUG_ANALOG_ERROR # define aerr(format, ...) err(format, ##__VA_ARGS__) # define allerr(format, ...) llerr(format, ##__VA_ARGS__) -# define awarn(format, ...) warn(format, ##__VA_ARGS__) -# define allwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define ainfo(format, ...) info(format, ##__VA_ARGS__) -# define allinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define aerr(x...) # define allerr(x...) +#endif + +#ifdef CONFIG_DEBUG_ANALOG_WARN +# define awarn(format, ...) warn(format, ##__VA_ARGS__) +# define allwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define awarn(x...) # define allwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_ANALOG_INFO +# define ainfo(format, ...) info(format, ##__VA_ARGS__) +# define allinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define ainfo(x...) # define allinfo(x...) #endif -#ifdef CONFIG_DEBUG_GRAPHICS +#ifdef CONFIG_DEBUG_GRAPHICS_ERROR # define gerr(format, ...) err(format, ##__VA_ARGS__) # define gllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define gwarn(format, ...) warn(format, ##__VA_ARGS__) -# define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define ginfo(format, ...) info(format, ##__VA_ARGS__) -# define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define gerr(x...) # define gllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_GRAPHICS_WARN +# define gwarn(format, ...) warn(format, ##__VA_ARGS__) +# define gllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define gwarn(x...) # define gllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_GRAPHICS_INFO +# define ginfo(format, ...) info(format, ##__VA_ARGS__) +# define gllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define ginfo(x...) # define gllinfo(x...) #endif -#ifdef CONFIG_DEBUG_BINFMT +#ifdef CONFIG_DEBUG_BINFMT_ERROR # define berr(format, ...) err(format, ##__VA_ARGS__) # define bllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define bwarn(format, ...) warn(format, ##__VA_ARGS__) -# define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define binfo(format, ...) info(format, ##__VA_ARGS__) -# define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define berr(x...) # define bllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_BINFMT_WARN +# define bwarn(format, ...) warn(format, ##__VA_ARGS__) +# define bllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define bwarn(x...) # define bllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_BINFMT_INFO +# define binfo(format, ...) info(format, ##__VA_ARGS__) +# define bllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define binfo(x...) # define bllinfo(x...) #endif -#ifdef CONFIG_DEBUG_LIB +#ifdef CONFIG_DEBUG_LIB_ERROR # define lerr(format, ...) err(format, ##__VA_ARGS__) # define lllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define lwarn(format, ...) warn(format, ##__VA_ARGS__) -# define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define linfo(format, ...) info(format, ##__VA_ARGS__) -# define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define lerr(x...) # define lllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_LIB_WARN +# define lwarn(format, ...) warn(format, ##__VA_ARGS__) +# define lllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define lwarn(x...) # define lllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_LIB_INFO +# define linfo(format, ...) info(format, ##__VA_ARGS__) +# define lllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define linfo(x...) # define lllinfo(x...) #endif -#ifdef CONFIG_DEBUG_AUDIO +#ifdef CONFIG_DEBUG_AUDIO_ERROR # define auderr(format, ...) err(format, ##__VA_ARGS__) # define audllerr(format, ...) llerr(format, ##__VA_ARGS__) -# define audwarn(format, ...) warn(format, ##__VA_ARGS__) -# define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__) -# define audinfo(format, ...) info(format, ##__VA_ARGS__) -# define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__) #else # define auderr(x...) # define audllerr(x...) +#endif + +#ifdef CONFIG_DEBUG_AUDIO_WARN +# define audwarn(format, ...) warn(format, ##__VA_ARGS__) +# define audllwarn(format, ...) llwarn(format, ##__VA_ARGS__) +#else # define audwarn(x...) # define audllwarn(x...) +#endif + +#ifdef CONFIG_DEBUG_AUDIO_INFO +# define audinfo(format, ...) info(format, ##__VA_ARGS__) +# define audllinfo(format, ...) llinfo(format, ##__VA_ARGS__) +#else # define audinfo(x...) # define audllinfo(x...) #endif @@ -452,242 +572,362 @@ /* Subsystem specific debug */ -#ifdef CONFIG_DEBUG_MM +#ifdef CONFIG_DEBUG_MM_ERROR # define merr err # define mllerr llerr -# define mwarn warn -# define mllwarn llwarn -# define minfo info -# define mllinfo llinfo #else # define merr (void) # define mllerr (void) +#endif + +#ifdef CONFIG_DEBUG_MM_WARN +# define mwarn warn +# define mllwarn llwarn +#else # define mwarn (void) # define mllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_MM_INFO +# define minfo info +# define mllinfo llinfo +#else # define minfo (void) # define mllinfo (void) #endif -#ifdef CONFIG_DEBUG_SCHED +#ifdef CONFIG_DEBUG_SCHED_ERROR # define serr err # define sllerr llerr -# define swarn warn -# define sllwarn llwarn -# define sinfo info -# define sllinfo llinfo #else # define serr (void) # define sllerr (void) +#endif + +#ifdef CONFIG_DEBUG_SCHED_WARN +# define swarn warn +# define sllwarn llwarn +#else # define swarn (void) # define sllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_SCHED_INFO +# define sinfo info +# define sllinfo llinfo +#else # define sinfo (void) # define sllinfo (void) #endif -#ifdef CONFIG_DEBUG_PAGING +#ifdef CONFIG_DEBUG_PAGING_ERROR # define pgerr err # define pgllerr llerr -# define pgwarn warn -# define pgllwarn llwarn -# define pginfo info -# define pgllinfo llinfo #else # define pgerr (void) # define pgllerr (void) +#endif + +#ifdef CONFIG_DEBUG_PAGING_WARN +# define pgwarn warn +# define pgllwarn llwarn +#else # define pgwarn (void) # define pgllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_PAGING_INFO +# define pginfo info +# define pgllinfo llinfo +#else # define pginfo (void) # define pgllinfo (void) #endif -#ifdef CONFIG_DEBUG_DMA +#ifdef CONFIG_DEBUG_DMA_ERROR # define dmaerr err # define dmallerr llerr -# define dmawarn warn -# define dmallwarn llwarn -# define dmainfo info -# define dmallinfo llinfo #else # define dmaerr (void) # define dmallerr (void) +#endif + +#ifdef CONFIG_DEBUG_DMA_WARN +# define dmawarn warn +# define dmallwarn llwarn +#else # define dmawarn (void) # define dmallwarn (void) +#endif + +#ifdef CONFIG_DEBUG_DMA_INFO +# define dmainfo info +# define dmallinfo llinfo +#else # define dmainfo (void) # define dmallinfo (void) #endif -#ifdef CONFIG_DEBUG_NET +#ifdef CONFIG_DEBUG_NET_ERROR # define nerr err # define nllerr llerr -# define nwarn warn -# define nllwarn llwarn -# define ninfo info -# define nllinfo llinfo #else # define nerr (void) # define nllerr (void) +#endif + +#ifdef CONFIG_DEBUG_NET_WARN +# define nwarn warn +# define nllwarn llwarn +#else # define nwarn (void) # define nllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_NET_INFO +# define ninfo info +# define nllinfo llinfo +#else # define ninfo (void) # define nllinfo (void) #endif -#ifdef CONFIG_DEBUG_USB +#ifdef CONFIG_DEBUG_USB_ERROR # define uerr err # define ullerr llerr -# define uwarn warn -# define ullwarn llwarn -# define uinfo info -# define ullinfo llinfo #else # define uerr (void) # define ullerr (void) +#endif + +#ifdef CONFIG_DEBUG_USB_WARN +# define uwarn warn +# define ullwarn llwarn +#else # define uwarn (void) # define ullwarn (void) +#endif + +#ifdef CONFIG_DEBUG_USB_INFO +# define uinfo info +# define ullinfo llinfo +#else # define uinfo (void) # define ullinfo (void) #endif -#ifdef CONFIG_DEBUG_FS +#ifdef CONFIG_DEBUG_FS_ERROR # define ferr err # define fllerr llerr -# define fwarn warn -# define fllwarn llwarn -# define finfo info -# define fllinfo llinfo #else # define ferr (void) # define fllerr (void) +#endif + +#ifdef CONFIG_DEBUG_FS_WARN +# define fwarn warn +# define fllwarn llwarn +#else # define fwarn (void) # define fllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_FS_INFO +# define finfo info +# define fllinfo llinfo +#else # define finfo (void) # define fllinfo (void) #endif -#ifdef CONFIG_DEBUG_CRYPTO +#ifdef CONFIG_DEBUG_CRYPTO_ERROR # define crypterr err # define cryptllerr llerr -# define cryptwarn warn -# define cryptllwarn llwarn -# define cryptinfo info -# define cryptllinfo llinfo #else # define crypterr (void) # define cryptllerr (void) -# define cryptwarn (void) -# define cryptllwarn (void) -# define cryptinfo (void) -# define cryptllinfo (void) #endif -#ifdef CONFIG_DEBUG_INPUT +#ifdef CONFIG_DEBUG_CRYPTO_WARN +# define cryptwarn warn +# define cryptllwarn llwarn +#else +# define cryptwarn (void) +# define cryptllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_CRYPTO_INFO +# define cryptinfo info +# define cryptllinfo llinfo +#else +# define cryptinfo(x...) +# define cryptllinfo(x...) +#endif + +#ifdef CONFIG_DEBUG_INPUT_ERROR # define ierr err # define illerr llerr -# define iwarn warn -# define illwarn llwarn -# define iinfo info -# define illinfo llinfo #else # define ierr (void) # define illerr (void) +#endif + +#ifdef CONFIG_DEBUG_INPUT_WARN +# define iwarn warn +# define illwarn llwarn +#else # define iwarn (void) # define illwarn (void) +#endif + +#ifdef CONFIG_DEBUG_INPUT_INFO +# define iinfo info +# define illinfo llinfo +#else # define iinfo (void) # define illinfo (void) #endif -#ifdef CONFIG_DEBUG_SENSORS +#ifdef CONFIG_DEBUG_SENSORS_ERROR # define snerr err # define snllerr llerr -# define snwarn warn -# define snllwarn llwarn -# define sninfo info -# define snllinfo llinfo #else # define snerr (void) # define snllerr (void) +#endif + +#ifdef CONFIG_DEBUG_SENSORS_WARN +# define snwarn warn +# define snllwarn llwarn +#else # define snwarn (void) # define snllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_SENSORS_INFO +# define sninfo info +# define snllinfo llinfo +#else # define sninfo (void) # define snllinfo (void) #endif -#ifdef CONFIG_DEBUG_ANALOG +#ifdef CONFIG_DEBUG_ANALOG_ERROR # define aerr err # define allerr llerr -# define awarn warn -# define allwarn llwarn -# define ainfo info -# define allinfo llinfo #else # define aerr (void) # define allerr (void) +#endif + +#ifdef CONFIG_DEBUG_ANALOG_WARN +# define awarn warn +# define allwarn llwarn +#else # define awarn (void) # define allwarn (void) +#endif + +#ifdef CONFIG_DEBUG_ANALOG_INFO +# define ainfo info +# define allinfo llinfo +#else # define ainfo (void) # define allinfo (void) #endif -#ifdef CONFIG_DEBUG_GRAPHICS +#ifdef CONFIG_DEBUG_GRAPHICS_ERROR # define gerr err # define gllerr llerr -# define gwarn warn -# define gllwarn llwarn -# define ginfo info -# define gllinfo llinfo #else # define gerr (void) # define gllerr (void) +#endif + +#ifdef CONFIG_DEBUG_GRAPHICS_WARN +# define gwarn warn +# define gllwarn llwarn +#else # define gwarn (void) # define gllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_GRAPHICS_INFO +# define ginfo info +# define gllinfo llinfo +#else # define ginfo (void) # define gllinfo (void) #endif -#ifdef CONFIG_DEBUG_BINFMT +#ifdef CONFIG_DEBUG_BINFMT_ERROR # define berr err # define bllerr llerr -# define bwarn warn -# define bllwarn llwarn -# define binfo info -# define bllinfo llinfo #else # define berr (void) # define bllerr (void) +#endif + +#ifdef CONFIG_DEBUG_BINFMT_WARN +# define bwarn warn +# define bllwarn llwarn +#else # define bwarn (void) # define bllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_BINFMT_INFO +# define binfo info +# define bllinfo llinfo +#else # define binfo (void) # define bllinfo (void) #endif -#ifdef CONFIG_DEBUG_LIB +#ifdef CONFIG_DEBUG_LIB_ERROR # define lerr err # define lllerr llerr -# define lwarn warn -# define lllwarn llwarn -# define linfo info -# define lllinfo llinfo #else # define lerr (void) # define lllerr (void) +#endif + +#ifdef CONFIG_DEBUG_LIB_WARN +# define lwarn warn +# define lllwarn llwarn +#else # define lwarn (void) # define lllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_LIB_INFO +# define linfo info +# define lllinfo llinfo +#else # define linfo (void) # define lllinfo (void) #endif -#ifdef CONFIG_DEBUG_AUDIO +#ifdef CONFIG_DEBUG_AUDIO_ERROR # define auderr err # define audllerr llerr -# define audwarn warn -# define audllwarn llwarn -# define audinfo info -# define audllinfo llinfo #else # define auderr (void) # define audllerr (void) +#endif + +#ifdef CONFIG_DEBUG_AUDIO_WARN +# define audwarn warn +# define audllwarn llwarn +#else # define audwarn (void) # define audllwarn (void) +#endif + +#ifdef CONFIG_DEBUG_AUDIO_INFO +# define audinfo info +# define audllinfo llinfo +#else # define audinfo (void) # define audllinfo (void) #endif diff --git a/sched/pthread/pthread_mutexunlock.c b/sched/pthread/pthread_mutexunlock.c index 77b1c8f36e9..078d9094b93 100644 --- a/sched/pthread/pthread_mutexunlock.c +++ b/sched/pthread/pthread_mutexunlock.c @@ -102,7 +102,7 @@ int pthread_mutex_unlock(FAR pthread_mutex_t *mutex) { /* No... return an error (default behavior is like PTHREAD_MUTEX_ERRORCHECK) */ - serr(ERROR: "Holder=%d returning EPERM\n", mutex->pid); + serr("ERROR: Holder=%d returning EPERM\n", mutex->pid); ret = EPERM; }