diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:02:23 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:02:23 +1000 |
| commit | d0b363bb125d0913246796a597ecea4aeb8d578b (patch) | |
| tree | 66f69c1a83b7c6a4407964ded39dcec4b1dc91c1 /src/gtimer | |
| parent | a6c22fc364c25e8673488f0f5c36e3538546d898 (diff) | |
| parent | d869d9b3b80cb9ab2314840b2fa274e89e5342db (diff) | |
| download | uGFX-d0b363bb125d0913246796a597ecea4aeb8d578b.tar.gz uGFX-d0b363bb125d0913246796a597ecea4aeb8d578b.tar.bz2 uGFX-d0b363bb125d0913246796a597ecea4aeb8d578b.zip | |
Merge branch 'master' into gfile
Diffstat (limited to 'src/gtimer')
| -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) {
|