summaryrefslogtreecommitdiff
path: root/nuttx/drivers/lcd
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-05-11 02:41:08 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-05-11 02:41:08 +0000
commit9087e891c87e6ea92b2f6c290164630fb59fea60 (patch)
treee94cbab87a8a4d9401ac4938646486e04ecdf76a /nuttx/drivers/lcd
parent85b8f6e81a0fe8ef1a13816a8777fd1392f00669 (diff)
downloadpx4-nuttx-9087e891c87e6ea92b2f6c290164630fb59fea60.tar.gz
px4-nuttx-9087e891c87e6ea92b2f6c290164630fb59fea60.tar.bz2
px4-nuttx-9087e891c87e6ea92b2f6c290164630fb59fea60.zip
Oops last version was still in editor
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2663 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/lcd')
-rwxr-xr-xnuttx/drivers/lcd/skeleton.c778
1 files changed, 69 insertions, 709 deletions
diff --git a/nuttx/drivers/lcd/skeleton.c b/nuttx/drivers/lcd/skeleton.c
index 971d8d885..b42d7f869 100755
--- a/nuttx/drivers/lcd/skeleton.c
+++ b/nuttx/drivers/lcd/skeleton.c
@@ -1,6 +1,5 @@
/**************************************************************************************
- * configs/sam3u-ek/src/up_lcd.c
- * arch/arm/src/board/up_lcd.c
+ * drivers/lcd/skeleton.c
*
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -35,77 +34,6 @@
**************************************************************************************/
/**************************************************************************************
- * The SAM3U-EK developement board features a TFT/Transmissive color LCD module with
- * touch-screen, FTM280C12D, with integratd driver IC HX8346. The LCD display size
- * is 2.8 inches, with a native resolution of 240 x 320 pixels.
- *
- * LCD Module Pin Out: AT91SAM3U PIO:
- * -------------------------------------------- --------------------------------------
- * Pin Symbol Function LCD PeriphA PeriphB Extra
- * ---- ------ -------------------------------- -------------- -------- ------- ------
- * 1 GND Ground N/A --- --- ---
- * 2 CS Chip Select PC16 NCS2 PWML3 AD12BAD5
- * 3 RS Register select signal PB8 (see A1) CTS0 A1 AD3
- * 4 WR Write operation signal PB23 (NWE) NWR0/NEW PCK1 ---
- * 5 RD Read operation signal PB19 (NRD) NRD PWML2 ---
- * 6 DB0 Data bus PB9 D0 DTR0 ---
- * 7 DB1 Data bus PB10 D1 DSR0 ---
- * 8 DB2 Data bus PB11 D2 DCD0 ---
- * 9 DB3 Data bus PB12 D3 RI0 ---
- * 10 DB4 Data bus PB13 D4 PWMH0 ---
- * 11 DB5 Data bus PB14 D5 PWMH1 ---
- * 12 DB6 Data bus PB15 D6 PWMH2 ---
- * 13 DB7 Data bus PB16 D7 PMWH3 ---
- * 14 DB8 Data bus PB25 D8 PWML0 ---
- * 15 DB9 Data bus PB26 D9 PWML1 ---
- * 16 DB10 Data bus PB27 D10 PWML2 ---
- * 17 DB11 Data bus PB28 D11 PWML3 ---
- * 18 DB12 Data bus PB29 D12 --- ---
- * 19 DB13 Data bus PB30 D13 --- ---
- * 20 DB14 Data bus PB31 D14 --- ---
- * 21 DB15 Data bus PB6 TIOA1 D15 AD1
- * 22 NC No connection N/A --- --- ---
- * 23 NC No connection N/A --- --- ---
- * 24 RESET Reset signal N/A --- --- ---
- * 25 GND Ground N/A --- --- ---
- * 26 X+ Touch panel X_RIGHT PA15 SPCK PWMH2 ---
- * 27 Y+ Touch panel Y_UP PA14 MOSI --- ---
- * 28 X- Touch panel X_LEFT PA13 MISO --- ---
- * 29 Y- Touch panel Y_DOWN PC14 A3 NPCS2 ---
- * 30 GND Ground N/A --- --- ---
- * 31 VDD1 Power supply for digital IO Pad N/A --- --- ---
- * 32 VDD2 Power supply for analog circuit N/A --- --- ---
- * 33 A1 Power supply for backlight PB8 (see RS) CTS0 A1 AD3
- * 34 A2 Power supply for backlight N/A --- --- ---
- * 35 A3 Power supply for backlight N/A --- --- ---
- * 36 A4 Power supply for backlight N/A --- --- ---
- * 37 NC No connection N/A --- --- ---
- * 38 NC No connection N/A --- --- ---
- * 39 K Backlight ground N/A --- --- ---
- *
- * The LCD module gets its reset from NRST. As explained previously, this NRST is
- * shared with the JTAG port and the push button BP1. The LCD chip select signal is
- * connected to NCS2 (a dedicated jumper can disable it, making NCS2 available for
- * other custom usage).
- *
- * The SAM3U4E communicates with the LCD through PIOB where a 16-bit parallel
- * “8080-like” protocol data bus has to be implemented by software.
- *
- * LCD backlight is made of 4 white chip LEDs in parallel, driven by an AAT3194
- * charge pump, MN4. The AAT3194 is controlled by the SAM3U4E through a single line
- * Simple Serial Control (S2Cwire) interface, which permits to enable, disable, and
- * set the LED drive current (LED brightness control) from a 32-level logarithmic
- * scale. Four resistors R93/R94/R95/R96 are implemented for optional current
- * limitation.
- *
- * The LCD module integrates a 4-wire touch screen panel controlled by
- * MN5, ADS7843, which is a slave device on the SAM3U4E SPI bus. The ADS7843 touch
- * ADC auxiliary inputs IN3/IN4 are connected to test points for optional function
- * extension.
- *
- **************************************************************************************/
-
-/**************************************************************************************
* Included Files
**************************************************************************************/
@@ -120,25 +48,21 @@
#include <nuttx/arch.h>
#include <nuttx/lcd.h>
-#include <nuttx/rgbcolors.h>
#include <arch/irq.h>
#include "up_arch.h"
-#include "sam3u_pmc.h"
-#include "sam3u_smc.h"
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
/**************************************************************************************
* Pre-processor Definitions
**************************************************************************************/
/* Configuration **********************************************************************/
+/* Verify that all configuration requirements have been met */
/* Define the following to enable register-level debug output */
-#undef CONFIG_LCD_REGDEBUG
+#undef CONFIG_LCD_SKELDEBUG
/* Verbose debug must also be enabled */
@@ -148,193 +72,60 @@
#endif
#ifndef CONFIG_DEBUG_VERBOSE
-# undef CONFIG_LCD_REGDEBUG
+# undef CONFIG_LCD_SKELDEBUG
#endif
-/* CONFIG_LCD_MAXCONTRAST -- must be defined and less than 32 */
+/* Color Properties *******************************************************************/
-#if !defined(CONFIG_LCD_MAXCONTRAST) || CONFIG_LCD_MAXCONTRAST < 1 || CONFIG_LCD_MAXCONTRAST > 31
-# error "CONFIG_LCD_MAXCONTRAST must be defined in the range 1 to 31"
-#endif
+/* Display Resolution */
-/* Debug ******************************************************************************/
+#define SKEL_XRES 320
+#define SKEL_YRES 240
-#ifdef CONFIG_LCD_REGDEBUG
-# define regdbg(format, arg...) vdbg(format, ##arg)
-#else
-# define regdbg(x...)
-#endif
+/* Color depth and format */
-/* Graphics Capbilities ***************************************************************/
+#define SKEL_BPP 16
+#define SKEL_COLORFMT FB_FMT_RGB16_565
-/* LCD resolution: 320 (columns) by 240 (rows). The physical dimensions of the device
- * are really 240 (columns) by 320 (rows), but unless CONFIG_SAM3U_240x320 is defined,
- * we swap rows and columns in setcursor to make things behave nicer (there IS a
- * performance hit for this swap!).
- */
+/* Debug ******************************************************************************/
-#ifdef CONFIG_SAM3U_240x320
-# define SAM3UEK_XRES 240
-# define SAM3UEK_YRES 320
+#ifdef CONFIG_LCD_SKELDEBUG
+# define skeldbg(format, arg...) vdbg(format, ##arg)
#else
-# define SAM3UEK_XRES 320
-# define SAM3UEK_YRES 240
+# define skeldbg(x...)
#endif
-/* Color depth and format. BPP=16 R=6, G=6, B=5: RRRR RBBB BBBG GGGG */
-
-#define SAM3UEK_BPP 16
-#define SAM3UEK_RGBFMT FB_FMT_RGB16_565
-
-/* HX834x Definitions ****************************************************************/
-
-/* HX834x register select */
-
-#define HX843X_LCD_RS (1 << 1)
-
-/* HX8347 ID code */
-
-#define HX8347_CHIPID 0x47
-
-/* HX8347 LCD Registers */
-
-#define HX8347_R00H 0x00
-#define HX8347_R01H 0x01
-#define HX8347_R02H 0x02
-#define HX8347_R03H 0x03
-#define HX8347_R04H 0x04
-#define HX8347_R05H 0x05
-#define HX8347_R06H 0x06
-#define HX8347_R07H 0x07
-#define HX8347_R08H 0x08
-#define HX8347_R09H 0x09
-#define HX8347_R0AH 0x0a
-#define HX8347_R0CH 0x0c
-#define HX8347_R0DH 0x0d
-#define HX8347_R0EH 0x0e
-#define HX8347_R0FH 0x0f
-#define HX8347_R10H 0x10
-#define HX8347_R11H 0x11
-#define HX8347_R12H 0x12
-#define HX8347_R13H 0x13
-#define HX8347_R14H 0x14
-#define HX8347_R15H 0x15
-#define HX8347_R16H 0x16
-#define HX8347_R18H 0x18
-#define HX8347_R19H 0x19
-#define HX8347_R1AH 0x1a
-#define HX8347_R1BH 0x1b
-#define HX8347_R1CH 0x1c
-#define HX8347_R1DH 0x1d
-#define HX8347_R1EH 0x1e
-#define HX8347_R1FH 0x1f
-#define HX8347_R20H 0x20
-#define HX8347_R21H 0x21
-#define HX8347_R22H 0x22
-#define HX8347_R23H 0x23
-#define HX8347_R24H 0x24
-#define HX8347_R25H 0x25
-#define HX8347_R26H 0x26
-#define HX8347_R27H 0x27
-#define HX8347_R28H 0x28
-#define HX8347_R29H 0x29
-#define HX8347_R2AH 0x2a
-#define HX8347_R2BH 0x2b
-#define HX8347_R2CH 0x2c
-#define HX8347_R2DH 0x2d
-#define HX8347_R35H 0x35
-#define HX8347_R36H 0x36
-#define HX8347_R37H 0x37
-#define HX8347_R38H 0x38
-#define HX8347_R39H 0x39
-#define HX8347_R3AH 0x3a
-#define HX8347_R3BH 0x3b
-#define HX8347_R3CH 0x3c
-#define HX8347_R3DH 0x3d
-#define HX8347_R3EH 0x3e
-#define HX8347_R40H 0x40
-#define HX8347_R41H 0x41
-#define HX8347_R42H 0x42
-#define HX8347_R43H 0x43
-#define HX8347_R44H 0x44
-#define HX8347_R45H 0x45
-#define HX8347_R46H 0x46
-#define HX8347_R47H 0x47
-#define HX8347_R48H 0x48
-#define HX8347_R49H 0x49
-#define HX8347_R4AH 0x4a
-#define HX8347_R4BH 0x4b
-#define HX8347_R4CH 0x4c
-#define HX8347_R4DH 0x4d
-#define HX8347_R4EH 0x4e
-#define HX8347_R4FH 0x4f
-#define HX8347_R50H 0x50
-#define HX8347_R51H 0x51
-#define HX8347_R64H 0x64
-#define HX8347_R65H 0x65
-#define HX8347_R66H 0x66
-#define HX8347_R67H 0x67
-#define HX8347_R70H 0x70
-#define HX8347_R72H 0x72
-#define HX8347_R90H 0x90
-#define HX8347_R91H 0x91
-#define HX8347_R93H 0x93
-#define HX8347_R94H 0x94
-#define HX8347_R95H 0x95
-
/**************************************************************************************
* Private Type Definition
**************************************************************************************/
/* This structure describes the state of this driver */
-struct sam3u_dev_s
+struct skel_dev_s
{
/* Publically visible device structure */
struct lcd_dev_s dev;
- /* Private device state */
-
- uint8_t power; /* The current power setting */
+ /* Private LCD-specific information follows */
};
/**************************************************************************************
* Private Function Protototypes
**************************************************************************************/
-/* Low-level HX834x Register access */
-
-static void sam3u_putreg(uint16_t reg, uint16_t data);
-static uint16_t sam3u_getreg(uint16_t reg);
-
-/* Misc. LCD Helper Functions */
-
-static void sam3u_setcursor(fb_coord_t row, fb_coord_t col);
-static inline void sam3u_wrsetup(void);
-static inline void sam3u_wrram(uint16_t color);
-static inline uint16_t sam3u_rdram(void);
-static void sam3u_lcdon(void);
-static void sam3u_lcdoff(void);
-
-#ifdef CONFIG_DEBUG_GRAPHICS
-static void sam3u_dumpreg(uint8_t startreg, uint8_t endreg);
-#else
-# define sam3u_dumpreg(startreg,endreg)
-#endif
-
/* LCD Data Transfer Methods */
-static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
+static int skel_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
size_t npixels);
-static int sam3u_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
+static int skel_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
size_t npixels);
/* LCD Configuration */
-static int sam3u_getvideoinfo(FAR struct lcd_dev_s *dev,
+static int skel_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo);
-static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
+static int skel_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo);
/* LCD RGB Mapping */
@@ -351,10 +142,10 @@ static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
/* LCD Specific Controls */
-static int sam3u_getpower(struct lcd_dev_s *dev);
-static int sam3u_setpower(struct lcd_dev_s *dev, int power);
-static int sam3u_getcontrast(struct lcd_dev_s *dev);
-static int sam3u_setcontrast(struct lcd_dev_s *dev, unsigned int contrast);
+static int skel_getpower(struct lcd_dev_s *dev);
+static int skel_setpower(struct lcd_dev_s *dev, int power);
+static int skel_getcontrast(struct lcd_dev_s *dev);
+static int skel_setcontrast(struct lcd_dev_s *dev, unsigned int contrast);
/**************************************************************************************
* Private Data
@@ -371,48 +162,48 @@ static int sam3u_setcontrast(struct lcd_dev_s *dev, unsigned int contrast);
* if there are multiple LCD devices, they must each have unique run buffers.
*/
-static uint16_t g_runbuffer[SAM3UEK_XRES];
+static uint16_t g_runbuffer[SKEL_XRES];
/* This structure describes the overall LCD video controller */
static const struct fb_videoinfo_s g_videoinfo =
{
- .fmt = SAM3UEK_RGBFMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
- .xres = SAM3UEK_XRES, /* Horizontal resolution in pixel columns */
- .yres = SAM3UEK_YRES, /* Vertical resolution in pixel rows */
- .nplanes = 1, /* Number of color planes supported */
+ .fmt = SKEL_COLORFMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
+ .xres = SKEL_XRES, /* Horizontal resolution in pixel columns */
+ .yres = SKEL_YRES, /* Vertical resolution in pixel rows */
+ .nplanes = 1, /* Number of color planes supported */
};
/* This is the standard, NuttX Plane information object */
static const struct lcd_planeinfo_s g_planeinfo =
{
- .putrun = sam3u_putrun, /* Put a run into LCD memory */
- .getrun = sam3u_getrun, /* Get a run from LCD memory */
+ .putrun = skel_putrun, /* Put a run into LCD memory */
+ .getrun = skel_getrun, /* Get a run from LCD memory */
.buffer = (uint8_t*)g_runbuffer, /* Run scratch buffer */
- .bpp = SAM3UEK_BPP, /* Bits-per-pixel */
+ .bpp = SKEL_BPP, /* Bits-per-pixel */
};
/* This is the standard, NuttX LCD driver object */
-static struct sam3u_dev_s g_lcddev_s =
+static struct skel_dev_s g_lcddev_s =
{
.dev =
{
/* LCD Configuration */
- .getvideoinfo = sam3u_getvideoinfo,
- .getplaneinfo = sam3u_getplaneinfo,
+ .getvideoinfo = skel_getvideoinfo,
+ .getplaneinfo = skel_getplaneinfo,
/* LCD RGB Mapping -- Not supported */
/* Cursor Controls -- Not supported */
/* LCD Specific Controls */
- .getpower = sam3u_getpower,
- .setpower = sam3u_setpower,
- .getcontrast = sam3u_getcontrast,
- .setcontrast = sam3u_setcontrast,
+ .getpower = skel_getpower,
+ .setpower = skel_setpower,
+ .getcontrast = skel_getcontrast,
+ .setcontrast = skel_setcontrast,
},
};
@@ -421,168 +212,7 @@ static struct sam3u_dev_s g_lcddev_s =
**************************************************************************************/
/**************************************************************************************
- * Name: sam3u_putreg
- *
- * Description:
- * Write to a HX834x register
- *
- **************************************************************************************/
-
-static void sam3u_putreg(uint16_t reg, uint16_t data)
-{
- regdbg("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
- putreg16(reg, LCD_BASE);
- putreg16(data, LCD_BASE + HX843X_LCD_RS);
-}
-
-/**************************************************************************************
- * Name: sam3u_getreg
- *
- * Description:
- * Read from a HX834x register
- *
- **************************************************************************************/
-
-static uint16_t sam3u_getreg(uint16_t reg)
-{
- uint16_t data;
- putreg16(reg, LCD_BASE);
- data = getreg16(LCD_BASE + HX843X_LCD_RS);
- regdbg("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
- return data;
-}
-
-/**************************************************************************************
- * Name: sam3u_setcursor
- *
- * Description:
- * Set the LCD cursor position.
- *
- **************************************************************************************/
-
-static void sam3u_setcursor(fb_coord_t row, fb_coord_t col)
-{
- uint8_t x1;
- uint8_t x2;
- uint8_t y1;
- uint8_t y2;
-
- /* Get the upper and lower x and y positions */
-
- x1 = (uint8_t)col;
- x2 = (uint8_t)((uint16_t)col >> 8);
-
- y1 = (uint8_t)row;
- y2 = (uint8_t)((uint16_t)row >> 8);
-
- /* Then set the cursor position */
-
- sam3u_putreg(HX8347_R02H, x2); /* column high */
- sam3u_putreg(HX8347_R03H, x1); /* column low */
- sam3u_putreg(HX8347_R06H, y2); /* row high */
- sam3u_putreg(HX8347_R07H, y1); /* row low */
-}
-
-/**************************************************************************************
- * Name: sam3u_wrsetup
- *
- * Description:
- * Set up for a GRAM write operation.
- *
- **************************************************************************************/
-
-static inline void sam3u_wrsetup(void)
-{
- putreg16(HX8347_R22H, LCD_BASE);
-}
-
-/**************************************************************************************
- * Name: sam3u_wrram
- *
- * Description:
- * Write to the 16-bit GRAM register
- *
- **************************************************************************************/
-
-static inline void sam3u_wrram(uint16_t color)
-{
- putreg16(color, LCD_BASE + HX843X_LCD_RS);
-}
-
-/**************************************************************************************
- * Name: sam3u_rdram
- *
- * Description:
- * Read from the 16-bit GRAM register
- *
- **************************************************************************************/
-
-static inline uint16_t sam3u_rdram(void)
-{
- return getreg16(LCD_BASE + HX843X_LCD_RS);
-}
-
-/**************************************************************************************
- * Name: sam3u_lcdon
- *
- * Description:
- * Turn the LCD on
- *
- **************************************************************************************/
-
-static void sam3u_lcdon(void)
-{
- /* Display ON Setting */
-
- gvdbg("ON\n");
- sam3u_putreg(HX8347_R90H, 0x7f); /* SAP=0111 1111 */
- sam3u_putreg(HX8347_R26H, 0x04); /* GON=0 DTE=0 D=01 */
- up_mdelay(100);
- sam3u_putreg(HX8347_R26H, 0x24); /* GON=1 DTE=0 D=01 */
- sam3u_putreg(HX8347_R26H, 0x2c); /* GON=1 DTE=0 D=11 */
- up_mdelay(100);
- sam3u_putreg(HX8347_R26H, 0x3c); /* GON=1 DTE=1 D=11 */
-}
-
-/**************************************************************************************
- * Name: sam3u_lcdoff
- *
- * Description:
- * Turn the LCD off
- *
- **************************************************************************************/
-
-static void sam3u_lcdoff(void)
-{
- gvdbg("OFF\n");
- sam3u_putreg(HX8347_R90H, 0x00); /* SAP=0000 0000 */
- sam3u_putreg(HX8347_R26H, 0x00); /* GON=0 DTE=0 D=00 */
-}
-
-/**************************************************************************************
- * Name: sam3u_dumpreg
- *
- * Description:
- * Dump a range of LCD registers.
- *
- **************************************************************************************/
-
-#ifdef CONFIG_DEBUG_GRAPHICS
-static void sam3u_dumpreg(uint8_t startreg, uint8_t endreg)
-{
- uint16_t value;
- uint8_t addr;
-
- for (addr = startreg; addr <= endreg; addr++)
- {
- value = sam3u_getreg(addr);
- gdbg(" %02x: %04x\n", addr, value);
- }
-}
-#endif
-
-/**************************************************************************************
- * Name: sam3u_putrun
+ * Name: skel_putrun
*
* Description:
* This method can be used to write a partial raster line to the LCD:
@@ -595,60 +225,23 @@ static void sam3u_dumpreg(uint8_t startreg, uint8_t endreg)
*
**************************************************************************************/
-static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
- size_t npixels)
+static int skel_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
+ size_t npixels)
{
- uint16_t *run = (uint16_t*)buffer;
- unsigned int i;
-
/* Buffer must be provided and aligned to a 16-bit address boundary */
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
-#ifdef CONFIG_SAM3U_240x320
/* Set up to write the run. */
- sam3u_setcursor(row, col);
- sam3u_wrsetup();
-
/* Write the run to GRAM. */
- for (i = 0; i < npixels; i++)
- {
- /* Write the pixel pixel to GRAM */
-
- sam3u_wrram(*run++);
- }
-#else
- /* Write the run to GRAM. Because rows and colums are swapped, we need to reset
- * the cursor position for every pixel. We could do this much faster if we
- * adapted to the strange device aspect ratio.
- */
-
- col = 319-col;
- for (i = 0; i < npixels; i++)
- {
- /* Set up to write the next pixel. Swapping x and y orientations so that the image
- * comes out with the 320x240 aspect ratio (not the native 240x320). That is:
- *
- * row: 0-239 maps to x: 0-239
- * col: 0-319 maps to y: 319-0
- */
-
- sam3u_setcursor(col--, row);
- sam3u_wrsetup();
-
- /* Write the pixel pixel to GRAM */
-
- sam3u_wrram(*run++);
- }
-#endif
return OK;
}
/**************************************************************************************
- * Name: sam3u_getrun
+ * Name: skel_getrun
*
* Description:
* This method can be used to read a partial raster line from the LCD:
@@ -661,62 +254,30 @@ static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
*
**************************************************************************************/
-static int sam3u_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
- size_t npixels)
+static int skel_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
+ size_t npixels)
{
- uint16_t *run = (uint16_t*)buffer;
- unsigned int i;
-
/* Buffer must be provided and aligned to a 16-bit address boundary */
gvdbg("row: %d col: %d npixels: %d\n", row, col, npixels);
DEBUGASSERT(buffer && ((uintptr_t)buffer & 1) == 0);
-#ifdef CONFIG_SAM3U_240x320
/* Set up to read the run */
- sam3u_setcursor(row, col);
-
/* Read the run from GRAM. */
- for (i = 0; i < npixels; i++)
- {
- /* Read the next pixel */
-
- *run++ = sam3u_rdram();
- }
-#else
- /* Read the run from GRAM Because rows and colums are swapped, we need to reset
- * the cursor position for every pixel. We could do this much faster if we
- * adapted to the strange device aspect ratio.
- */
-
- col = 319 - col;
- for (i = 0; i < npixels; i++)
- {
- /* Read the next pixel.. Swapping x and y orientations so that the image
- * comes out with the 320x240 aspect ratio (not the native 240x320). That is:
- *
- * row: 0-239 maps to x: 0-239
- * col: 0-319 maps to y: 319-0
- */
-
- sam3u_setcursor(col--, row);
- *run++ = sam3u_rdram();
- }
-#endif
return OK;
}
/**************************************************************************************
- * Name: sam3u_getvideoinfo
+ * Name: skel_getvideoinfo
*
* Description:
* Get information about the LCD video controller configuration.
*
**************************************************************************************/
-static int sam3u_getvideoinfo(FAR struct lcd_dev_s *dev,
+static int skel_getvideoinfo(FAR struct lcd_dev_s *dev,
FAR struct fb_videoinfo_s *vinfo)
{
DEBUGASSERT(dev && vinfo);
@@ -727,14 +288,14 @@ static int sam3u_getvideoinfo(FAR struct lcd_dev_s *dev,
}
/**************************************************************************************
- * Name: sam3u_getplaneinfo
+ * Name: skel_getplaneinfo
*
* Description:
* Get information about the configuration of each LCD color plane.
*
**************************************************************************************/
-static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
+static int skel_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo)
{
DEBUGASSERT(dev && pinfo && planeno == 0);
@@ -744,7 +305,7 @@ static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
}
/**************************************************************************************
- * Name: sam3u_getpower
+ * Name: skel_getpower
*
* Description:
* Get the LCD panel power status (0: full off - CONFIG_LCD_MAXPOWER: full on. On
@@ -752,91 +313,57 @@ static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
*
**************************************************************************************/
-static int sam3u_getpower(struct lcd_dev_s *dev)
+static int skel_getpower(struct lcd_dev_s *dev)
{
- struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
- DEBUGASSERT(dev);
- gvdbg("power: %d\n", priv->power);
- return priv->power;
+ struct skel_dev_s *priv = (struct skel_dev_s *)dev;
+ gvdbg("power: %d\n", 0);
+ return 0;
}
/**************************************************************************************
- * Name: sam3u_setpower
+ * Name: skel_setpower
*
* Description:
- * Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWERL: full on). On
+ * Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWER: full on). On
* backlit LCDs, this setting may correspond to the backlight setting.
*
- * LCD backlight is made of 4 white chip LEDs in parallel, driven by an AAT3194 charge
- * pump, MN4. The AAT3194 is controlled by the SAM3U4E through a single line. Simple
- * Serial Control (S2Cwire) interface, which permits to enable, disable, and set the
- * LED drive current (LED brightness control) from a 32-level logarithmic scale. Four
- * resistors R93/R94/R95/R96 are implemented for optional current limitation.
- *
**************************************************************************************/
-static int sam3u_setpower(struct lcd_dev_s *dev, int power)
+static int skel_setpower(struct lcd_dev_s *dev, int power)
{
- struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
- unsigned int i;
+ struct skel_dev_s *priv = (struct skel_dev_s *)dev;
gvdbg("power: %d\n", power);
DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER);
- /* Switch off backlight */
+ /* Set new power level */
- sam3u_gpiowrite(GPIO_LCD_BKL, false);
-
- /* For for at least 500uS to drain the charge pump */
-
- up_udelay(500);
-
- /* Set new backlight level by pumping "level" times */
-
- for (i = 0; i < power; i++)
- {
- sam3u_gpiowrite(GPIO_LCD_BKL, false);
- sam3u_gpiowrite(GPIO_LCD_BKL, false);
- sam3u_gpiowrite(GPIO_LCD_BKL, false);
- sam3u_gpiowrite(GPIO_LCD_BKL, true);;
- sam3u_gpiowrite(GPIO_LCD_BKL, true);;
- sam3u_gpiowrite(GPIO_LCD_BKL, true);;
- }
-
- /* This delay seems to be required... perhaps because of the big current jump? */
-
- if (power != LCD_FULL_OFF)
- {
- up_mdelay(100);
- }
-
- priv->power = power;
return OK;
}
/**************************************************************************************
- * Name: sam3u_getcontrast
+ * Name: skel_getcontrast
*
* Description:
* Get the current contrast setting (0-CONFIG_LCD_MAXCONTRAST).
*
**************************************************************************************/
-static int sam3u_getcontrast(struct lcd_dev_s *dev)
+static int skel_getcontrast(struct lcd_dev_s *dev)
{
gvdbg("Not implemented\n");
return -ENOSYS;
}
/**************************************************************************************
- * Name: sam3u_getcontrast
+ * Name: skel_getcontrast
*
* Description:
* Set LCD panel contrast (0-CONFIG_LCD_MAXCONTRAST).
*
**************************************************************************************/
-static int sam3u_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
+static int skel_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
{
gvdbg("contrast: %d\n", contrast);
return -ENOSYS;
@@ -858,173 +385,14 @@ static int sam3u_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
int up_lcdinitialize(void)
{
-#ifdef CONFIG_DEBUG_GRAPHICS
- uint16_t hxregval;
-#endif
- uint32_t regval;
- unsigned int i;
-
gvdbg("Initializing\n");
- /* Enable LCD EXTCS2 pins */
-
- sam3u_configgpio(GPIO_LCD_NCS2);
- sam3u_configgpio(GPIO_LCD_RS);
- sam3u_configgpio(GPIO_LCD_NWE);
- sam3u_configgpio(GPIO_LCD_NRD);
-
- sam3u_configgpio(GPIO_LCD_D0);
- sam3u_configgpio(GPIO_LCD_D1);
- sam3u_configgpio(GPIO_LCD_D2);
- sam3u_configgpio(GPIO_LCD_D3);
- sam3u_configgpio(GPIO_LCD_D4);
- sam3u_configgpio(GPIO_LCD_D5);
- sam3u_configgpio(GPIO_LCD_D6);
- sam3u_configgpio(GPIO_LCD_D7);
- sam3u_configgpio(GPIO_LCD_D8);
- sam3u_configgpio(GPIO_LCD_D9);
- sam3u_configgpio(GPIO_LCD_D10);
- sam3u_configgpio(GPIO_LCD_D11);
- sam3u_configgpio(GPIO_LCD_D12);
- sam3u_configgpio(GPIO_LCD_D13);
- sam3u_configgpio(GPIO_LCD_D14);
- sam3u_configgpio(GPIO_LCD_D15);
-
-#ifdef CONFIG_LCD_REGDEBUG
- sam3u_dumpgpio(GPIO_PORT_PIOB, "PORTB");
- sam3u_dumpgpio(GPIO_PORT_PIOC, "PORTC");
-#endif
-
- /* Configure LCD Backlight Pin */
-
- sam3u_configgpio(GPIO_LCD_D15);
-
- /* Enable SMC peripheral clock */
-
- putreg32((1 << SAM3U_PID_SMC), SAM3U_PMC_PCER);
- regdbg("PMC PCSR: %08x SMC: %08x\n", getreg32(SAM3U_PMC_PCSR), (1 << SAM3U_PID_SMC));
-
- /* Configure SMC CS2 */
-
- regval = (4 << SMCCS_SETUP_NWESETUP_SHIFT) | (2 << SMCCS_SETUP_NCSWRSETUP_SHIFT) |
- (4 << SMCCS_SETUP_NRDSETUP_SHIFT) | (2 << SMCCS_SETUP_NCSRDSETUP_SHIFT);
- putreg32(regval, SAM3U_SMCCS_SETUP(2));
-
- regval = (5 << SMCCS_PULSE_NWEPULSE_SHIFT) | (18 << SMCCS_PULSE_NCSWRPULSE_SHIFT) |
- (5 << SMCCS_PULSE_RDPULSE_SHIFT) | (18 << SMCCS_PULSE_NCSRDPULSE_SHIFT);
- putreg32(regval, SAM3U_SMCCS_PULSE(2));
-
- regval = (22 << SMCCS_CYCLE_NWECYCLE_SHIFT) | (22 << SMCCS_CYCLE_NRDCYCLE_SHIFT);
- putreg32(regval, SAM3U_SMCCS_CYCLE(2));
+ /* Configure GPIO pins */
- regval = getreg32(SAM3U_SMCCS_MODE(2));
- regval &= ~(SMCCS_MODE_DBW_MASK | SMCCS_MODE_PMEN);
- regval |= (SMCCS_MODE_READMODE) | (SMCCS_MODE_WRITEMODE) | (SMCCS_MODE_DBW_16BITS);
- putreg32(regval, SAM3U_SMCCS_MODE(2));
+ /* Enable clocking /
- regdbg("SMC SETUP[%08x]: %08x PULSE[%08x]: %08x\n",
- SAM3U_SMCCS_SETUP(2), getreg32(SAM3U_SMCCS_SETUP(2)),
- SAM3U_SMCCS_PULSE(2), getreg32(SAM3U_SMCCS_PULSE(2)));
- regdbg(" CYCLE[%08x]: %08x MODE[%08x]: %08x\n",
- SAM3U_SMCCS_CYCLE(2), getreg32(SAM3U_SMCCS_CYCLE(2)),
- SAM3U_SMCCS_MODE(2), getreg32(SAM3U_SMCCS_MODE(2)));
-
- /* Check HX8347 Chip ID */
-
-#ifdef CONFIG_DEBUG_GRAPHICS
- hxregval = sam3u_getreg(HX8347_R67H);
- gvdbg("Chip ID: %04x\n", hxregval);
- if (hxregval != HX8347_CHIPID)
- {
- gdbg("Bad chip ID: %04x Expected: %04x\n", hxregval, HX8347_CHIPID);
- return -ENODEV;
- }
-#endif
-
- /* Initialize LCD controller (HX8347) -- Magic code from Atmel LCD example */
-
- /* Start internal OSC */
-
- sam3u_putreg(HX8347_R19H, 0x49); /* OSCADJ=10 0000 OSD_EN=1 60Hz */
- sam3u_putreg(HX8347_R93H, 0x0C); /* RADJ=1100 */
-
- /* Power on flow */
-
- sam3u_putreg(HX8347_R44H, 0x4D); /* VCM=100 1101 */
- sam3u_putreg(HX8347_R45H, 0x11); /* VDV=1 0001 */
- sam3u_putreg(HX8347_R20H, 0x40); /* BT=0100 */
- sam3u_putreg(HX8347_R1DH, 0x07); /* VC1=111 */
- sam3u_putreg(HX8347_R1EH, 0x00); /* VC3=000 */
- sam3u_putreg(HX8347_R1FH, 0x04); /* VRH=0100 */
- sam3u_putreg(HX8347_R1CH, 0x04); /* AP=100 */
- sam3u_putreg(HX8347_R1BH, 0x10); /* GASENB=0 PON=1 DK=0 XDK=0 DDVDH_TRI=0 STB=0 */
- up_mdelay(50);
- sam3u_putreg(HX8347_R43H, 0x80); /* Set VCOMG=1 */
- up_mdelay(50);
-
- /* Gamma for CMO 2.8 */
-
- sam3u_putreg(HX8347_R46H, 0x95);
- sam3u_putreg(HX8347_R47H, 0x51);
- sam3u_putreg(HX8347_R48H, 0x00);
- sam3u_putreg(HX8347_R49H, 0x36);
- sam3u_putreg(HX8347_R4AH, 0x11);
- sam3u_putreg(HX8347_R4BH, 0x66);
- sam3u_putreg(HX8347_R4CH, 0x14);
- sam3u_putreg(HX8347_R4DH, 0x77);
- sam3u_putreg(HX8347_R4EH, 0x13);
- sam3u_putreg(HX8347_R4FH, 0x4c);
- sam3u_putreg(HX8347_R50H, 0x46);
- sam3u_putreg(HX8347_R51H, 0x46);
-
- /* 240x320 window setting */
-
- sam3u_putreg(HX8347_R02H, 0x00); /* Column address start2 */
- sam3u_putreg(HX8347_R03H, 0x00); /* Column address start1 */
- sam3u_putreg(HX8347_R04H, 0x00); /* Column address end2 */
- sam3u_putreg(HX8347_R05H, 0xef); /* Column address end1 */
- sam3u_putreg(HX8347_R06H, 0x00); /* Row address start2 */
- sam3u_putreg(HX8347_R07H, 0x00); /* Row address start1 */
- sam3u_putreg(HX8347_R08H, 0x01); /* Row address end2 */
- sam3u_putreg(HX8347_R09H, 0x3f); /* Row address end1 */
-
- /* Display Setting */
-
- sam3u_putreg(HX8347_R01H, 0x06); /* IDMON=0 INVON=1 NORON=1 PTLON=0 */
- sam3u_putreg(HX8347_R16H, 0xc8); /* MY=1 MX=1 MV=0 BGR=1 */
- sam3u_putreg(HX8347_R23H, 0x95); /* N_DC=1001 0101 */
- sam3u_putreg(HX8347_R24H, 0x95); /* P_DC=1001 0101 */
- sam3u_putreg(HX8347_R25H, 0xff); /* I_DC=1111 1111 */
- sam3u_putreg(HX8347_R27H, 0x06); /* N_BP=0000 0110 */
- sam3u_putreg(HX8347_R28H, 0x06); /* N_FP=0000 0110 */
- sam3u_putreg(HX8347_R29H, 0x06); /* P_BP=0000 0110 */
- sam3u_putreg(HX8347_R2AH, 0x06); /* P_FP=0000 0110 */
- sam3u_putreg(HX8347_R2CH, 0x06); /* I_BP=0000 0110 */
- sam3u_putreg(HX8347_R2DH, 0x06); /* I_FP=0000 0110 */
- sam3u_putreg(HX8347_R3AH, 0x01); /* N_RTN=0000 N_NW=001 */
- sam3u_putreg(HX8347_R3BH, 0x01); /* P_RTN=0000 P_NW=001 */
- sam3u_putreg(HX8347_R3CH, 0xf0); /* I_RTN=1111 I_NW=000 */
- sam3u_putreg(HX8347_R3DH, 0x00); /* DIV=00 */
- sam3u_putreg(HX8347_R3EH, 0x38); /* SON=38h */
- sam3u_putreg(HX8347_R40H, 0x0f); /* GDON=0Fh */
- sam3u_putreg(HX8347_R41H, 0xf0); /* GDOF=F0h */
-
- /* Set LCD backlight to FULL off */
-
- sam3u_setpower(&g_lcddev_s.dev, LCD_FULL_OFF);
-
- /* Fill the display memory with the color BLACK */
-
- sam3u_setcursor(0, 0);
- sam3u_wrsetup();
- for (i = 0; i < (SAM3UEK_XRES * SAM3UEK_YRES); i++)
- {
- sam3u_wrram(RGB16_BLACK);
- }
-
- /* Turn the LCD on (but with the backlight off) */
-
- sam3u_lcdon();
+ /* Configure and enable LCD */
+
return OK;
}
@@ -1055,15 +423,7 @@ void up_lcduninitialize(void)
{
/* Turn the LCD off */
- sam3u_lcdoff();
-
- /* Set LCD backlight to FULL off */
-
- sam3u_setpower(&g_lcddev_s.dev, LCD_FULL_OFF);
-
- /* Disable SMC peripheral clock */
-
- putreg32((1 << SAM3U_PID_SMC), SAM3U_PMC_PCDR);
+ /* Disable clocking */
}