diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:28:42 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:28:42 +1000 |
| commit | 00aeab86eb311f57d026931499ae5935c00857b1 (patch) | |
| tree | 44fe653eabd0362e2f97fbafdbdf96ffb4de08d2 /drivers/gdisp/RA8875/gdisp_lld_RA8875.c | |
| parent | 29251f33bd106cfdc317fa00c10ecfb3a64fcc2d (diff) | |
| parent | 48a9d334b7a5b462b32c17a5fde07159deb4c280 (diff) | |
| download | uGFX-00aeab86eb311f57d026931499ae5935c00857b1.tar.gz uGFX-00aeab86eb311f57d026931499ae5935c00857b1.tar.bz2 uGFX-00aeab86eb311f57d026931499ae5935c00857b1.zip | |
Merge branch 'master' into Keil
Diffstat (limited to 'drivers/gdisp/RA8875/gdisp_lld_RA8875.c')
| -rw-r--r-- | drivers/gdisp/RA8875/gdisp_lld_RA8875.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c index 0da233db..a962f2f2 100644 --- a/drivers/gdisp/RA8875/gdisp_lld_RA8875.c +++ b/drivers/gdisp/RA8875/gdisp_lld_RA8875.c @@ -43,13 +43,13 @@ #define write_reg16(g, reg, data) { write_index(g, reg); write_data(g, data); write_index(g, reg+1); write_data(g, (data)>>8); } #define write_reg8x2(g, reg, d1, d2) { write_index(g, reg); write_data(g, d1); write_data(g, d2); } -static inline void set_cursor(GDisplay *g) { +static GFXINLINE void set_cursor(GDisplay *g) { write_reg16(g, 0x46, g->p.x); write_reg16(g, 0x48, g->p.y); write_index(g, 0x02); } -static inline void set_viewport(GDisplay* g) { +static GFXINLINE void set_viewport(GDisplay* g) { write_reg16(g, 0x30, g->p.x); //HSAW0 & HSAW1 write_reg16(g, 0x34, g->p.x+g->p.cx-1); //HEAW0 & HEAW1 write_reg16(g, 0x32, g->p.y); //VSAW0 & VSAW1 @@ -58,7 +58,7 @@ static inline void set_viewport(GDisplay* g) { // On this controller the back-light is controlled by the controllers internal PWM // which is why it is in this file rather than the board file. -static inline void set_backlight(GDisplay* g, uint8_t percent) { +static GFXINLINE void set_backlight(GDisplay* g, uint8_t percent) { uint8_t temp; //Work in progress: the RA8875 has a built-in PWM, its output can |