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/gadc/gadc.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/gadc/gadc.c')
| -rw-r--r-- | src/gadc/gadc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c index 8a3cfb8d..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 <joel@unormal.org> This file is part of ChibiOS/GFX. @@ -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(); |