diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:47:36 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:47:36 +1000 |
commit | bda8c738b10c136ad1557acc1a07174ceb3e4f73 (patch) | |
tree | cd686b249bfa8bde518668cfe5a7f9f3914ad13f /drivers/gdisp/framebuffer | |
parent | f9c848e9851713d7a33962b9b4768c0a0d1751f1 (diff) | |
download | uGFX-bda8c738b10c136ad1557acc1a07174ceb3e4f73.tar.gz uGFX-bda8c738b10c136ad1557acc1a07174ceb3e4f73.tar.bz2 uGFX-bda8c738b10c136ad1557acc1a07174ceb3e4f73.zip |
Added type gPowermode to replace V2.x powermode_t, and values gPowerXXX replace powerXXX
Diffstat (limited to 'drivers/gdisp/framebuffer')
-rw-r--r-- | drivers/gdisp/framebuffer/board_framebuffer_template.h | 2 | ||||
-rw-r--r-- | drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gdisp/framebuffer/board_framebuffer_template.h b/drivers/gdisp/framebuffer/board_framebuffer_template.h index 3e74e92b..ed8f5a0c 100644 --- a/drivers/gdisp/framebuffer/board_framebuffer_template.h +++ b/drivers/gdisp/framebuffer/board_framebuffer_template.h @@ -47,7 +47,7 @@ (void) percent; } - static void board_power(GDisplay *g, powermode_t pwr) { + static void board_power(GDisplay *g, gPowermode pwr) { // TODO: Can be an empty function if your hardware doesn't support this (void) g; (void) pwr; diff --git a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c index ca0153e7..fb09d1c9 100644 --- a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c +++ b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c @@ -45,7 +45,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { // Initialize the GDISP structure g->g.Orientation = GDISP_ROTATE_0; - g->g.Powermode = powerOn; + g->g.Powermode = gPowerOn; g->board = 0; // preinitialize board_init(g, &((fbPriv *)g->priv)->fbi); @@ -116,16 +116,16 @@ LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { LLDSPEC void gdisp_lld_control(GDisplay *g) { switch(g->p.x) { case GDISP_CONTROL_POWER: - if (g->g.Powermode == (powermode_t)g->p.ptr) + if (g->g.Powermode == (gPowermode)g->p.ptr) return; - switch((powermode_t)g->p.ptr) { - case powerOff: case powerOn: case powerSleep: case powerDeepSleep: - board_power(g, (powermode_t)g->p.ptr); + switch((gPowermode)g->p.ptr) { + case gPowerOff: case gPowerOn: case gPowerSleep: case gPowerDeepSleep: + board_power(g, (gPowermode)g->p.ptr); break; default: return; } - g->g.Powermode = (powermode_t)g->p.ptr; + g->g.Powermode = (gPowermode)g->p.ptr; return; case GDISP_CONTROL_ORIENTATION: |