2010-12-03 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* include/lcd.h, misc/lcd.c: New files.
	* misc/io.c, include/io.h: Documentation, bug fixes, more
	configurations.
	* include/lpc24xx.h: Added DAC and I2S.
	* Makefile.am, bsp_specs, preinstall.am, startup/bspstarthooks.c,
	startup/linkcmds.lpc2362, startup/linkcmds.lpc23xx_tli800,
	startup/linkcmds.lpc24xx_ea, startup/linkcmds.lpc24xx_ncs_ram,
	startup/linkcmds.lpc24xx_ncs_rom_ext,
	startup/linkcmds.lpc24xx_ncs_rom_int: Update due to linker command
	file changes.

3 files changed, 165 insertions, 0 deletions

diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/io.h b/c/src/lib/libbsp/arm/lpc24xx/include/io.h
index a29cf44357..6d19eb1c05 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/io.h
+++ b/c/src/lib/libbsp/arm/lpc24xx/include/io.h
@@ -37,6 +37,65 @@ extern "C" {
  *
  * @brief Input and output module.
  *
+ * <table>
+ *   <tr><th>Module</th><th>Configuration</th><th>First Pin</th><th>Last Pin</th></tr>
+ *   <tr><td>UART 0</td><td>0</td><td>P0.2</td><td>P0.3</td></tr>
+ *   <tr><td rowspan=3>UART 1</td><td>0</td><td>P0.15</td><td>P0.16</td></tr>
+ *   <tr><td>1</td><td>P2.0</td><td>P2.1</td></tr>
+ *   <tr><td>2</td><td>P3.16</td><td>P3.17</td></tr>
+ *   <tr><td rowspan=3>UART 2</td><td>0</td><td>P0.10</td><td>P0.11</td></tr>
+ *   <tr><td>1</td><td>P2.8</td><td>P2.9</td></tr>
+ *   <tr><td>2</td><td>P4.22</td><td>P4.23</td></tr>
+ *   <tr><td rowspan=3>UART 3</td><td>0</td><td>P0.0</td><td>P0.1</td></tr>
+ *   <tr><td>1</td><td>P0.25</td><td>P0.26</td></tr>
+ *   <tr><td>2</td><td>P4.28</td><td>P4.29</td></tr>
+ *   <tr><td rowspan=5>ETHERNET</td><td>0</td><td>P1.0</td><td>P1.17</td></tr>
+ *   <tr><td rowspan=4>1</td><td>P1.0</td><td>P1.1</td></tr>
+ *   <tr><td>P1.4</td><td>P1.4</td></tr>
+ *   <tr><td>P1.8</td><td>P1.10</td></tr>
+ *   <tr><td>P1.14</td><td>P1.17</td></tr>
+ *   <tr><td rowspan=4>ADC</td><td>0</td><td>P0.12</td><td>P0.13</td></tr>
+ *   <tr><td>1</td><td>P0.23</td><td>P0.25</td></tr>
+ *   <tr><td rowspan=2>2</td><td>P0.26</td><td>P0.26</td></tr>
+ *   <tr><td>P1.30</td><td>P1.31</td></tr>
+ *   <tr><td>I2C 0</td><td>0</td><td>P0.27</td><td>P0.28</td></tr>
+ *   <tr><td rowspan=3>I2C 1</td><td>0</td><td>P0.0</td><td>P0.1</td></tr>
+ *   <tr><td>1</td><td>P0.19</td><td>P0.20</td></tr>
+ *   <tr><td>2</td><td>P2.14</td><td>P2.15</td></tr>
+ *   <tr><td rowspan=3>I2C 2</td><td>0</td><td>P0.10</td><td>P0.11</td></tr>
+ *   <tr><td>1</td><td>P2.30</td><td>P2.31</td></tr>
+ *   <tr><td>2</td><td>P4.20</td><td>P4.21</td></tr>
+ *   <tr><td rowspan=3>I2S</td><td>0</td><td>P0.4</td><td>P0.9</td></tr>
+ *   <tr><td rowspan=2>1</td><td>P0.23</td><td>P0.25</td></tr>
+ *   <tr><td>P2.11</td><td>P2.13</td></tr>
+ *   <tr><td rowspan=5>SSP 0</td><td>0</td><td>P0.15</td><td>P0.18</td></tr>
+ *   <tr><td rowspan=2>1</td><td>P1.20</td><td>P0.21</td></tr>
+ *   <tr><td>P1.23</td><td>P0.24</td></tr>
+ *   <tr><td rowspan=2>2</td><td>P2.22</td><td>P2.23</td></tr>
+ *   <tr><td>P2.26</td><td>P2.27</td></tr>
+ *   <tr><td rowspan=5>SSP 1</td><td>0</td><td>P0.6</td><td>P0.9</td></tr>
+ *   <tr><td rowspan=3>1</td><td>P0.12</td><td>P0.13</td></tr>
+ *   <tr><td>P0.14</td><td>P0.14</td></tr>
+ *   <tr><td>P1.31</td><td>P1.31</td></tr>
+ *   <tr><td>2</td><td>P4.20</td><td>P4.23</td></tr>
+ *   <tr><td rowspan=2>USB</td><td rowspan=2>0</td><td>P0.29</td><td>P0.30</td></tr>
+ *   <tr><td>P1.19</td><td>P1.19</td></tr>
+ *   <tr><td>SPI</td><td>0</td><td>P0.15</td><td>P0.18</td></tr>
+ *   <tr><td>PWM 1</td><td>0</td><td>P2.0</td><td>P2.0</td></tr>
+ *   <tr><td rowspan=11>LCD</td><td rowspan=6>0</td><td>P0.4</td><td>P0.9</td></tr>
+ *   <tr><td>P1.20</td><td>P1.29</td></tr>
+ *   <tr><td>P2.0</td><td>P2.3</td></tr>
+ *   <tr><td>P2.5</td><td>P2.9</td></tr>
+ *   <tr><td>P2.12</td><td>P2.13</td></tr>
+ *   <tr><td>P4.28</td><td>P4.29</td></tr>
+ *   <tr><td rowspan=5>1</td><td>P1.20</td><td>P1.29</td></tr>
+ *   <tr><td>P2.0</td><td>P2.3</td></tr>
+ *   <tr><td>P2.5</td><td>P2.9</td></tr>
+ *   <tr><td>P2.12</td><td>P2.13</td></tr>
+ *   <tr><td>P4.28</td><td>P4.29</td></tr>
+ *   <tr><td>DAC</td><td>0</td><td>P0.26</td><td>P0.26</td></tr>
+ * </table>
+ *
  * @{
  */
 
@@ -123,11 +182,28 @@ rtems_status_code lpc24xx_module_disable(
   lpc24xx_module module
 );
 
+/**
+ * @brief Applies the configuration with index @a config for the @a module.
+ *
+ * The pin mode will not be altered.
+ *
+ * @retval RTEMS_SUCCESSFUL Successful operation.
+ * @retval RTEMS_INVALID_ID Invalid module or configuration.
+ */
 rtems_status_code lpc24xx_io_config(
   lpc24xx_module module,
   unsigned config
 );
 
+/**
+ * @brief Releases the configuration with index @a config for the @a module.
+ *
+ * The pins are set to general purpose IO function.  The pin mode will not be
+ * altered.
+ *
+ * @retval RTEMS_SUCCESSFUL Successful operation.
+ * @retval RTEMS_INVALID_ID Invalid module or configuration.
+ */
 rtems_status_code lpc24xx_io_release(
   lpc24xx_module module,
   unsigned config
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lcd.h b/c/src/lib/libbsp/arm/lpc24xx/include/lcd.h
new file mode 100644
index 0000000000..7a0a986259
--- /dev/null
+++ b/c/src/lib/libbsp/arm/lpc24xx/include/lcd.h
@@ -0,0 +1,77 @@
+/**
+ * @file
+ *
+ * @ingroup lpc24xx_lcd
+ *
+ * @brief LCD support.
+ */
+
+/*
+ * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Obere Lagerstr. 30
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ */
+
+#ifndef LIBBSP_ARM_LPC24XX_LCD_H
+#define LIBBSP_ARM_LPC24XX_LCD_H
+
+#include <rtems.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @defgroup lpc_dma LCD Support
+ *
+ * @ingroup lpc24xx
+ *
+ * @brief LCD support.
+ *
+ * @{
+ */
+
+typedef enum {
+  LCD_MODE_STN_4_BIT = 0,
+  LCD_MODE_STN_8_BIT,
+  LCD_MODE_STN_DUAL_PANEL_4_BIT,
+  LCD_MODE_STN_DUAL_PANEL_8_BIT,
+  LCD_MODE_TFT_12_BIT_4_4_4,
+  LCD_MODE_TFT_16_BIT_5_6_5,
+  LCD_MODE_TFT_16_BIT_1_5_5_5,
+  LCD_MODE_TFT_24_BIT,
+  LCD_MODE_DISABLED
+} lpc24xx_lcd_mode;
+
+/**
+ * @brief Set the LCD @a mode.
+ *
+ * The pins are configured according to the @a pin_config.
+ *
+ * @see lpc24xx_io_config() and lpc24xx_io_release().
+ *
+ * @retval RTEMS_SUCCESSFUL Successful operation.
+ * @retval RTEMS_IO_ERROR Invalid mode.
+ */
+rtems_status_code lpc24xx_lcd_set_mode(
+  lpc24xx_lcd_mode mode,
+  unsigned pin_config
+);
+
+lpc24xx_lcd_mode lpc24xx_lcd_current_mode(void);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* LIBBSP_ARM_LPC24XX_LCD_H */
diff --git a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h b/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h
index 8fddb3f8f8..fa92d28315 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h
+++ b/c/src/lib/libbsp/arm/lpc24xx/include/lpc24xx.h
@@ -22,6 +22,8 @@
 #define LIBBSP_ARM_LPC24XX_LPC24XX_H
 
 #include <stdint.h>
+#include <bsp/utility.h>
+#include <bsp/lpc-i2s.h>
 
 /**
  * @defgroup lpc24xx_regs Register Definitions
@@ -1980,6 +1982,16 @@ typedef struct {
 #define PCONP_ETHERNET (1U << 30)
 #define PCONP_USB (1U << 31)
 
+/* I2S */
+
+static volatile lpc_i2s *const lpc24xx_i2s = (lpc_i2s *) I2S_BASE_ADDR;
+
+/* DAC */
+
+#define DAC_STEPS 1024
+#define DAC_VALUE(val) BSP_FLD32(val, 6, 15)
+#define DAC_BIAS BSP_BIT32(16)
+
 /** @} */
 
 #endif /* LIBBSP_ARM_LPC24XX_LPC24XX_H */