summaryrefslogtreecommitdiff
path: root/nuttx/include
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-04-17 16:00:58 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-04-17 16:00:58 +0000
commit618da379b8b9505fc3a4112cb62c3458d1495b4c (patch)
tree0942da5dfdd00247b627f3b89796d437f463b827 /nuttx/include
parent6fb154273f6cdb31738b54a3f9a513b944d20813 (diff)
downloadpx4-nuttx-618da379b8b9505fc3a4112cb62c3458d1495b4c.tar.gz
px4-nuttx-618da379b8b9505fc3a4112cb62c3458d1495b4c.tar.bz2
px4-nuttx-618da379b8b9505fc3a4112cb62c3458d1495b4c.zip
Rectangular fills compile for LCD
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2605 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
-rw-r--r--nuttx/include/nuttx/fb.h8
-rwxr-xr-xnuttx/include/nuttx/lcd.h35
2 files changed, 37 insertions, 6 deletions
diff --git a/nuttx/include/nuttx/fb.h b/nuttx/include/nuttx/fb.h
index d48457aa0..06810fd15 100644
--- a/nuttx/include/nuttx/fb.h
+++ b/nuttx/include/nuttx/fb.h
@@ -183,10 +183,10 @@ typedef uint16_t fb_coord_t;
struct fb_videoinfo_s
{
- uint8_t fmt; /* see FB_FMT_* */
+ uint8_t fmt; /* see FB_FMT_* */
fb_coord_t xres; /* Resolution in pixels */
fb_coord_t yres;
- uint8_t nplanes; /* Number of color planes supported */
+ uint8_t nplanes; /* Number of color planes supported */
};
/* This structure describes one color plane. Some YUV formats may support
@@ -232,8 +232,8 @@ struct fb_cmap_s
#ifdef CONFIG_FB_HWCURSORIMAGE
struct fb_cursorimage_s
{
- fb_coord_t width; /* Width of the cursor image in pixels */
- fb_coord_t height /* Height of the curor image in pixels */
+ fb_coord_t width; /* Width of the cursor image in pixels */
+ fb_coord_t height /* Height of the curor image in pixels */
const uint8_t *image; /* Pointer to image data */
};
#endif
diff --git a/nuttx/include/nuttx/lcd.h b/nuttx/include/nuttx/lcd.h
index 612fa6ed2..ab93511ee 100755
--- a/nuttx/include/nuttx/lcd.h
+++ b/nuttx/include/nuttx/lcd.h
@@ -62,16 +62,47 @@
struct lcd_planeinfo_s
{
/* LCD Data Transfer ******************************************************/
+ /* This method can be used to write a partial raster line to the LCD:
+ *
+ * row - Starting row to write to (range: 0 <= row < yres)
+ * col - Starting column to write to (range: 0 <= col <= xres-npixels)
+ * buffer - The buffer containing the run to be written to the LCD
+ * npixels - The number of pixels to write to the LCD
+ * (range: 0 < npixels <= xres-col)
+ */
int (*putrun)(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
size_t npixels);
- int (*getrun)(fb_coord_t row, fb_coord_t col,FAR uint8_t *buffer,
+ /* This method can be used to read a partial raster line from the LCD:
+ *
+ * row - Starting row to read from (range: 0 <= row < yres)
+ * col - Starting column to read read (range: 0 <= col <= xres-npixels)
+ * buffer - The buffer in which to return the run read from the LCD
+ * npixels - The number of pixels to read from the LCD
+ * (range: 0 < npixels <= xres-col)
+ */
+
+ int (*getrun)(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
size_t npixels);
/* Plane color characteristics ********************************************/
- uint8_t bpp; /* Bits per pixel */
+ /* This is working memory allocated by the LCD driver for each LCD device
+ * and for each color plane. This memory will hold one raster line of data.
+ * The size of the allocated run buffer must therefor be at least
+ * (bpp * xres / 8). Actual alignment of the buffer must conform to the
+ * bitwidth of the underlying pixel type.
+ */
+
+ uint8_t *buffer;
+
+ /* This is the number of bits in one pixel. This may be one of {1, 2, 4,
+ * 8, 16, 24, or 32} unless support for one or more of those resolutions
+ * has been disabled.
+ */
+
+ uint8_t bpp;
};
/* This structure defines an LCD interface */