More renaming: up_lcdinitialize->board_lcd_initialize, up_lcdgetdev->board_lcd_getdev, up_lcduninitialize->board_lcd_uninitialize

2 files changed, 16 insertions, 9 deletions

diff --git a/nuttx/configs/samv71-xult/README.txt b/nuttx/configs/samv71-xult/README.txt
index 6f4de1bfe4..231eb8e4b5 100644
--- a/nuttx/configs/samv71-xult/README.txt
+++ b/nuttx/configs/samv71-xult/README.txt
@@ -755,8 +755,11 @@ Testing has also been performed using the maXTouch Xplained Pro LCD
 maXTouch Xplained Pro Standard Extension Header
 -----------------------------------------------
 The LCD could be connected either via EXT1 or EXT2 using the 2x10 20-pin
-cable and the maXTouch Xplained Pro standard extension header. Access is
-then performed in SPI mode.
+cable and the maXTouch Xplained Pro standard extension header. Access would
+then be performed in SPI mode.
+
+NOTE: There is currently no support for use of the LCD in SPI mode.  See
+the next paragraph where the LCD/EXT4 connection is discussion.
 
 NOTE the 3 switch mode selector on the back of the maXtouch.  All switches
 should be in the ON position to select 4-wire SPI mode.
@@ -863,6 +866,10 @@ in the OFF-ON-OFF positions to select 16-bit color mode.
   50   GND           -    -       Ground
   ---- ------------ ---- -------- -----------------------------------------------------------
 
+NOTE: Use of LCD/EXT4 conflicts with the Arduino RXD pin (PD28).  You cannot
+put the maXTouch Xplained in LCD/EXT4 and also use the Arduino RXD/TXD pins
+as your serial console.
+
 Connecting the flat cable.  I was embarrassed to say that I did not know how
 the connectors worked.  Let me share this so that, perhaps, I can save you
 the same embarrassment:
@@ -878,7 +885,6 @@ the same embarrassment:
   toward the board.  Lock the cable in place by pushing the tabs back in
   place.
 
-
 MXT Configuration Options
 -------------------------
 
diff --git a/nuttx/configs/samv71-xult/src/sam_ili9488.c b/nuttx/configs/samv71-xult/src/sam_ili9488.c
index 734b9794b1..8cfe62101a 100644
--- a/nuttx/configs/samv71-xult/src/sam_ili9488.c
+++ b/nuttx/configs/samv71-xult/src/sam_ili9488.c
@@ -129,6 +129,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/board.h>
 #include <nuttx/wdog.h>
 #include <nuttx/clock.h>
 #include <nuttx/lcd/lcd.h>
@@ -1541,7 +1542,7 @@ static inline int sam_lcd_initialize(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name:  up_lcdinitialize
+ * Name:  board_lcd_initialize
  *
  * Description:
  *   Initialize the LCD video hardware.  The initial state of the LCD is
@@ -1550,7 +1551,7 @@ static inline int sam_lcd_initialize(void)
  *
  ****************************************************************************/
 
-int up_lcdinitialize(void)
+int board_lcd_initialize(void)
 {
   FAR struct sam_dev_s *priv = &g_lcddev;
   int ret;
@@ -1628,7 +1629,7 @@ errout_with_waitsem:
 }
 
 /****************************************************************************
- * Name: up_lcdgetdev
+ * Name: board_lcd_getdev
  *
  * Description:
  *   Return a a reference to the LCD object for the specified LCD.  This
@@ -1636,21 +1637,21 @@ errout_with_waitsem:
  *
  ****************************************************************************/
 
-FAR struct lcd_dev_s *up_lcdgetdev(int lcddev)
+FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
 {
   DEBUGASSERT(lcddev == 0);
   return &g_lcddev.dev;
 }
 
 /****************************************************************************
- * Name:  up_lcduninitialize
+ * Name:  board_lcd_uninitialize
  *
  * Description:
  *   Uninitialize the LCD support
  *
  ****************************************************************************/
 
-void up_lcduninitialize(void)
+void board_lcd_uninitialize(void)
 {
   FAR struct sam_dev_s *priv = &g_lcddev;