aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gadc/gadc.c6
-rw-r--r--src/ginput/mouse.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c
index 8a3cfb8d..40b901ae 100644
--- a/src/gadc/gadc.c
+++ b/src/gadc/gadc.c
@@ -99,7 +99,7 @@ static struct lsdev {
static struct lsdev *curlsdev;
/* Find the next conversion to activate */
-static __inline void FindNextConversionI(void) {
+static inline void FindNextConversionI(void) {
if (curlsdev) {
/**
* Now we have done a low speed conversion - start looking for the next conversion
@@ -251,14 +251,14 @@ void GADC_ISR_ErrorI(ADCDriver *adcp, adcerror_t err) {
FindNextConversionI();
}
-static __inline void DoInit(void) {
+static inline void DoInit(void) {
if (!(gflags & GADC_GFLG_INITDONE)) {
gflags |= GADC_GFLG_INITDONE;
gadc_lld_init();
}
}
-static __inline void StartADC(bool_t onNoHS) {
+static inline void StartADC(bool_t onNoHS) {
chSysLock();
if (!(gflags & GADC_GFLG_ISACTIVE) || (onNoHS && !curlsdev))
FindNextConversionI();
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c
index 94734888..89fc4353 100644
--- a/src/ginput/mouse.c
+++ b/src/ginput/mouse.c
@@ -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 */