From e61f0ae4248bdafeace54c330d488904a495c045 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 13:51:20 +1000 Subject: Added type gOrientation to replace V2.x orientation_t, and values gOrientationX replace GDISP_ROTATE_X --- drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'drivers/gdisp/framebuffer') diff --git a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c index fb09d1c9..ad46da3c 100644 --- a/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c +++ b/drivers/gdisp/framebuffer/gdisp_lld_framebuffer.c @@ -44,7 +44,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) { ((fbPriv *)g->priv)->fbi.linelen = 0; // Initialize the GDISP structure - g->g.Orientation = GDISP_ROTATE_0; + g->g.Orientation = gOrientation0; g->g.Powermode = gPowerOn; g->board = 0; // preinitialize board_init(g, &((fbPriv *)g->priv)->fbi); @@ -63,17 +63,17 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { #if GDISP_NEED_CONTROL switch(g->g.Orientation) { - case GDISP_ROTATE_0: + case gOrientation0: default: pos = PIXIL_POS(g, g->p.x, g->p.y); break; - case GDISP_ROTATE_90: + case gOrientation90: pos = PIXIL_POS(g, g->p.y, g->g.Width-g->p.x-1); break; - case GDISP_ROTATE_180: + case gOrientation180: pos = PIXIL_POS(g, g->g.Width-g->p.x-1, g->g.Height-g->p.y-1); break; - case GDISP_ROTATE_270: + case gOrientation270: pos = PIXIL_POS(g, g->g.Height-g->p.y-1, g->p.x); break; } @@ -90,17 +90,17 @@ LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { #if GDISP_NEED_CONTROL switch(g->g.Orientation) { - case GDISP_ROTATE_0: + case gOrientation0: default: pos = PIXIL_POS(g, g->p.x, g->p.y); break; - case GDISP_ROTATE_90: + case gOrientation90: pos = PIXIL_POS(g, g->p.y, g->g.Width-g->p.x-1); break; - case GDISP_ROTATE_180: + case gOrientation180: pos = PIXIL_POS(g, g->g.Width-g->p.x-1, g->g.Height-g->p.y-1); break; - case GDISP_ROTATE_270: + case gOrientation270: pos = PIXIL_POS(g, g->g.Height-g->p.y-1, g->p.x); break; } @@ -129,12 +129,12 @@ LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { return; case GDISP_CONTROL_ORIENTATION: - if (g->g.Orientation == (orientation_t)g->p.ptr) + if (g->g.Orientation == (gOrientation)g->p.ptr) return; - switch((orientation_t)g->p.ptr) { - case GDISP_ROTATE_0: - case GDISP_ROTATE_180: - if (g->g.Orientation == GDISP_ROTATE_90 || g->g.Orientation == GDISP_ROTATE_270) { + switch((gOrientation)g->p.ptr) { + case gOrientation0: + case gOrientation180: + if (g->g.Orientation == gOrientation90 || g->g.Orientation == gOrientation270) { gCoord tmp; tmp = g->g.Width; @@ -142,9 +142,9 @@ LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { g->g.Height = tmp; } break; - case GDISP_ROTATE_90: - case GDISP_ROTATE_270: - if (g->g.Orientation == GDISP_ROTATE_0 || g->g.Orientation == GDISP_ROTATE_180) { + case gOrientation90: + case gOrientation270: + if (g->g.Orientation == gOrientation0 || g->g.Orientation == gOrientation180) { gCoord tmp; tmp = g->g.Width; @@ -155,7 +155,7 @@ LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { default: return; } - g->g.Orientation = (orientation_t)g->p.ptr; + g->g.Orientation = (gOrientation)g->p.ptr; return; case GDISP_CONTROL_BACKLIGHT: -- cgit v1.2.3