diff options
| -rw-r--r-- | include/gtimer/gtimer.h | 15 | ||||
| -rw-r--r-- | src/gadc/gadc.c | 4 | ||||
| -rw-r--r-- | src/gtimer/gtimer.c | 8 |
3 files changed, 21 insertions, 6 deletions
diff --git a/include/gtimer/gtimer.h b/include/gtimer/gtimer.h index 14de352f..06072c7c 100644 --- a/include/gtimer/gtimer.h +++ b/include/gtimer/gtimer.h @@ -68,13 +68,22 @@ extern "C" { #endif /** - * @brief Initialise a timer. + * @brief Initialise a timer * - * @param[in] pt pointer to a GTimer structure + * @param[in] pt Pointer to a GTimer structure * * @api */ -void gtimerInit(GTimer *pt); +void gtimerInit(GTimer* pt); + +/** + * @brief Deinitialise a timer + * + * @param[in] pt Pointer to a GTimer structure + * + * @api + */ +void gtimerDeinit(GTimer* pt); /** * @brief Set a timer going or alter its properties if it is already going. diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c index 25d5f9bd..c9a4a31b 100644 --- a/src/gadc/gadc.c +++ b/src/gadc/gadc.c @@ -254,9 +254,9 @@ void _gadcDeinit(void) // gadc_lld_deinit(); gfxSemDestroy(&gadcsem); gfxMutexDestroy(&gadcmutex); - //gtimerDeinit(&LowSpeedGTimer); + gtimerDeinit(&LowSpeedGTimer); #if GFX_USE_GEVENT - //gtimerDeinit(&HighSpeedGTimer); + gtimerDeinit(&HighSpeedGTimer); #endif } diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c index 311176fa..3f772e39 100644 --- a/src/gtimer/gtimer.c +++ b/src/gtimer/gtimer.c @@ -130,10 +130,16 @@ void _gtimerDeinit(void) gfxMutexDestroy(&mutex);
}
-void gtimerInit(GTimer *pt) {
+void gtimerInit(GTimer* pt)
+{
pt->flags = 0;
}
+void gtimerDeinit(GTimer* pt)
+{
+ (void)pt;
+}
+
void gtimerStart(GTimer *pt, GTimerFunction fn, void *param, bool_t periodic, delaytime_t millisec) {
gfxMutexEnter(&mutex);
|