summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-04-04 06:59:14 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-04-04 06:59:14 -0600
commite075d5866dd2f8960605b4808650f3e85b44cbe3 (patch)
treed99f35dc5b7ad4b4af8a90305c81723baf8c6013
parent8835fb844e8a1a4704355533070f5ed1b6ad3e1e (diff)
downloadpx4-nuttx-e075d5866dd2f8960605b4808650f3e85b44cbe3.tar.gz
px4-nuttx-e075d5866dd2f8960605b4808650f3e85b44cbe3.tar.bz2
px4-nuttx-e075d5866dd2f8960605b4808650f3e85b44cbe3.zip
Fix typos in debug assertions
-rw-r--r--nuttx/configs/samv71-xult/src/atmxt-xpro.h6
-rw-r--r--nuttx/configs/samv71-xult/src/sam_ili9488.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/configs/samv71-xult/src/atmxt-xpro.h b/nuttx/configs/samv71-xult/src/atmxt-xpro.h
index 15a3028ed..29dcaa4b6 100644
--- a/nuttx/configs/samv71-xult/src/atmxt-xpro.h
+++ b/nuttx/configs/samv71-xult/src/atmxt-xpro.h
@@ -112,7 +112,7 @@
/* ILI9488 RGB requires use of LCD connector and SMC and DMA support */
# ifndef CONFIG_SAMV71XULT_MXTXPLND_LCD
-# warning The ILI8488 LCD must be connect on EXT4 (CONFIG_SAMV71XULT_MXTXPLND_LCD)
+# warning The ILI8488 LCD must be connected on LCD EXT4 (CONFIG_SAMV71XULT_MXTXPLND_LCD)
# undef HAVE_ILI9488_RGB
# endif
@@ -133,7 +133,7 @@
/* ILI9488 MCU requires use of EXT1 or EXT2 connector */
# if !defined(CONFIG_SAMV71XULT_MXTXPLND_EXT1) && !defined(CONFIG_SAMV71XULT_MXTXPLND_EXT2)
-# warning ILI9488 MCU requires CONFIG_SAMV71XULT_MXTXPLND_EXT1 or EXT2
+# warning ILI9488 MCU must be connected or EXT1 or EXT2 (CONFIG_SAMV71XULT_MXTXPLND_EXT1/2)
# undef HAVE_ILI9488_MCU
# endif
@@ -318,7 +318,7 @@
# define IRQ_MXT_CHG SAM_IRQ_PD28
# endif /* HAVE_MAXTOUCH */
-/* ILI9488 RGB mode definitions when connected via LCd (EXT4) */
+/* ILI9488 RGB mode definitions when connected via LCD (EXT4) */
# define GPIO_ILI9488_CDS (GPIO_OUTPUT | GPIO_CFG_DEFAULT | GPIO_OUTPUT_SET | \
GPIO_PORT_PIOC | GPIO_PIN30)
diff --git a/nuttx/configs/samv71-xult/src/sam_ili9488.c b/nuttx/configs/samv71-xult/src/sam_ili9488.c
index d66ab8d6d..cc60a4d9b 100644
--- a/nuttx/configs/samv71-xult/src/sam_ili9488.c
+++ b/nuttx/configs/samv71-xult/src/sam_ili9488.c
@@ -1115,7 +1115,7 @@ static int sam_putrun(fb_coord_t row, fb_coord_t col,
/* Buffer must be provided and aligned to a 16-bit address boundary */
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
- DEBUGASSERT(src && ((uintptr_t)src & 1) == 0);
+ DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
/* Determine the refresh window area */
@@ -1156,7 +1156,7 @@ static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
/* Buffer must be provided and aligned to a 16-bit address boundary */
lcdvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
- DEBUGASSERT(dest && ((uintptr_t)dest & 1) == 0);
+ DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
/* Determine the refresh window area */