WM8904 w/NxPlayer: Fix some compile errors and warnings with debug enabled

1 files changed, 92 insertions, 90 deletions

diff --git a/nuttx/Kconfig b/nuttx/Kconfig
index bc5d1f3df..7a5f41cba 100644
--- a/nuttx/Kconfig
+++ b/nuttx/Kconfig
@@ -379,31 +379,19 @@ config DEBUG_VERBOSE
 
 comment "Subsystem Debug Options"
 
-config DEBUG_MM
-	bool "Memory Manager Debug Output"
-	default n
-	---help---
-		Enable memory management debug SYSLOG output (disabled by default)
-
-config DEBUG_SCHED
-	bool "Scheduler Debug Output"
-	default n
-	---help---
-		Enable OS debug SYSLOG output (disabled by default)
-
-config DEBUG_PAGING
-	bool "Demand Paging Debug Output"
+config DEBUG_AUDIO
+	bool "Audio Device Debug Output"
 	default n
-	depends on PAGING
 	---help---
-		Enable demand paging debug SYSLOG output (disabled by default)
+		Enable low level debug SYSLOG output from the audio subsystem and
+		device drivers. (disabled by default).  Support for this debug option
+		is architecture-specific and may not be available for some MCUs.
 
-config DEBUG_NET
-	bool "Network Debug Output"
+config DEBUG_BINFMT
+	bool "Binary Loader Debug Output"
 	default n
-	depends on ARCH_HAVE_NET
 	---help---
-		Enable network debug SYSLOG output (disabled by default)
+		Enable binary loader debug SYSLOG output (disabled by default)
 
 config DEBUG_CRYPTO
 	bool "Crypto Debug Output"
@@ -412,47 +400,42 @@ config DEBUG_CRYPTO
 	---help---
 		Enable Crypto debug SYSLOG output (disabled by default)
 
-config DEBUG_USB
-	bool "USB Debug Output"
-	default n
-	depends on USBDEV || USBHOST
-	---help---
-		Enable usb debug SYSLOG output (disabled by default)
-
 config DEBUG_FS
 	bool "File System Debug Output"
 	default n
 	---help---
 		Enable file system debug SYSLOG output (disabled by default)
 
+config DEBUG_GRAPHICS
+	bool "Graphics Debug Output"
+	default n
+	---help---
+		Enable NX graphics debug SYSLOG output (disabled by default)
+
 config DEBUG_LIB
 	bool "C Library Debug Output"
 	default n
 	---help---
 		Enable C library debug SYSLOG output (disabled by default)
 
-config DEBUG_BINFMT
-	bool "Binary Loader Debug Output"
+config DEBUG_MM
+	bool "Memory Manager Debug Output"
 	default n
 	---help---
-		Enable binary loader debug SYSLOG output (disabled by default)
+		Enable memory management debug SYSLOG output (disabled by default)
 
-config DEBUG_GRAPHICS
-	bool "Graphics Debug Output"
+config DEBUG_NET
+	bool "Network Debug Output"
 	default n
+	depends on ARCH_HAVE_NET
 	---help---
-		Enable NX graphics debug SYSLOG output (disabled by default)
+		Enable network debug SYSLOG output (disabled by default)
 
-config DEBUG_IRQ
-	bool "Interrupt Controller Debug Output"
+config DEBUG_SCHED
+	bool "Scheduler Debug Output"
 	default n
 	---help---
-		Some (but not all) architectures support debug output to verify
-		interrupt controller logic.  If supported, then option will enable
-		that output.  This may interfere with normal operations!  You
-		should *not* enable interrupt controller debug unless you suspect
-		that here is a problem with that logic.  On some platforms, this
-		option may even cause crashes! Use with care!
+		Enable OS debug SYSLOG output (disabled by default)
 
 config DEBUG_SYSCALL
 	bool "SYSCALL Debug Output"
@@ -462,12 +445,16 @@ config DEBUG_SYSCALL
 		Enable very low level output related to system calls.  This gives
 		you basically a poor man's version of strace.
 
-config DEBUG_STACK
-	bool "Stack usage debug hooks"
+comment "OS Function Debug Options"
+
+config DEBUG_DMA
+	bool "DMA Debug Output"
 	default n
-	depends on ARCH_HAVE_STACKCHECK
+	depends on ARCH_DMA
 	---help---
-		Enable hooks to check stack usage.  Only supported by a few architectures.
+		Enable DMA-releated debug SYSLOG output (disabled by default).
+		Support for this debug option is architecture-specific and may not
+		be available for some MCUs.
 
 config DEBUG_HEAP
 	bool "Heap usage debug hooks"
@@ -476,6 +463,31 @@ config DEBUG_HEAP
 	---help---
 		Enable hooks to check heap usage.  Only supported by a few architectures.
 
+config DEBUG_IRQ
+	bool "Interrupt Controller Debug Output"
+	default n
+	---help---
+		Some (but not all) architectures support debug output to verify
+		interrupt controller logic.  If supported, then option will enable
+		that output.  This may interfere with normal operations!  You
+		should *not* enable interrupt controller debug unless you suspect
+		that here is a problem with that logic.  On some platforms, this
+		option may even cause crashes! Use with care!
+
+config DEBUG_PAGING
+	bool "Demand Paging Debug Output"
+	default n
+	depends on PAGING
+	---help---
+		Enable demand paging debug SYSLOG output (disabled by default)
+
+config DEBUG_STACK
+	bool "Stack usage debug hooks"
+	default n
+	depends on ARCH_HAVE_STACKCHECK
+	---help---
+		Enable hooks to check stack usage.  Only supported by a few architectures.
+
 comment "Driver Debug Options"
 
 config DEBUG_LCD
@@ -515,19 +527,27 @@ config DEBUG_ANALOG
 		this debug option is architecture-specific and may not be available
 		for some MCUs.
 
-config DEBUG_I2C
-	bool "I2C Debug Output"
+config DEBUG_CAN
+	bool "CAN Debug Output"
 	default n
-	depends on I2C
+	depends on CAN
 	---help---
-		Enable I2C driver debug SYSLOG output (disabled by default).
+		Enable CAN driver debug SYSLOG output (disabled by default).
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
-config DEBUG_SPI
-	bool "SPI Debug Output"
+config DEBUG_GPIO
+	bool "GPIO Debug Output"
 	default n
-	depends on SPI
+	---help---
+		Enable GPIO-releated debug SYSLOG output (disabled by default).
+		Support for this debug option is architecture-specific and may not
+		be available for some MCUs.
+
+config DEBUG_I2C
+	bool "I2C Debug Output"
+	default n
+	depends on I2C
 	---help---
 		Enable I2C driver debug SYSLOG output (disabled by default).
 		Support for this debug option is architecture-specific and may not
@@ -542,21 +562,21 @@ config DEBUG_I2S
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
-config DEBUG_CAN
-	bool "CAN Debug Output"
+config DEBUG_PWM
+	bool "PWM Debug Output"
 	default n
-	depends on CAN
+	depends on PWM
 	---help---
-		Enable CAN driver debug SYSLOG output (disabled by default).
+		Enable PWM driver debug SYSLOG output (disabled by default).
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
-config DEBUG_PWM
-	bool "PWM Debug Output"
+config DEBUG_RTC
+	bool "RTC Debug Output"
 	default n
-	depends on PWM
+	depends on RTC
 	---help---
-		Enable PWM driver debug SYSLOG output (disabled by default).
+		Enable RTC driver debug SYSLOG output (disabled by default).
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
@@ -569,31 +589,30 @@ config DEBUG_SDIO
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
-config DEBUG_GPIO
-	bool "GPIO Debug Output"
+config DEBUG_SPI
+	bool "SPI Debug Output"
 	default n
+	depends on SPI
 	---help---
-		Enable GPIO-releated debug SYSLOG output (disabled by default).
+		Enable I2C driver debug SYSLOG output (disabled by default).
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
-config DEBUG_DMA
-	bool "DMA Debug Output"
+config DEBUG_TIMER
+	bool "Timer Debug Output"
 	default n
-	depends on ARCH_DMA
+	depends on TIMER
 	---help---
-		Enable DMA-releated debug SYSLOG output (disabled by default).
+		Enable timer debug SYSLOG output (disabled by default).
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
-config DEBUG_RTC
-	bool "RTC Debug Output"
+config DEBUG_USB
+	bool "USB Debug Output"
 	default n
-	depends on RTC
+	depends on USBDEV || USBHOST
 	---help---
-		Enable RTC driver debug SYSLOG output (disabled by default).
-		Support for this debug option is architecture-specific and may not
-		be available for some MCUs.
+		Enable usb debug SYSLOG output (disabled by default)
 
 config DEBUG_WATCHDOG
 	bool "Watchdog Timer Debug Output"
@@ -604,23 +623,6 @@ config DEBUG_WATCHDOG
 		Support for this debug option is architecture-specific and may not
 		be available for some MCUs.
 
-config DEBUG_TIMER
-	bool "Timer Debug Output"
-	default n
-	depends on TIMER
-	---help---
-		Enable timer debug SYSLOG output (disabled by default).
-		Support for this debug option is architecture-specific and may not
-		be available for some MCUs.
-
-config DEBUG_AUDIO
-	bool "Audio Device Debug Output"
-	default n
-	---help---
-		Enable low level debug SYSLOG output from the audio subsystem and
-		device drivers. (disabled by default).  Support for this debug option
-		is architecture-specific and may not be available for some MCUs.
-
 endif # DEBUG
 
 config DEBUG_SYMBOLS