From e723fc7fd4c77acece744f640b5d2be648c0e2c1 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 23 Apr 2016 09:06:39 -0600
Subject: [PATCH] VNC: Add option to enable VNC server debug without GRAPHICS
 debug

---
 graphics/vnc/server/Kconfig         | 13 ++++++++++++-
 graphics/vnc/server/vnc_fbdev.c     |  8 ++++++++
 graphics/vnc/server/vnc_negotiate.c |  8 ++++++++
 graphics/vnc/server/vnc_raw.c       |  8 ++++++++
 graphics/vnc/server/vnc_receiver.c  |  8 ++++++++
 graphics/vnc/server/vnc_rre.c       |  8 ++++++++
 graphics/vnc/server/vnc_server.c    |  8 ++++++++
 graphics/vnc/server/vnc_updater.c   |  9 +++++++++
 8 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/graphics/vnc/server/Kconfig b/graphics/vnc/server/Kconfig
index 3f14b38bc2..157b62dfc9 100644
--- a/graphics/vnc/server/Kconfig
+++ b/graphics/vnc/server/Kconfig
@@ -127,9 +127,20 @@ config VNCSERVER_INBUFFER_SIZE
 	int "Input buffer size"
 	default 80
 
+config VNCSERVER_DEBUG
+	bool "VNC Server debug"
+	default n
+	depends on DEBUG && !DEBUG_GRAPHICS
+	---help---
+		Normally VNC debug output is selected with DEBUG_GRAPHICS.  The VNC
+		server server suupport this special option to enable GRAPHICS debug
+		output for the VNC server while GRAPHICS debug is disabled.  This
+		provides an cleaner, less cluttered output when you only wish to
+		debug the VNC server versus enabling DEBUG_GRAPHICS globally.
+
 config VNCSERVER_UPDATE_DEBUG
 	bool "Detailed updater debug"
 	default n
-	depends on DEBUG_GRAPHICS
+	depends on DEBUG_GRAPHICS || VNCSERVER_DEBUG
 
 endif # VNCSERVER
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index 2f98fab21b..1df96cd9b6 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -43,6 +43,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+
+#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
+#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_VERBOSE
+#  define CONFIG_DEBUG          1
+#  define CONFIG_DEBUG_VERBOSE  1
+#  define CONFIG_DEBUG_GRAPHICS 1
+#endif
 #include <debug.h>
 
 #include <nuttx/kthread.h>
diff --git a/graphics/vnc/server/vnc_negotiate.c b/graphics/vnc/server/vnc_negotiate.c
index 5014e9a83d..8b4f6955ed 100644
--- a/graphics/vnc/server/vnc_negotiate.c
+++ b/graphics/vnc/server/vnc_negotiate.c
@@ -43,6 +43,14 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+
+#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
+#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_VERBOSE
+#  define CONFIG_DEBUG          1
+#  define CONFIG_DEBUG_VERBOSE  1
+#  define CONFIG_DEBUG_GRAPHICS 1
+#endif
 #include <debug.h>
 
 #ifdef CONFIG_NET_SOCKOPTS
diff --git a/graphics/vnc/server/vnc_raw.c b/graphics/vnc/server/vnc_raw.c
index 64cfee779e..947cbfe905 100644
--- a/graphics/vnc/server/vnc_raw.c
+++ b/graphics/vnc/server/vnc_raw.c
@@ -42,6 +42,14 @@
 #include <stdint.h>
 #include <assert.h>
 #include <errno.h>
+
+#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
+#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_VERBOSE
+#  define CONFIG_DEBUG          1
+#  define CONFIG_DEBUG_VERBOSE  1
+#  define CONFIG_DEBUG_GRAPHICS 1
+#endif
 #include <debug.h>
 
 #include "vnc_server.h"
diff --git a/graphics/vnc/server/vnc_receiver.c b/graphics/vnc/server/vnc_receiver.c
index 08a001631b..2bc3359a50 100644
--- a/graphics/vnc/server/vnc_receiver.c
+++ b/graphics/vnc/server/vnc_receiver.c
@@ -41,6 +41,14 @@
 
 #include <assert.h>
 #include <errno.h>
+
+#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
+#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_VERBOSE
+#  define CONFIG_DEBUG          1
+#  define CONFIG_DEBUG_VERBOSE  1
+#  define CONFIG_DEBUG_GRAPHICS 1
+#endif
 #include <debug.h>
 
 #ifdef CONFIG_NET_SOCKOPTS
diff --git a/graphics/vnc/server/vnc_rre.c b/graphics/vnc/server/vnc_rre.c
index 0ccb841f86..a216a49524 100644
--- a/graphics/vnc/server/vnc_rre.c
+++ b/graphics/vnc/server/vnc_rre.c
@@ -42,6 +42,14 @@
 #include <stdint.h>
 #include <assert.h>
 #include <errno.h>
+
+#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
+#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_VERBOSE
+#  define CONFIG_DEBUG          1
+#  define CONFIG_DEBUG_VERBOSE  1
+#  define CONFIG_DEBUG_GRAPHICS 1
+#endif
 #include <debug.h>
 
 #include "vnc_server.h"
diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c
index c33050f303..10c0a84dd9 100644
--- a/graphics/vnc/server/vnc_server.c
+++ b/graphics/vnc/server/vnc_server.c
@@ -46,6 +46,14 @@
 #include <queue.h>
 #include <assert.h>
 #include <errno.h>
+
+#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
+#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_VERBOSE
+#  define CONFIG_DEBUG          1
+#  define CONFIG_DEBUG_VERBOSE  1
+#  define CONFIG_DEBUG_GRAPHICS 1
+#endif
 #include <debug.h>
 
 #include <arpa/inet.h>
diff --git a/graphics/vnc/server/vnc_updater.c b/graphics/vnc/server/vnc_updater.c
index eb76c99064..1ac9d4bf6a 100644
--- a/graphics/vnc/server/vnc_updater.c
+++ b/graphics/vnc/server/vnc_updater.c
@@ -47,6 +47,15 @@
 #include <assert.h>
 #include <errno.h>
 
+#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
+#  undef  CONFIG_DEBUG
+#  undef  CONFIG_DEBUG_VERBOSE
+#  define CONFIG_DEBUG          1
+#  define CONFIG_DEBUG_VERBOSE  1
+#  define CONFIG_DEBUG_GRAPHICS 1
+#endif
+#include <debug.h>
+
 #include <nuttx/semaphore.h>
 
 #include "vnc_server.h"