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 /src/ginput/mouse.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 'src/ginput/mouse.c')
| -rw-r--r-- | src/ginput/mouse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index 94734888..4ad32359 100644 --- a/src/ginput/mouse.c +++ b/src/ginput/mouse.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.
@@ -88,7 +88,7 @@ static struct MouseConfig_t { } MouseConfig;
#if GINPUT_MOUSE_NEED_CALIBRATION
- static __inline void _tsDrawCross(const MousePoint *pp) {
+ static inline void _tsDrawCross(const MousePoint *pp) {
gdispDrawLine(pp->x-15, pp->y, pp->x-2, pp->y, White);
gdispDrawLine(pp->x+2, pp->y, pp->x+15, pp->y, White);
gdispDrawLine(pp->x, pp->y-15, pp->x, pp->y-2, White);
@@ -107,16 +107,16 @@ static struct MouseConfig_t { gdispDrawLine(pp->x+15, pp->y-15, pp->x+15, pp->y-7, RGB2COLOR(184,158,131));
}
- static __inline void _tsClearCross(const MousePoint *pp) {
+ static inline void _tsClearCross(const MousePoint *pp) {
gdispFillArea(pp->x - 15, pp->y - 15, 42, 42, Blue);
}
- static __inline void _tsTransform(MouseReading *pt, const Calibration *c) {
+ static inline void _tsTransform(MouseReading *pt, const Calibration *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);
}
- static __inline void _tsDo3PointCalibration(const MousePoint *cross, const MousePoint *points, Calibration *c) {
+ static inline void _tsDo3PointCalibration(const MousePoint *cross, const MousePoint *points, Calibration *c) {
float dx, dx0, dx1, dx2, dy0, dy1, dy2;
/* Compute all the required determinants */
|