From 855c03f81973c9c8b4f8eaa6e612a1fdac1188f7 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 15 May 2010 19:34:14 +0000 Subject: Fixes to build with DEBUG enabled git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2673 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/lm3s6965-ek/nx/defconfig | 1 + nuttx/configs/lm3s6965-ek/src/up_oled.c | 2 +- nuttx/drivers/lcd/p14201.c | 12 +++++------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index 2b425b4e2..681bc85d6 100755 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -281,6 +281,7 @@ CONFIG_DEBUG=n CONFIG_DEBUG_VERBOSE=n CONFIG_DEBUG_SYMBOLS=n CONFIG_DEBUG_GRAPHICS=n +CONFIG_LCD_RITDEBUG=n CONFIG_MM_REGIONS=1 CONFIG_ARCH_LOWPUTC=y CONFIG_RR_INTERVAL=200 diff --git a/nuttx/configs/lm3s6965-ek/src/up_oled.c b/nuttx/configs/lm3s6965-ek/src/up_oled.c index 17b9c2232..10d467a58 100755 --- a/nuttx/configs/lm3s6965-ek/src/up_oled.c +++ b/nuttx/configs/lm3s6965-ek/src/up_oled.c @@ -89,7 +89,7 @@ FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno) dev = rit_initialize(spi, devno); if (!dev) { - glldbg("Failed to bind SPI port 0 to OLED %d: %d\n", ret, devno); + glldbg("Failed to bind SPI port 0 to OLED %d: %d\n", devno); } else { diff --git a/nuttx/drivers/lcd/p14201.c b/nuttx/drivers/lcd/p14201.c index b9b32c69a..7e334dcdb 100755 --- a/nuttx/drivers/lcd/p14201.c +++ b/nuttx/drivers/lcd/p14201.c @@ -134,14 +134,12 @@ # warning "4-bit, big-endian pixel support needed" #endif -/* Define the following to enable detailed debug output (stuff you would +/* Define the CONFIG_LCD_RITDEBUG to enable detailed debug output (stuff you would * never want to see unless you are debugging this file). + * + * Verbose debug must also be enabled */ -#undef CONFIG_LCD_RITDEBUG - -/* Verbose debug must also be enabled */ - #ifndef CONFIG_DEBUG # undef CONFIG_DEBUG_VERBOSE # undef CONFIG_DEBUG_GRAPHICS @@ -620,7 +618,7 @@ static void rit_sndcmds(FAR struct rit_dev_s *priv, FAR const uint8_t *table) while ((cmdlen = *table++) != 0) { - ritdbg("command: %02x cmdlen: %d\n", buflen, *table); + ritdbg("command: %02x cmdlen: %d\n", cmdlen, *table); rit_sndcmd(priv, table, cmdlen); table += cmdlen; } @@ -1042,7 +1040,7 @@ static int rit_getvideoinfo(FAR struct lcd_dev_s *dev, static int rit_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, FAR struct lcd_planeinfo_s *pinfo) { - DEBUGASSERT(priv && pinfo && planeno == 0); + DEBUGASSERT(pinfo && planeno == 0); gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); return OK; -- cgit v1.2.3