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

Add configuration to select LCD driver for NX

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2596 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2010-04-17 01:53:49 +00:00
parent 6a503c11ea
commit 8ac830d057
10 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1090,3 +1090,6 @@
no one has been using this port.
5.4 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* include/nuttx/lcd.h - Defines an LCD interface.

6
Documentation/NXGraphicsSubsystem.html
View File

@ -12,7 +12,7 @@
<h1><big><font color="#3c34ec">
<i>NX Graphics Subsystem</i>
</font></big></h1>
<p>Last Updated: December 16, 2008</p>
<p>Last Updated: April 16, 2010</p>
</td>
</tr>
</table>
@ -2606,6 +2606,10 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
<dt><code>CONFIG_NX_PACKEDMSFIRST</code>:
<dd>If a pixel depth of less than 8-bits is used, then NX needs
to know if the pixels pack from the MS to LS or from LS to MS
<dt><code>CONFIG_NX_LCDDRIVER</code>:
<dd>By default, NX builds to use a framebuffer driver (see <code>include/nuttx/fb.h</code>).
If this option is defined, NX will build to use an LCD driver (see <code>include/nuttx/lcd.h</code>).
</li>
</dl>
</ul>

25
Documentation/NuttX.html
View File

@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
<p>Last Updated: April 11, 2010</p>
<p>Last Updated: April 14, 2010</p>
</td>
</tr>
</table>
@ -1689,28 +1689,9 @@ buildroot-1.8 2009-12-21 &lt;spudmonkey@racsa.co.cr&gt;
</table>
<ul><pre>
nuttx-5.3 2010-04-11 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
nuttx-5.4 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* arch/arm/src/lpc313x/lpc313x_usbdev.c - USB driver for the LPC313x
contributed by David Hewson.
* configs/ea3131/src/up_ubstrgc.c, configs/ea3131/usbserial,
configs/ea3131/usbstorage - USB storage and USB serial example support
contributed by David Hewson.
* Several important compilation error fixes in lpc313x and (dualspeed) USB
code also contributed by David Hewson.
* arch/arm/src/sam3u/sam3u_dmac.c - DMA support for the AT90SAM3U.
* arch/arm/src/sam3u/sam3u_hsmci.c - SD memory card support for AT90SAM3U
(Neither the DMA nor the HSMCI driver are functional on the initial checkin).
* drivers/usbdev - Several important fixes to the USB mass storage driver
submitted by David Hewson.
* configs/olimex-lpc2378, arch/arm/include/lpc2378, and arch/arm/src/lpc2378 -
Basic port of the NXP 2378 on the Olimex board contributed by
Rommel Marcelo.
* arch/arm/src/sam3u/sam3u_internal.h - Fixed a critical bug in the AT91SAM3U
PIO decoding. No PIOs greater than 15 could be used on any port! Obviously,
no one has been using this port.
nuttx-5.3 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
* include/nuttx/lcd.h - Defines an LCD interface.
pascal-2.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;

7
Documentation/NuttxPortingGuide.html
View File

@ -12,7 +12,7 @@
<h1><big><font color="#3c34ec">
<i>NuttX RTOS Porting Guide</i>
</font></big></h1>
<p>Last Updated: December 16, 2009</p>
<p>Last Updated: April 16, 2010</p>
</td>
</tr>
</table>
@ -2850,6 +2850,11 @@ extern void up_ledoff(int led);
If a pixel depth of less than 8-bits is used, then NX needs
to know if the pixels pack from the MS to LS or from LS to MS
</li>
<li>
<code>CONFIG_NX_LCDDRIVER</code>:
By default, NX builds to use a framebuffer driver (see <code>include/nuttx/fb.h</code>).
If this option is defined, NX will build to use an LCD driver (see <code>include/nuttx/lcd.h</code>).
</li>
<li>
<code>CONFIG_NX_MOUSE</code>:
Build in support for mouse input.

2
arch/sim/src/up_framebuffer.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/sim/src/up_framebuffer.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

4
configs/README.txt
View File

@ -518,6 +518,10 @@ defconfig -- This is a configuration file similar to the Linux
CONFIG_NX_PACKEDMSFIRST
If a pixel depth of less than 8-bits is used, then NX needs
to know if the pixels pack from the MS to LS or from LS to MS
CONFIG_NX_LCDDRIVER
By default, NX builds to use a framebuffer driver (see
include/nuttx/fb.h). If this option is defined, NX will
build to use an LCD driver (see include/nuttx/lcd.h).
CONFIG_NX_MOUSE
Build in support for mouse input.
CONFIG_NX_KBD

6
drivers/mmcsd/mmcsd_sdio.c
View File

@ -2355,6 +2355,12 @@ static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv)
{
fdbg("WARN: Failed to set wide bus operation: %d\n", ret);
}
/* TODO: If widebus selected, then send CMD6 to see if the card supports
* high speed mode. A new SDIO method will be needed to set high speed
* mode.
*/
return OK;
}

2
examples/nx/nx_kbdin.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* examples/nx/nx_kbdin.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

22
include/nuttx/lcd.h
View File

@ -52,11 +52,25 @@
****************************************************************************/
/* This structure describes one color plane. Some YUV formats may support
* up to 4 planes
* up to 4 planes (although they probably wouldn't be used on LCD hardware).
* The framebuffer driver provides the video memory address in its
* corresponding fb_planeinfo_s structure. The LCD driver, instead, provides
* methods to transfer data to/from the LCD color plane.
*/
struct lcd_planeinfo_s
{
/* LCD Data Transfer ******************************************************/
int (*putrun)(struct lcd_dev_s *dev, unsigned int planeno,
fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
size_t npixels);
int (*getrun)(struct lcd_dev_s *dev, unsigned int planeno,
fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
size_t npixels);
/* Plane color characteristics ********************************************/
uint8_t bpp; /* Bits per pixel */
};
@ -117,12 +131,6 @@ struct lcd_dev_s
/* Set LCD panel contrast (0-CONFIG_LCD_MAXCONTRAST) */
int (*setcontrast)(struct lcd_dev_s *dev, unsigned int contrast);
/* LCD Data Transfer ******************************************************/
int (*run)(struct lcd_dev_s *dev, unsigned int planeno,
fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
size_t npixels);
};
/****************************************************************************

2
include/nuttx/nxtk.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* include/nuttx/nxtk.h
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without