diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 20:00:34 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 20:00:34 +0100 |
| commit | d299756abaf5813850ec732be3d71d96b9fa32fc (patch) | |
| tree | 7133e28e8134af1daaa269785cb2d382d88fe7ba /src/gadc | |
| parent | e50b495c48648bf53621a4afc63682579387ba4f (diff) | |
| parent | d2de6c351785f323fd4b2a4e337a95bda4c9a626 (diff) | |
| download | uGFX-d299756abaf5813850ec732be3d71d96b9fa32fc.tar.gz uGFX-d299756abaf5813850ec732be3d71d96b9fa32fc.tar.bz2 uGFX-d299756abaf5813850ec732be3d71d96b9fa32fc.zip | |
Merge branch 'master' into gfile
Diffstat (limited to 'src/gadc')
| -rw-r--r-- | src/gadc/gadc.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c index e297ef7e..c9a4a31b 100644 --- a/src/gadc/gadc.c +++ b/src/gadc/gadc.c @@ -236,7 +236,8 @@ void GADC_ISR_ErrorI(ADCDriver *adcp, adcerror_t err) { } /* Our module initialiser */ -void _gadcInit(void) { +void _gadcInit(void) +{ gadc_lld_init(); gfxSemInit(&gadcsem, GADC_MAX_LOWSPEED_DEVICES, GADC_MAX_LOWSPEED_DEVICES); gfxMutexInit(&gadcmutex); @@ -246,6 +247,19 @@ void _gadcInit(void) { #endif } +void _gadcDeinit(void) +{ + /* commented stuff is ToDo */ + + // gadc_lld_deinit(); + gfxSemDestroy(&gadcsem); + gfxMutexDestroy(&gadcmutex); + gtimerDeinit(&LowSpeedGTimer); + #if GFX_USE_GEVENT + gtimerDeinit(&HighSpeedGTimer); + #endif +} + static inline void StartADC(bool_t onNoHS) { gfxSystemLock(); if (!(gflags & GADC_GFLG_ISACTIVE) || (onNoHS && !curlsdev)) |