diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:02:05 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:02:05 +1000 |
| commit | 479660a23dee99641aa5d677f86fb81962bfbbad (patch) | |
| tree | 3a0997a7cc090510a2298ae0d615662ea9c373b9 /src/gtimer/gtimer.c | |
| parent | 9774c86d0e8c171f414eecdf6b1b3f9598986b69 (diff) | |
| parent | d869d9b3b80cb9ab2314840b2fa274e89e5342db (diff) | |
| download | uGFX-479660a23dee99641aa5d677f86fb81962bfbbad.tar.gz uGFX-479660a23dee99641aa5d677f86fb81962bfbbad.tar.bz2 uGFX-479660a23dee99641aa5d677f86fb81962bfbbad.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'src/gtimer/gtimer.c')
| -rw-r--r-- | src/gtimer/gtimer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c index 3f772e39..3e0b6966 100644 --- a/src/gtimer/gtimer.c +++ b/src/gtimer/gtimer.c @@ -128,6 +128,7 @@ void _gtimerDeinit(void) {
gfxSemDestroy(&waitsem);
gfxMutexDestroy(&mutex);
+ // Need to destroy GTimer thread here
}
void gtimerInit(GTimer* pt)
@@ -137,7 +138,7 @@ void gtimerInit(GTimer* pt) void gtimerDeinit(GTimer* pt)
{
- (void)pt;
+ gtimerStop(pt);
}
void gtimerStart(GTimer *pt, GTimerFunction fn, void *param, bool_t periodic, delaytime_t millisec) {
|