Add basic LCD support

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1517 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 337 insertions, 73 deletions

diff --git a/nuttx/arch/sh/src/common/up_internal.h b/nuttx/arch/sh/src/common/up_internal.h
index fbd046ff3..27205c239 100644
--- a/nuttx/arch/sh/src/common/up_internal.h
+++ b/nuttx/arch/sh/src/common/up_internal.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/sh/src/common/up_internal.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -190,6 +190,16 @@ extern void up_ledoff(int led);
 # define up_ledoff(led)
 #endif
 
+/* Defined in board/up_lcd.c */
+
+#ifdef CONFIG_ARCH_LCD
+extern void up_lcdinit(void);
+extern void up_lcdputc(char ch);
+#else
+# define up_lcdinit()
+# define up_lcdputc(ch)
+#endif
+
 /* Defined in board/up_network.c */
 
 #ifdef CONFIG_NET
diff --git a/nuttx/arch/sh/src/m16c/m16c_lowputc.c b/nuttx/arch/sh/src/m16c/m16c_lowputc.c
index c08a0ec20..6c10a6468 100644
--- a/nuttx/arch/sh/src/m16c/m16c_lowputc.c
+++ b/nuttx/arch/sh/src/m16c/m16c_lowputc.c
@@ -49,12 +49,6 @@
 #include "up_internal.h"
 #include "m16c_uart.h"
 
-/* Is there any serial support?  This might be the case if the board does
- * not have serial ports but supports stdout through, say, an LCD.
- */
-
-#if !defined(CONFIG_UART0_DISABLE) && !defined(CONFIG_UART1_DISABLE) && !defined(CONFIG_UART2_DISABLE)
-
 /**************************************************************************
  * Private Definitions
  **************************************************************************/
@@ -65,26 +59,40 @@
 #  define M16C_XIN_PRESCALER 1
 #endif
 
-/* We know that we have a serial port enabled.  Is one of them a serial console? */
+/* Is there any serial support?  This might be the case if the board does
+ * not have serial ports but supports stdout through, say, an LCD.
+ */
+
+#if defined(CONFIG_UART0_DISABLE) || defined(CONFIG_UART1_DISABLE) || defined(CONFIG_UART2_DISABLE)
+#  define HAVE_SERIAL
+#else
+#  undef HAVE_SERIAL
+#endif
+
+/* Is one of the serial ports a console? */
 
 #if defined(CONFIG_UART0_SERIAL_CONSOLE) && !defined(CONFIG_UART0_DISABLE)
-#  define HAVE_CONSOLE 1
+#  define HAVE_SERIALCONSOLE 1
 #  undef CONFIG_UART1_SERIAL_CONSOLE
 #  undef CONFIG_UART2_SERIAL_CONSOLE
 #elif defined(CONFIG_UART1_SERIAL_CONSOLE) && !defined(CONFIG_UART1_DISABLE)
-#  define HAVE_CONSOLE 1
+#  define HAVE_SERIALCONSOLE 1
 #  undef CONFIG_UART0_SERIAL_CONSOLE
 #  undef CONFIG_UART2_SERIAL_CONSOLE
 #elif defined(CONFIG_UART2_SERIAL_CONSOLE) && !defined(CONFIG_UART2_DISABLE)
-#  define HAVE_CONSOLE 1
+#  define HAVE_SERIALCONSOLE 1
 #  undef CONFIG_UART0_SERIAL_CONSOLE
 #  undef CONFIG_UART1_SERIAL_CONSOLE
 #else
-#  undef HAVE_CONSOLE
+#  if defined(CONFIG_UART0_SERIAL_CONSOLE) || defined(CONFIG_UART1_SERIAL_CONSOLE)|| defined(CONFIG_UART2_SERIAL_CONSOLE)
+#    error "A serial console selected, but corresponding UART not enabled"
+#  endif
+#  undef HAVE_SERIALCONSOLE
 #endif
 
 /* Select UART parameters for the selected console */
 
+#ifdef HAVE_SERIALCONSOLE
 #if defined(CONFIG_UART0_SERIAL_CONSOLE)
 #  define M16C_UART_BASE     M16C_UART0_BASE
 #  define M16C_UART_BAUD     CONFIG_UART0_BAUD
@@ -155,6 +163,8 @@
 #define M16C_UART_BRG_VALUE \
 	((M16C_XIN_FREQ / (16 * M16C_XIN_PRESCALER * M16C_UART_BAUD)) - 1)
 
+#endif /* HAVE_SERIALCONSOLE */
+
 /**************************************************************************
  * Private Types
  **************************************************************************/
@@ -183,42 +193,17 @@
  *
  **************************************************************************/
 
-#ifdef HAVE_CONSOLE
+#ifdef HAVE_SERIALCONSOLE
 static inline int up_txready(void)
 {
   /* Check the TI bit in the CI register.  1=Transmit buffer empty */
 
   return ((getreg8(M16C_UART_BASE + M16C_UART_C1) & UART_C1_TI) != 0);
 }
-#endif
-
-/**************************************************************************
- * Public Functions
- **************************************************************************/
+#endif /* HAVE_SERIALCONSOLE */
 
 /**************************************************************************
- * Name: up_lowputc
- *
- * Description:
- *   Output one byte on the serial console
- *
- **************************************************************************/
-
-void up_lowputc(char ch)
-{
-#ifdef HAVE_CONSOLE
-  /* Wait until the transmit buffer is empty */
-
-  while (!up_txready());
-
-  /* Write the data to the transmit buffer */
-
-  putreg16((uint16)ch, M16C_UART_BASE + M16C_UART_TB);
-#endif
-}
-
-/**************************************************************************
- * Name: up_lowsetup
+ * Name: up_lowserialsetup
  *
  * Description:
  *   This performs basic initialization of the UART used for the serial
@@ -227,9 +212,9 @@ void up_lowputc(char ch)
  *
  **************************************************************************/
 
-void up_lowsetup(void)
+#if defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
+static inline void up_lowserialsetup(void)
 {
-#if defined(HAVE_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
   ubyte regval;
 
   /* Set the baud rate generator */
@@ -292,10 +277,61 @@ void up_lowsetup(void)
   /* Read any data left in the RX fifo */
 
   regval = (ubyte)getreg16(M16C_UART_BASE + M16C_UART_RB);
+}
+#endif /* HAVE_SERIALCONFIG && !CONFIG_SUPPRESS_UART_CONFIG */
+
+/**************************************************************************
+ * Public Functions
+ **************************************************************************/
+
+/**************************************************************************
+ * Name: up_lowputc
+ *
+ * Description:
+ *   Output one byte on the serial console.
+ *
+ **************************************************************************/
+
+#ifdef HAVE_SERIAL  /* Assume needed if we have serial. See for e.g., up_lcd.c */
+void up_lowputc(char ch)
+{
+#ifdef HAVE_SERIALCONSOLE
+  /* Wait until the transmit buffer is empty */
+
+  while (!up_txready());
+
+  /* Write the data to the transmit buffer */
+
+  putreg16((uint16)ch, M16C_UART_BASE + M16C_UART_TB);
 #endif
 }
+#endif
 
-#elif defined(CONFIG_UART0_SERIAL_CONSOLE) || defined(CONFIG_UART1_SERIAL_CONSOLE)|| defined(CONFIG_UART2_SERIAL_CONSOLE)
-#    error "A serial console selected, but corresponding UART not enabled"
-#endif /*  !CONFIG_UART0_DISABLE && !CONFIG_UART1_DISABLE && !CONFIG_UART2_DISABLE */
+/**************************************************************************
+ * Name: up_lowsetup
+ *
+ * Description:
+ *   This performs basic initialization of the UART used for the serial
+ *   console.  Its purpose is to get the console output availabe as soon
+ *   as possible.
+ *
+ **************************************************************************/
+
+void up_lowsetup(void)
+{
+  /* Here we initialize the serial console early so that it can be used
+   * for bring-up debugging.
+   */
 
+#if defined(HAVE_SERIALCONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
+  up_lowserialsetup()
+#endif
+
+  /* The LCD is initialized here to because it may be that the LCD is
+   * used for console output.
+   */
+
+#ifdef CONFIG_ARCH_LCD
+  up_lcdinit();
+#endif
+}
diff --git a/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig
index 709dec764..c47819136 100644
--- a/nuttx/configs/skp16c26/ostest/defconfig
+++ b/nuttx/configs/skp16c26/ostest/defconfig
@@ -59,7 +59,9 @@
 #   stack in bytes.  If not defined, the user task stacks will be
 #   used during interrupt handling.
 # CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
-#
+# CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to skp16c26.
+# CONFIG_ARCH_LCD - Configure LCD.  Unique to skp16c26.
+
 CONFIG_ARCH=sh
 CONFIG_ARCH_SH=y
 CONFIG_ARCH_CHIP=m16c
@@ -74,6 +76,8 @@ CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
 CONFIG_BOARD_LOOPSPERMSEC=16945
 CONFIG_ARCH_INTERRUPTSTACK=128
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_LEDS=n
+CONFIG_ARCH_LCD=y
 
 #
 # M16C specific device driver settings
diff --git a/nuttx/configs/skp16c26/src/Makefile b/nuttx/configs/skp16c26/src/Makefile
index ba3f5c5ff..5a983a2f7 100644
--- a/nuttx/configs/skp16c26/src/Makefile
+++ b/nuttx/configs/skp16c26/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
-CSRCS		= up_leds.c up_buttons.c up_lcdconsole.c
+CSRCS		= up_leds.c up_buttons.c up_lcd.c up_lcdconsole.c
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
diff --git a/nuttx/configs/skp16c26/src/up_lcd.c b/nuttx/configs/skp16c26/src/up_lcd.c
new file mode 100644
index 000000000..81844018d
--- /dev/null
+++ b/nuttx/configs/skp16c26/src/up_lcd.c
@@ -0,0 +1,226 @@
+/************************************************************************************
+ * configs/scp16c26/src/up_lcd.c
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+#include "up_arch.h"
+#include "up_internal.h"
+#include "chip.h"
+
+#ifdef CONFIG_ARCH_LCD
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* LCD commands *********************************************************************/
+
+#define LCD_CLEAR        0x01    /* Clear LCD display and home cursor */
+#define LCD_HOME_L1      0x80    /* move cursor to line 1 */
+#define LCD_HOME_L2      0xc0    /* move cursor to line 2 */
+#define CURSOR_MODE_DEC  0x04    /* Cursor auto decrement after R/W */
+#define CURSOR_MODE_INC  0x06    /* Cursor auto increment after R/W */
+#define FUNCTION_SET     0x28    /* Setup, 4 bits,2 lines, 5X7 */
+#define LCD_CURSOR_ON    0x0e    /* Display ON with Cursor */
+#define LCD_CURSOR_OFF   0x0c    /* Display ON with Cursor off */
+#define LCD_CURSOR_BLINK 0x0d    /* Display on with blinking cursor */
+#define LCD_CURSOR_LEFT  0x10    /* Move Cursor Left One Position */
+#define LCD_CURSOR_RIGHT 0x14    /* Move Cursor Right One Position */
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: up_lcddelay
+ ************************************************************************************/
+
+static void up_lcddelay(uint16 count)
+{
+  uint32 counter = (uint16)count << 8;
+  while(counter--)
+    {
+      asm("\tnop\n\tnop\n\tnop\n" : :); /* 3 NOPs */
+    }
+}
+
+/************************************************************************************
+ * Name: up_setrs
+ ************************************************************************************/
+
+static inline void up_setrs(boolean data)
+{
+  /* Set/clear bit 1 of port 6 */
+
+  register ubyte regval = getreg8(M16C_P6);
+  if (data)
+    {
+      regval |= (1 << 0);  /* High = data */
+    }
+  else
+    {
+      regval &= ~(1 << 0); /* Low = control */
+    }
+  putreg8(regval, M16C_P6);
+}
+
+/************************************************************************************
+ * Name: up_seten
+ ************************************************************************************/
+
+static inline void up_seten(void)
+{
+  /* Set bit 1 of port 6 */
+
+  register ubyte regval = getreg8(M16C_P6);
+  regval = (1 << 1);
+  putreg8(regval, M16C_P6);
+}
+
+/************************************************************************************
+ * Name: up_clren
+ ************************************************************************************/
+
+static inline void up_clren(void)
+{
+  /* Clear bit 1 of port 6 */
+
+  register ubyte regval = getreg8(M16C_P6);
+  regval &= ~(1 << 1);
+  putreg8(regval, M16C_P6);
+}
+
+/************************************************************************************
+ * Name: up_enpluse
+ ************************************************************************************/
+
+static inline void up_enpulse(boolean data)
+{
+  up_seten();                 /* EN enable chip (HIGH) */
+  up_lcddelay(0);             /* Short delay */
+  up_clren();                 /* Latch data by setting EN low */
+  up_lcddelay(0);             /* Short delay for data writes */
+  if (!data) up_lcddelay(0);  /* Longer delay for control writes */
+}
+
+/************************************************************************************
+ * Name: up_lcdwrite
+ ************************************************************************************/
+
+void up_lcdwrite(boolean data, ubyte ch)
+{
+  up_setrs(data);				/* Set RS appropriately */
+
+  /* Write upper nibble first.  Only the lower 4 bits of P9 are valid.  The upper four
+   * bits are reserved and must be zero.
+   */
+
+  putreg8(ch >> 4, M16C_P9);
+  up_enpulse(data);
+
+  /* Write lower nibble second */
+
+  putreg8(ch & 0x0f, M16C_P9);
+  up_enpulse(data);
+}
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: up_lcdinit
+ ************************************************************************************/
+
+void up_lcdinit(void)
+{
+  ubyte regval;
+
+  /* Enable writing to PD9 by selecting bit 2 in the protection register */
+
+  regval = getreg8(M16C_PRCR);
+  regval |= (1 << 2);
+  putreg8(regval, M16C_PRCR);
+
+  /* We can't read PD9, so we can't OR the values in */
+
+  putreg8(0x0f, M16C_PD9);
+
+  /* Set EN (port 6 bit 1) and Set RS (port 6 bit 0) as outputs */
+
+  regval = getreg8(M16C_P6);
+  regval |= (1 << 1) | (1 << 0);
+  putreg8(regval, M16C_P6);
+
+  regval = getreg8(M16C_PD6);
+  regval |= (1 << 1) | (1 << 0);
+  putreg8(regval, M16C_PD6);
+
+  /* Set EN low */
+
+  up_clren();
+
+  /* Write the reset sequence */
+
+  up_lcdwrite(FALSE, 0x33);
+  up_lcddelay(20);
+  up_lcdwrite(FALSE, 0x32);
+  up_lcddelay(20);
+  up_lcdwrite(FALSE, FUNCTION_SET);	/* reset sequence */
+  up_lcdwrite(FALSE, FUNCTION_SET);
+  up_lcdwrite(FALSE, LCD_CURSOR_OFF);
+  up_lcdwrite(FALSE, LCD_CLEAR);
+  up_lcdwrite(FALSE, LCD_HOME_L1);
+}
+
+/************************************************************************************
+ * Name: up_lcdputc
+ ************************************************************************************/
+
+void up_lcdputc(char ch)
+{
+  up_lcdwrite(TRUE, ch);
+}
+
+#endif /* CONFIG_ARCH_LCD */
diff --git a/nuttx/configs/skp16c26/src/up_lcdconsole.c b/nuttx/configs/skp16c26/src/up_lcdconsole.c
index d5786a9ed..544d2ea38 100644
--- a/nuttx/configs/skp16c26/src/up_lcdconsole.c
+++ b/nuttx/configs/skp16c26/src/up_lcdconsole.c
@@ -56,7 +56,7 @@
 #  undef HAVE_SERIALCONSOLE
 #endif
 
-#ifndef HAVE_SERIALCONSOLE
+#if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_ARCH_LCD)
 
 /************************************************************************************
  * Definitions
@@ -71,24 +71,10 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Public Funtions
+ * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_lowsetup
- *
- * Description:
- *   This performs basic initialization of the hardware used for the console.
- *   Its purpose is to get the console output availabe as soon as possible.
- *
- ************************************************************************************/
-
-void up_lowsetup(void)
-{
-#	warning "To be provided"
-}
-
-/************************************************************************************
  * Name: up_earlyconsoleinit
  *
  * Description:
@@ -98,10 +84,11 @@ void up_lowsetup(void)
  *
  ************************************************************************************/
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DEV_LOWCONSOLE)
+#ifdef CONFIG_USE_EARLYSERIALINIT
+# warning "You probably need to define CONFIG_ARCH_LOWCONSOLE"
 void up_earlyconsoleinit(void)
 {
-  /* In this context, up_earlyconsoleinit does not need to do anything. */
+  /* There is probably a problem if we are here */
 }
 #endif
 
@@ -114,10 +101,13 @@ void up_earlyconsoleinit(void)
  *
  ************************************************************************************/
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DEV_LOWCONSOLE)
+#if CONFIG_USE_SERIALDRIVER
+# warning "You probably need to define CONFIG_ARCH_LOWCONSOLE"
 void up_consoleinit(void)
 {
-  /* In this context, up_earlyconsoleinit does not need to do anything. */
+  /* There is probably a problem if we are here */
+
+   lowconsole_init();
 }
 #endif
 
@@ -131,7 +121,7 @@ void up_consoleinit(void)
 
 void up_lowputc(char ch)
 {
-#	warning "To be provided"
+  up_lcdputc(ch);
 }
 
 /************************************************************************************
@@ -144,10 +134,8 @@ void up_lowputc(char ch)
 
 int up_putc(int ch)
 {
-  /* Same as up_lowputc in this context */
-
-  up_lowputc(ch);
+  up_lcdputc(ch);
   return ch;
 }
 
-#endif /* HAVE_SERIALCONSOLE */
+#endif /* !HAVE_SERIALCONSOLE && CONFIG_ARCH_LCD */
diff --git a/nuttx/configs/skp16c26/src/up_leds.c b/nuttx/configs/skp16c26/src/up_leds.c
index a018727b0..a34b47756 100644
--- a/nuttx/configs/skp16c26/src/up_leds.c
+++ b/nuttx/configs/skp16c26/src/up_leds.c
@@ -54,7 +54,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Public Funtions
+ * Public Functions
  ************************************************************************************/
 
 /************************************************************************************