diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:08:55 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:08:55 +1000 |
commit | cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b (patch) | |
tree | 08ffe293a154f08325bca487ba73de1843e94ba5 /drivers/gdisp | |
parent | 2ab2d77fcba42467b62f2be732cb8dc00510fe19 (diff) | |
download | uGFX-cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b.tar.gz uGFX-cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b.tar.bz2 uGFX-cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b.zip |
Change pixel_t to gPixel
Diffstat (limited to 'drivers/gdisp')
-rw-r--r-- | drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c | 8 | ||||
-rw-r--r-- | drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c | 4 | ||||
-rw-r--r-- | drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c index 2a9d2488..496a3d91 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c @@ -345,16 +345,16 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { gCoord lg, x, y; uint16_t c1, c2; unsigned tuples; - const pixel_t *buffer; + const gPixel *buffer; #if GDISP_PACKED_PIXELS unsigned pnum, pstart; const uint8_t *p; #else - const pixel_t *p; + const gPixel *p; #endif tuples = (g->p.cx * g->p.cy + 1)>>1; - buffer = (const pixel_t *)g->p.ptr; + buffer = (const gPixel *)g->p.ptr; /* Set up the data window to transfer */ acquire_bus(g); @@ -428,7 +428,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { srccx = (g->p.x2 + 1) & ~1; #endif pstart = g->p.y1 * g->p.x2 + g->p.x1; // The starting pixel number - buffer = (const pixel_t)(((const uint8_t *)buffer) + ((pstart>>1) * 3)); // The buffer start position + buffer = (const gPixel)(((const uint8_t *)buffer) + ((pstart>>1) * 3)); // The buffer start position lg = ((g->p.x2-g->p.cx)>>1)*3; // The buffer gap between lines pnum = pstart + g->p.x2*y + x; // Adjustment for controller craziness p = ((const uint8_t *)buffer) + (((g->p.x2*y + x)>>1)*3); // Adjustment for controller craziness diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c index b8ee55cb..7a9c4e27 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c +++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c @@ -258,10 +258,10 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { #endif LLDSPEC void gdisp_lld_blit_area(GDisplay *g) { - pixel_t *buffer; + gPixel *buffer; gCoord ycnt; - buffer = (pixel_t *)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2; + buffer = (gPixel *)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2; acquire_bus(g); set_viewport(g); diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c index 0631b0c0..c44a262f 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c +++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c @@ -294,10 +294,10 @@ LLDSPEC gBool gdisp_lld_init(GDisplay* g) { #endif LLDSPEC void gdisp_lld_blit_area(GDisplay* g) { - pixel_t* buffer; + gPixel* buffer; gCoord ycnt; - buffer = (pixel_t*)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2; + buffer = (gPixel*)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2; acquire_bus(g); set_viewport(g); |