diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-11-17 23:32:19 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-11-17 23:32:19 +1000 |
| commit | 7f1b78a067e11c2394d83dbbc9b0fc78f78af493 (patch) | |
| tree | cd49bed0ef2fb5469282f525c77e707620e7fbfb /drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c | |
| parent | 643670ecd1c4dc631b4073d2384ff7fa56cb564d (diff) | |
| download | uGFX-7f1b78a067e11c2394d83dbbc9b0fc78f78af493.tar.gz uGFX-7f1b78a067e11c2394d83dbbc9b0fc78f78af493.tar.bz2 uGFX-7f1b78a067e11c2394d83dbbc9b0fc78f78af493.zip | |
Replace color format conversion macros with proper routines to prevent side effects with using the macro.
Also fix a number of compiler warnings.
Diffstat (limited to 'drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c')
| -rw-r--r-- | drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c index ffd67cf7..0197a536 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c +++ b/drivers/gdisp/ILI9325/gdisp_lld_ILI9325.c @@ -61,6 +61,7 @@ static void set_cursor(GDisplay *g) { switch(g->g.Orientation) { + default: case GDISP_ROTATE_0: case GDISP_ROTATE_180: write_reg(g, 0x20, g->p.x); @@ -78,6 +79,7 @@ static void set_cursor(GDisplay *g) { static void set_viewport(GDisplay* g) { switch(g->g.Orientation) { + default: case GDISP_ROTATE_0: case GDISP_ROTATE_180: write_reg(g, 0x50, g->p.x); @@ -200,7 +202,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { set_viewport(g); } LLDSPEC void gdisp_lld_write_color(GDisplay *g) { - write_data(g, COLOR2NATIVE(g->p.color)); + write_data(g, gdispColor2Native(g->p.color)); } LLDSPEC void gdisp_lld_write_stop(GDisplay *g) { release_bus(g); @@ -222,7 +224,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { uint16_t data; data = read_data(g); - return NATIVE2COLOR(data); + return gdispNative2Color(data); } LLDSPEC void gdisp_lld_read_stop(GDisplay *g) { setwritemode(g); |