From b91e61957304aadb5af050740b89bb400f2a3983 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 4 Mar 2013 23:50:21 +0100 Subject: __inline becomes inline because most compilers dont like the prefix --- src/gadc/gadc.c | 6 +++--- src/ginput/mouse.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') 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 */ -- cgit v1.2.3 From e315480c713cb6889c8329788d3dd69c9fbc6cf4 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Wed, 6 Mar 2013 23:11:01 +0100 Subject: updated copyright - 2013 --- src/gadc/gadc.c | 2 +- src/gaudin/gaudin.c | 2 +- src/gaudout/gaudout.c | 2 +- src/gdisp/fonts.c | 2 +- src/gdisp/gdisp.c | 2 +- src/gevent/gevent.c | 2 +- src/ginput/dial.c | 2 +- src/ginput/keyboard.c | 2 +- src/ginput/mouse.c | 2 +- src/ginput/toggle.c | 2 +- src/gmisc/arrayops.c | 2 +- src/gtimer/gtimer.c | 2 +- src/gwin/button.c | 2 +- src/gwin/console.c | 2 +- src/gwin/graph.c | 2 +- src/gwin/gwin.c | 2 +- src/tdisp/tdisp.c | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c index 40b901ae..183b9923 100644 --- a/src/gadc/gadc.c +++ b/src/gadc/gadc.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 + ChibiOS/GFX - Copyright (C) 2012, 2013, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gaudin/gaudin.c b/src/gaudin/gaudin.c index 4ce04132..2fbe7a47 100644 --- a/src/gaudin/gaudin.c +++ b/src/gaudin/gaudin.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gaudout/gaudout.c b/src/gaudout/gaudout.c index af8499dc..5c2e0657 100644 --- a/src/gaudout/gaudout.c +++ b/src/gaudout/gaudout.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gdisp/fonts.c b/src/gdisp/fonts.c index 59293359..d69d6de0 100644 --- a/src/gdisp/fonts.c +++ b/src/gdisp/fonts.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 620b3c0b..8cccad29 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gevent/gevent.c b/src/gevent/gevent.c index f6d45f1a..b93f1ea8 100644 --- a/src/gevent/gevent.c +++ b/src/gevent/gevent.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/ginput/dial.c b/src/ginput/dial.c index a447d8bc..60bc9ae8 100644 --- a/src/ginput/dial.c +++ b/src/ginput/dial.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/ginput/keyboard.c b/src/ginput/keyboard.c index 56ff5e8a..145b66f1 100644 --- a/src/ginput/keyboard.c +++ b/src/ginput/keyboard.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index 89fc4353..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 This file is part of ChibiOS/GFX. diff --git a/src/ginput/toggle.c b/src/ginput/toggle.c index 4401e295..5761279b 100644 --- a/src/ginput/toggle.c +++ b/src/ginput/toggle.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gmisc/arrayops.c b/src/gmisc/arrayops.c index 6eeb0e75..8b2135a0 100644 --- a/src/gmisc/arrayops.c +++ b/src/gmisc/arrayops.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c index 76dd57e2..e1f6bb8f 100644 --- a/src/gtimer/gtimer.c +++ b/src/gtimer/gtimer.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gwin/button.c b/src/gwin/button.c index a558dec0..43bc80c6 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gwin/console.c b/src/gwin/console.c index 9be7ee34..6720e6b3 100644 --- a/src/gwin/console.c +++ b/src/gwin/console.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gwin/graph.c b/src/gwin/graph.c index a9d20c4b..89876584 100644 --- a/src/gwin/graph.c +++ b/src/gwin/graph.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index e449b830..33637d89 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c index 8ef7e5c4..dab05cda 100644 --- a/src/tdisp/tdisp.c +++ b/src/tdisp/tdisp.c @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu This file is part of ChibiOS/GFX. -- cgit v1.2.3