sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add apps/system/ramtest. I will use this for the LPC1788 SDRAM bringup

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5791 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-03-27 00:03:25 +00:00
parent 2215873d8a
commit fa1d47e4f0
4 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4457,4 +4457,6 @@
konfig-frontends tool (2013-03-25).
* configs/twr-k60n512: Converted configurations to use the
konfig-frontends tool (2013-03-25).
* arch/arm/src/lpc17xx/lpc17_lcd.c: Add an LCD framebuffer drier
for the LPC177x/8x family.

11
arch/arm/src/lpc17xx/Kconfig
View File

@ -654,6 +654,14 @@ config LPC17_LCD_TFTPANEL
display panels require the digital color value of each pixel to be
applied to the display data inputs.
config LPC17_LCD_MONOCHROME
bool "Monochrome LCD"
default n
depends on !LPC17_LCD_TFTPANEL
---help---
STN LCD monochrome/color selection. Selects monochrome LCD. This
selection has no meaning for a TFT panel.
choice
prompt "Bits per pixel"
default LPC17_LCD_BPP24 if LPC17_LCD_TFTPANEL
@ -673,6 +681,7 @@ config LPC17_LCD_BPP8
config LPC17_LCD_BPP16
bool "16 bit per pixel"
depends on !LPC17_LCD_MONOCHROME
config LPC17_LCD_BPP24
bool "24 bit per pixel"
@ -680,9 +689,11 @@ config LPC17_LCD_BPP24
config LPC17_LCD_BPP16_565
bool "16 bpp, 5:6:5 mode"
depends on !LPC17_LCD_MONOCHROME
config LPC17_LCD_BPP12_444
bool "12 bpp, 4:4:4 mode"
depends on !LPC17_LCD_MONOCHROME
endchoice

24
arch/arm/src/lpc17xx/lpc17_lcd.c
View File

@ -563,6 +563,30 @@ int up_fbinitialize(void)
regval &= ~LCD_CTRL_BGR;
putreg32(regval, LPC17_LCD_CTRL);
/* Select monochrome or color LCD */
#ifdef CONFIG_LPC17_LCD_MONOCHROME
/* Select monochrome LCD */
regval &= ~LCD_CTRL_BGR;
putreg32(regval, LPC17_LCD_CTRL);
/* Select 4- or 8-bit monochrome interface */
#if LPC17_BPP > 4
regval |= LCD_CTRL_LCDMONO8;
#else
regval &= ~LCD_CTRL_LCDMONO8;
#endif
putreg32(regval, LPC17_LCD_CTRL);
#else
/* Select color LCD */
regval &= ~(LCD_CTRL_LCDBW | LCD_CTRL_LCDMONO8);
putreg32(regval, LPC17_LCD_CTRL);
#endif
/* Little endian byte order */
regval &= ~LCD_CTRL_BEBO;

6
fs/fs_select.c
View File

@ -117,9 +117,9 @@ int select(int nfds, FAR fd_set *readfds, FAR fd_set *writefds,
{
/* Check if any monitor operation is requested on this fd */
if (readfds && FD_ISSET(fd, readfds) ||
writefds && FD_ISSET(fd, writefds) ||
exceptfds && FD_ISSET(fd, exceptfds))
if ((readfds && FD_ISSET(fd, readfds)) ||
(writefds && FD_ISSET(fd, writefds)) ||
(exceptfds && FD_ISSET(fd, exceptfds)))
{
/* Yes.. increment the count of pollfds structures needed */