From 13e9a60e3ac12a6fa6301ebdffb978d5fead5c1b Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 24 Oct 2011 22:03:37 +0000
Subject: [PATCH] Misc fixes for clean compilation with graphics debug enabled

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4061 42af7a65-404d-4744-a932-0658087f49c3
---
 configs/stm3210e-eval/README.txt | 37 +++++++++++++++++++++++++++++---
 graphics/nxtk/nxtk_gettoolbar.c  |  5 +++--
 graphics/nxtk/nxtk_getwindow.c   |  6 +++---
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/configs/stm3210e-eval/README.txt b/configs/stm3210e-eval/README.txt
index 576f49472a..f6c21232dc 100755
--- a/configs/stm3210e-eval/README.txt
+++ b/configs/stm3210e-eval/README.txt
@@ -11,7 +11,7 @@ Contents
   - GNU Toolchain Options
   - IDEs
   - NuttX buildroot Toolchain
-  - DFU
+  - DFU and JTAG
   - LEDs
   - Temperature Sensor
   - RTC
@@ -166,9 +166,11 @@ NuttX buildroot Toolchain
   detailed PLUS some special instructions that you will need to follow if you are
   building a Cortex-M3 toolchain for Cygwin under Windows.
 
-DFU
-===
+DFU and JTAG
+============
 
+  Enbling Support for the DFU Bootloader
+  --------------------------------------
   The linker files in these projects can be configured to indicate that you
   will be loading code using STMicro built-in USB Device Firmware Upgrade (DFU)
   loader or via some JTAG emulator.  You can specify the DFU bootloader by
@@ -213,6 +215,29 @@ DFU
   in order to find it with the DFU File Manager. You will end up with
   a file called nuttx.dfu that you can use with the STMicro DFU SE program.
 
+  Enabling JTAG
+  -------------
+  If you are not using the DFU, then you will probably also need to enable
+  JTAG support.  By default, all JTAG support is disabled but there NuttX
+  configuration options to enable JTAG in various different ways.
+
+  These configurations effect the setting of the SWJ_CFG[2:0] bits in the AFIO
+  MAPR register.  These bits are used to configure the SWJ and trace alternate function I/Os. The SWJ (SerialWire JTAG) supports JTAG or SWD access to the
+  Cortex debug port.  The default state in this port is for all JTAG support
+  to be disable.
+
+  CONFIG_STM32_JTAG_FULL_ENABLE - sets SWJ_CFG[2:0] to 000 which enables full
+    SWJ (JTAG-DP + SW-DP)
+
+  CONFIG_STM32_JTAG_NOJNTRST_ENABLE - sets SWJ_CFG[2:0] to 001 which enable
+    full SWJ (JTAG-DP + SW-DP) but without JNTRST.
+
+  CONFIG_STM32_JTAG_SW_ENABLE - sets SWJ_CFG[2:0] to 010 which would set JTAG-DP
+    disabled and SW-DP enabled
+
+  The default setting (none of the above defined) is SWJ_CFG[2:0] set to 100
+  which disable JTAG-DP and SW-DP.
+
 LEDs
 ====
 
@@ -447,6 +472,12 @@ STM3210E-EVAL-specific Configuration Options
 	CONFIG_STM32_CAN1_PARTIAL_REMAP
 	CONFIG_STM32_CAN2_REMAP
 
+  JTAG Enable settings (by default JTAG-DP and SW-DP are disabled):
+	CONFIG_STM32_JTAG_FULL_ENABLE - Enables full SWJ (JTAG-DP + SW-DP)
+	CONFIG_STM32_JTAG_NOJNTRST_ENABLE - Enables full SWJ (JTAG-DP + SW-DP)
+	  but without JNTRST.
+	CONFIG_STM32_JTAG_SW_ENABLE - Set JTAG-DP disabled and SW-DP enabled
+
   STM32F103Z specific device driver settings
 
 	CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=1,2,3) or UART
diff --git a/graphics/nxtk/nxtk_gettoolbar.c b/graphics/nxtk/nxtk_gettoolbar.c
index 7d2b118405..c5908f53b1 100644
--- a/graphics/nxtk/nxtk_gettoolbar.c
+++ b/graphics/nxtk/nxtk_gettoolbar.c
@@ -102,10 +102,11 @@ void nxtk_gettoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
   struct nxgl_rect_s getrect;
 
 #ifdef CONFIG_DEBUG
-  if (!hwnd || !rect || !dest)
+  if (!hfwnd || !rect || !dest)
     {
+      gvdbg("Invalid parameters\n");
       errno = EINVAL;
-      return ERROR;
+      return;
     }
 #endif
 
diff --git a/graphics/nxtk/nxtk_getwindow.c b/graphics/nxtk/nxtk_getwindow.c
index 88d1d4d0e0..f6df2c3ad3 100644
--- a/graphics/nxtk/nxtk_getwindow.c
+++ b/graphics/nxtk/nxtk_getwindow.c
@@ -102,10 +102,10 @@ void nxtk_getwindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
   struct nxgl_rect_s getrect;
 
 #ifdef CONFIG_DEBUG
-  if (!hwnd || !rect || !dest)
+  if (!hfwnd || !rect || !dest)
     {
-      errno = EINVAL;
-      return ERROR;
+      gvdbg("Invalid parameters\n");
+      return;
     }
 #endif