diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:24:49 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-23 18:24:49 +1000 |
| commit | 48a9d334b7a5b462b32c17a5fde07159deb4c280 (patch) | |
| tree | 0f7032657b98730750a74ba6d09d01f2de119d4d /src | |
| parent | 17c940423ba2159b20965ea6d004386bc392aa68 (diff) | |
| download | uGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.tar.gz uGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.tar.bz2 uGFX-48a9d334b7a5b462b32c17a5fde07159deb4c280.zip | |
Replace all inline definitions with GFXINLINE
Diffstat (limited to 'src')
| -rw-r--r-- | src/gdisp/gdisp.c | 8 | ||||
| -rw-r--r-- | src/ginput/ginput_mouse.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 27b52e92..ffede502 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -69,7 +69,7 @@ GDisplay *GDISP; /*==========================================================================*/ #if GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE - static INLINE void setglobalwindow(GDisplay *g) { + static GFXINLINE void setglobalwindow(GDisplay *g) { coord_t x, y; x = g->p.x; y = g->p.y; g->p.x = g->p.y = 0; @@ -105,7 +105,7 @@ GDisplay *GDISP; // Parameters: x,y // Alters: cx, cy (if using streaming) // Does not clip -static INLINE void drawpixel(GDisplay *g) { +static GFXINLINE void drawpixel(GDisplay *g) { // Best is hardware accelerated pixel draw #if GDISP_HARDWARE_DRAWPIXEL @@ -152,7 +152,7 @@ static INLINE void drawpixel(GDisplay *g) { // Parameters: x,y // Alters: cx, cy (if using streaming) #if NEED_CLIPPING - static INLINE void drawpixel_clip(GDisplay *g) { + static GFXINLINE void drawpixel_clip(GDisplay *g) { #if GDISP_HARDWARE_CLIP == HARDWARE_AUTODETECT if (!gvmt(g)->setclip) #endif @@ -171,7 +171,7 @@ static INLINE void drawpixel(GDisplay *g) { // Alters: nothing // Note: This is not clipped // Resets the streaming area if GDISP_HARDWARE_STREAM_WRITE and GDISP_HARDWARE_STREAM_POS is set. -static INLINE void fillarea(GDisplay *g) { +static GFXINLINE void fillarea(GDisplay *g) { // Best is hardware accelerated area fill #if GDISP_HARDWARE_FILLS diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c index 83cd7db4..275b9ba4 100644 --- a/src/ginput/ginput_mouse.c +++ b/src/ginput/ginput_mouse.c @@ -55,7 +55,7 @@ static GTIMER_DECL(MouseTimer); #if !GINPUT_TOUCH_NOCALIBRATE #include <string.h> // Required for memcpy - static INLINE void CalibrationTransform(GMouseReading *pt, const GMouseCalibration *c) { + static GFXINLINE void CalibrationTransform(GMouseReading *pt, const GMouseCalibration *c) { pt->x = (coord_t) (c->ax * pt->x + c->bx * pt->y + c->cx); pt->y = (coord_t) (c->ay * pt->x + c->by * pt->y + c->cy); } @@ -330,7 +330,7 @@ static void MousePoll(void *param) { #error "GINPUT: GFX_USE_GDISP must be defined when calibration is required" #endif - static INLINE void CalibrationCrossDraw(GMouse *m, const point *pp) { + static GFXINLINE void CalibrationCrossDraw(GMouse *m, const point *pp) { gdispGDrawLine(m->display, pp->x-CALIBRATION_CROSS_RADIUS, pp->y, pp->x-CALIBRATION_CROSS_INNERGAP, pp->y, CALIBRATION_CROSS_COLOR1); gdispGDrawLine(m->display, pp->x+CALIBRATION_CROSS_INNERGAP, pp->y, pp->x+CALIBRATION_CROSS_RADIUS, pp->y, CALIBRATION_CROSS_COLOR1); gdispGDrawLine(m->display, pp->x, pp->y-CALIBRATION_CROSS_RADIUS, pp->x, pp->y-CALIBRATION_CROSS_INNERGAP, CALIBRATION_CROSS_COLOR1); @@ -345,11 +345,11 @@ static void MousePoll(void *param) { gdispGDrawLine(m->display, pp->x+CALIBRATION_CROSS_RADIUS, pp->y-CALIBRATION_CROSS_RADIUS, pp->x+CALIBRATION_CROSS_RADIUS, pp->y-CALIBRATION_CROSS_RADIUS/2, CALIBRATION_CROSS_COLOR2); } - static INLINE void CalibrationCrossClear(GMouse *m, const point *pp) { + static GFXINLINE void CalibrationCrossClear(GMouse *m, const point *pp) { gdispGFillArea(m->display, pp->x - CALIBRATION_CROSS_RADIUS, pp->y - CALIBRATION_CROSS_RADIUS, CALIBRATION_CROSS_RADIUS*2+1, CALIBRATION_CROSS_RADIUS*2+1, CALIBRATION_BACKGROUND); } - static INLINE void CalibrationCalculate(GMouse *m, const point *cross, const point *points) { + static GFXINLINE void CalibrationCalculate(GMouse *m, const point *cross, const point *points) { float dx; coord_t c0, c1, c2; (void) m; |