diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-03-07 06:18:45 -0800 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-03-07 06:18:45 -0800 |
| commit | 828959d89a641a9f633cc20e4488ec021eb9808c (patch) | |
| tree | ceee3ce1b7a8c3313c4cafbc708782628cf3c4b5 /drivers/gdisp/S6D1121/gdisp_lld.c | |
| parent | 8aaf96d379df2f70abf96b03c863b6e6d12a09bf (diff) | |
| parent | e315480c713cb6889c8329788d3dd69c9fbc6cf4 (diff) | |
| download | uGFX-828959d89a641a9f633cc20e4488ec021eb9808c.tar.gz uGFX-828959d89a641a9f633cc20e4488ec021eb9808c.tar.bz2 uGFX-828959d89a641a9f633cc20e4488ec021eb9808c.zip | |
Merge pull request #19 from Tectu/master
Merge Textu Changes
Diffstat (limited to 'drivers/gdisp/S6D1121/gdisp_lld.c')
| -rw-r--r-- | drivers/gdisp/S6D1121/gdisp_lld.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c index c4523999..982e788b 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld.c +++ b/drivers/gdisp/S6D1121/gdisp_lld.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu <joel@unormal.org> This file is part of ChibiOS/GFX. @@ -74,7 +74,7 @@ #define delay(us) chThdSleepMicroseconds(us) #define delayms(ms) chThdSleepMilliseconds(ms) -static __inline void set_cursor(coord_t x, coord_t y) { +static inline void set_cursor(coord_t x, coord_t y) { /* R20h - 8 bit * R21h - 9 bit */ @@ -99,7 +99,7 @@ static __inline void set_cursor(coord_t x, coord_t y) { } } -static __inline void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) { +static inline void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) { /* HSA / HEA are 8 bit * VSA / VEA are 9 bit * use masks 0x00FF and 0x01FF to enforce this @@ -137,7 +137,7 @@ static __inline void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) set_cursor(x, y); } -static __inline void reset_viewport(void) { +static inline void reset_viewport(void) { switch(GDISP.Orientation) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: |