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

Merge remote-tracking branch 'origin/master' into vnc

Browse Source
This commit is contained in:
Gregory Nutt 2016-04-17 11:04:09 -06:00
commit d924ed5246
26 changed files with 59 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/src/dm320/dm320_framebuffer.c
View File

@ -1010,10 +1010,11 @@ static int dm320_getvid0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
} }
#endif #endif
pinfo->fbmem = g_vid0base; pinfo->fbmem = g_vid0base;
pinfo->fblen = DM320_VID0_FBLEN; pinfo->fblen = DM320_VID0_FBLEN;
pinfo->stride = DM320_VID0_STRIDE; pinfo->stride = DM320_VID0_STRIDE;
pinfo->bpp = DM320_VID0_BPP; pinfo->display = 0;
pinfo->bpp = DM320_VID0_BPP;
return OK; return OK;
} }
#endif #endif
@ -1056,10 +1057,11 @@ static int dm320_getvid1planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
} }
#endif #endif
pinfo->fbmem = g_vid1base; pinfo->fbmem = g_vid1base;
pinfo->fblen = DM320_VID1_FBLEN; pinfo->fblen = DM320_VID1_FBLEN;
pinfo->stride = DM320_VID1_STRIDE; pinfo->stride = DM320_VID1_STRIDE;
pinfo->bpp = DM320_VID1_BPP; pinfo->display = 1;
pinfo->bpp = DM320_VID1_BPP;
return OK; return OK;
} }
#endif #endif
@ -1106,10 +1108,11 @@ static int dm320_getosd0planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
} }
#endif #endif
pinfo->fbmem = g_osd0base; pinfo->fbmem = g_osd0base;
pinfo->fblen = DM320_OSD0_FBLEN; pinfo->fblen = DM320_OSD0_FBLEN;
pinfo->stride = DM320_OSD0_STRIDE; pinfo->stride = DM320_OSD0_STRIDE;
pinfo->bpp = DM320_OSD0_BPP; pinfo->display = 2;
pinfo->bpp = DM320_OSD0_BPP;
return OK; return OK;
} }
#endif #endif
@ -1156,10 +1159,11 @@ static int dm320_getosd1planeinfo(FAR struct fb_vtable_s *vtable, int planeno,
} }
#endif #endif
pinfo->fbmem = g_osd1base; pinfo->fbmem = g_osd1base;
pinfo->fblen = DM320_OSD1_FBLEN; pinfo->fblen = DM320_OSD1_FBLEN;
pinfo->stride = DM320_OSD1_STRIDE; pinfo->stride = DM320_OSD1_STRIDE;
pinfo->bpp = DM320_OSD1_BPP; pinfo->display = 3;
pinfo->bpp = DM320_OSD1_BPP;
return OK; return OK;
} }
#endif #endif

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

@ -153,6 +153,7 @@ static const struct fb_planeinfo_s g_planeinfo =
.fbmem = (FAR void *)CONFIG_LPC17_LCD_VRAMBASE, .fbmem = (FAR void *)CONFIG_LPC17_LCD_VRAMBASE,
.fblen = LPC17_FBSIZE, .fblen = LPC17_FBSIZE,
.stride = LPC17_STRIDE, .stride = LPC17_STRIDE,
.display = 0,
.bpp = LPC17_BPP, .bpp = LPC17_BPP,
}; };

9
arch/arm/src/sama5/sam_lcd.c
View File

@ -1122,10 +1122,11 @@ static int sam_base_getplaneinfo(struct fb_vtable_s *vtable, int planeno,
gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo); gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
if (vtable && planeno == 0 && pinfo) if (vtable && planeno == 0 && pinfo)
{ {
pinfo->fbmem = (void *)LAYER_BASE.framebuffer; pinfo->fbmem = (void *)LAYER_BASE.framebuffer;
pinfo->fblen = SAMA5_BASE_FBSIZE; pinfo->fblen = SAMA5_BASE_FBSIZE;
pinfo->stride = SAMA5_BASE_STRIDE, pinfo->stride = SAMA5_BASE_STRIDE;
pinfo->bpp = LAYER_BASE.bpp; pinfo->display = 0;
pinfo->bpp = LAYER_BASE.bpp;
return OK; return OK;
} }

17
arch/arm/src/stm32/stm32_dma2d.c
View File

@ -2047,17 +2047,18 @@ FAR struct dma2d_layer_s *up_dma2dcreatelayer(fb_coord_t width,
/* Initialize the videoinfo structure */ /* Initialize the videoinfo structure */
vinfo->fmt = fmt; vinfo->fmt = fmt;
vinfo->xres = width; vinfo->xres = width;
vinfo->yres = height; vinfo->yres = height;
vinfo->nplanes = 1; vinfo->nplanes = 1;
/* Initialize the planeinfo structure */ /* Initialize the planeinfo structure */
pinfo->fbmem = fbmem; pinfo->fbmem = fbmem;
pinfo->fblen = fblen; pinfo->fblen = fblen;
pinfo->stride = stride; pinfo->stride = stride;
pinfo->bpp = bpp; pinfo->display = 0;
pinfo->bpp = bpp;
/* Bind the layer to the identifier */ /* Bind the layer to the identifier */

2
arch/arm/src/stm32/stm32_ltdc.c
View File

@ -735,6 +735,7 @@ static struct stm32_ltdcdev_s g_ltdc =
.fbmem = (uint8_t *)STM32_LTDC_BUFFER_L1, .fbmem = (uint8_t *)STM32_LTDC_BUFFER_L1,
.fblen = STM32_L1_FBSIZE, .fblen = STM32_L1_FBSIZE,
.stride = STM32_L1_STRIDE, .stride = STM32_L1_STRIDE,
.display = 0,
.bpp = STM32_LTDC_L1_BPP .bpp = STM32_LTDC_L1_BPP
}, },
.vinfo = .vinfo =
@ -761,6 +762,7 @@ static struct stm32_ltdcdev_s g_ltdc =
.fbmem = (uint8_t *)STM32_LTDC_BUFFER_L2, .fbmem = (uint8_t *)STM32_LTDC_BUFFER_L2,
.fblen = STM32_L2_FBSIZE, .fblen = STM32_L2_FBSIZE,
.stride = STM32_L2_STRIDE, .stride = STM32_L2_STRIDE,
.display = 1,
.bpp = STM32_LTDC_L2_BPP .bpp = STM32_LTDC_L2_BPP
}, },
.vinfo = .vinfo =

17
arch/sim/src/board_lcd.c
View File

@ -196,20 +196,21 @@ static uint8_t g_runbuffer[FB_STRIDE];
static const struct fb_videoinfo_s g_videoinfo = static const struct fb_videoinfo_s g_videoinfo =
{ {
.fmt = FB_FMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ .fmt = FB_FMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
.xres = CONFIG_SIM_FBWIDTH, /* Horizontal resolution in pixel columns */ .xres = CONFIG_SIM_FBWIDTH, /* Horizontal resolution in pixel columns */
.yres = CONFIG_SIM_FBHEIGHT, /* Vertical resolution in pixel rows */ .yres = CONFIG_SIM_FBHEIGHT, /* Vertical resolution in pixel rows */
.nplanes = 1, /* Number of color planes supported */ .nplanes = 1, /* Number of color planes supported */
}; };
/* This is the standard, NuttX Plane information object */ /* This is the standard, NuttX Plane information object */
static const struct lcd_planeinfo_s g_planeinfo = static const struct lcd_planeinfo_s g_planeinfo =
{ {
.putrun = sim_putrun, /* Put a run into LCD memory */ .putrun = sim_putrun, /* Put a run into LCD memory */
.getrun = sim_getrun, /* Get a run from LCD memory */ .getrun = sim_getrun, /* Get a run from LCD memory */
.buffer = (FAR uint8_t *)g_runbuffer, /* Run scratch buffer */ .buffer = (FAR uint8_t *)g_runbuffer, /* Run scratch buffer */
.bpp = CONFIG_SIM_FBBPP, /* Bits-per-pixel */ .display = 0, /* Display number */
.bpp = CONFIG_SIM_FBBPP, /* Bits-per-pixel */
}; };
/* This is the standard, NuttX LCD driver object */ /* This is the standard, NuttX LCD driver object */

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

@ -137,6 +137,7 @@ static const struct fb_planeinfo_s g_planeinfo =
.fbmem = (FAR void *)&g_fb, .fbmem = (FAR void *)&g_fb,
.fblen = FB_SIZE, .fblen = FB_SIZE,
.stride = FB_WIDTH, .stride = FB_WIDTH,
.display = 0,
.bpp = CONFIG_SIM_FBBPP, .bpp = CONFIG_SIM_FBBPP,
}; };
#else #else

9
arch/x86/src/qemu/qemu_vga.c
View File

@ -368,10 +368,11 @@ static int vga_getvideoinfo(FAR struct lcd_dev_s *dev,
static int vga_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int vga_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
FAR struct lcd_planeinfo_s *pinfo) FAR struct lcd_planeinfo_s *pinfo)
{ {
pinfo->putrun = vga_putrun; /* Put a run into LCD memory */ pinfo->putrun = vga_putrun; /* Put a run into LCD memory */
pinfo->getrun = vga_getrun; /* Get a run from LCD memory */ pinfo->getrun = vga_getrun; /* Get a run from LCD memory */
pinfo->buffer = g_runbuffer; /* Run scratch buffer */ pinfo->buffer = g_runbuffer; /* Run scratch buffer */
pinfo->bpp = VGA_BPP; /* Bits-per-pixel */ pinfo->display = 0;
pinfo->bpp = VGA_BPP; /* Bits-per-pixel */
return OK; return OK;
} }

9
configs/compal_e99/src/ssd1783.c
View File

@ -148,7 +148,8 @@ static uint16_t g_runbuffer[LCD_XRES];
/* This structure describes the overall LCD video controller */ /* This structure describes the overall LCD video controller */
static const struct fb_videoinfo_s g_videoinfo = static const struct fb_videoinfo_s g_videoinfo =
{ .fmt = LCD_COLORFMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ {
.fmt = LCD_COLORFMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */
.xres = LCD_XRES, /* Horizontal resolution in pixel columns */ .xres = LCD_XRES, /* Horizontal resolution in pixel columns */
.yres = LCD_YRES, /* Vertical resolutiSend a command list to the LCD panelon in pixel rows */ .yres = LCD_YRES, /* Vertical resolutiSend a command list to the LCD panelon in pixel rows */
.nplanes = 1, /* Number of color planes supported */ .nplanes = 1, /* Number of color planes supported */
@ -157,7 +158,8 @@ static const struct fb_videoinfo_s g_videoinfo =
/* This is the standard, NuttX Plane information object */ /* This is the standard, NuttX Plane information object */
static const struct lcd_planeinfo_s g_planeinfo = static const struct lcd_planeinfo_s g_planeinfo =
{ .putrun = lcd_putrun, /* Put a run into LCD memory */ {
.putrun = lcd_putrun, /* Put a run into LCD memory */
// .getrun = lcd_getrun, /* Get a run from LCD memory */ // .getrun = lcd_getrun, /* Get a run from LCD memory */
.buffer = (uint8_t*) g_runbuffer, /* Run scratch buffer */ .buffer = (uint8_t*) g_runbuffer, /* Run scratch buffer */
.bpp = LCD_BPP, /* Bits-per-pixel */ .bpp = LCD_BPP, /* Bits-per-pixel */
@ -166,7 +168,8 @@ static const struct lcd_planeinfo_s g_planeinfo =
/* This is the standard, NuttX LCD driver object */ /* This is the standard, NuttX LCD driver object */
static struct ssd1783_dev_s g_lcddev = static struct ssd1783_dev_s g_lcddev =
{ .dev = {
.dev =
{ {
/* LCD Configuration */ /* LCD Configuration */

12
graphics/nxbe/nxbe_bitmap.c
View File

@ -45,10 +45,6 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -61,14 +57,6 @@ struct nx_bitmap_s
unsigned int stride; /* The width of the full source image in pixels. */ unsigned int stride; /* The width of the full source image in pixels. */
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

4
graphics/nxbe/nxbe_clipper.c
View File

@ -90,10 +90,6 @@ static const uint8_t g_nxcliporder[4][4] =
{ NX_BOTTOM_NDX, NX_RIGHT_NDX, NX_LEFT_NDX, NX_TOP_NDX } /* NX_CLIPORDER_BRLT */ { NX_BOTTOM_NDX, NX_RIGHT_NDX, NX_LEFT_NDX, NX_TOP_NDX } /* NX_CLIPORDER_BRLT */
}; };
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

20
graphics/nxbe/nxbe_closewindow.c
View File

@ -47,26 +47,6 @@
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

20
graphics/nxbe/nxbe_colormap.c
View File

@ -49,26 +49,6 @@
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

12
graphics/nxbe/nxbe_fill.c
View File

@ -43,10 +43,6 @@
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -57,14 +53,6 @@ struct nxbe_fill_s
nxgl_mxpixel_t color; nxgl_mxpixel_t color;
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

12
graphics/nxbe/nxbe_filltrapezoid.c
View File

@ -44,10 +44,6 @@
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -59,14 +55,6 @@ struct nxbe_filltrap_s
nxgl_mxpixel_t color; nxgl_mxpixel_t color;
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

16
graphics/nxbe/nxbe_getrectangle.c
View File

@ -46,10 +46,6 @@
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -60,18 +56,6 @@ struct nxbe_fill_s
nxgl_mxpixel_t color; nxgl_mxpixel_t color;
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

20
graphics/nxbe/nxbe_lower.c
View File

@ -45,26 +45,6 @@
#include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxglib.h>
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

12
graphics/nxbe/nxbe_move.c
View File

@ -46,10 +46,6 @@
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -63,14 +59,6 @@ struct nxbe_move_s
uint8_t order; uint8_t order;
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

16
graphics/nxbe/nxbe_raise.c
View File

@ -44,10 +44,6 @@
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -58,18 +54,6 @@ struct nxbe_raise_s
FAR struct nxbe_window_s *wnd; FAR struct nxbe_window_s *wnd;
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

12
graphics/nxbe/nxbe_redraw.c
View File

@ -47,10 +47,6 @@
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -61,14 +57,6 @@ struct nxbe_redraw_s
FAR struct nxbe_window_s *wnd; FAR struct nxbe_window_s *wnd;
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

20
graphics/nxbe/nxbe_redrawbelow.c
View File

@ -44,26 +44,6 @@
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

12
graphics/nxbe/nxbe_setpixel.c
View File

@ -43,10 +43,6 @@
#include "nxbe.h" #include "nxbe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -57,14 +53,6 @@ struct nxbe_setpixel_s
nxgl_mxpixel_t color; nxgl_mxpixel_t color;
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

20
graphics/nxbe/nxbe_setposition.c
View File

@ -44,26 +44,6 @@
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

20
graphics/nxbe/nxbe_setsize.c
View File

@ -44,26 +44,6 @@
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Types
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

12
graphics/nxbe/nxbe_visible.c
View File

@ -48,10 +48,6 @@
#include "nxbe.h" #include "nxbe.h"
#include "nxfe.h" #include "nxfe.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -62,14 +58,6 @@ struct nxbe_visible_s
bool visible; bool visible;
}; };
/****************************************************************************
* Private Data
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/

1
include/nuttx/video/fb.h
View File

@ -218,6 +218,7 @@ struct fb_planeinfo_s
FAR void *fbmem; /* Start of frame buffer memory */ FAR void *fbmem; /* Start of frame buffer memory */
uint32_t fblen; /* Length of frame buffer memory in bytes */ uint32_t fblen; /* Length of frame buffer memory in bytes */
fb_coord_t stride; /* Length of a line in bytes */ fb_coord_t stride; /* Length of a line in bytes */
uint8_t display; /* Display number */
uint8_t bpp; /* Bits per pixel */ uint8_t bpp; /* Bits per pixel */
}; };