diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-04-30 13:41:34 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-04-30 13:41:34 +0200 |
| commit | 33c721c009465dd30d4e96e055a051480c567b57 (patch) | |
| tree | 5a6744a79b7469d80bae474d4314b47d4cd6d44d /src/gfx.c | |
| parent | 58cf2d2b35542166f1a4e50a83bcf28ff33574a5 (diff) | |
| parent | a394e2c35dde67241bea69409bcae9f46dcfc089 (diff) | |
| download | uGFX-33c721c009465dd30d4e96e055a051480c567b57.tar.gz uGFX-33c721c009465dd30d4e96e055a051480c567b57.tar.bz2 uGFX-33c721c009465dd30d4e96e055a051480c567b57.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'src/gfx.c')
| -rw-r--r-- | src/gfx.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -48,6 +48,10 @@ extern void _gosDeinit(void); extern void _gaudioInit(void); extern void _gaudioDeinit(void); #endif +#if GFX_USE_GQUEUE + extern void _gqueueInit(void); + extern void _gqueueDeinit(void); +#endif #if GFX_USE_GMISC extern void _gmiscInit(void); extern void _gmiscDeinit(void); @@ -63,6 +67,9 @@ void gfxInit(void) // These must be initialised in the order of their dependancies _gosInit(); + #if GFX_USE_GQUEUE + _gqueueInit(); + #endif #if GFX_USE_GMISC _gmiscInit(); #endif @@ -118,7 +125,10 @@ void gfxDeinit(void) _geventDeinit(); #endif #if GFX_USE_GMISC - _gmiscInit(); + _gmiscDeinit(); + #endif + #if GFX_USE_GQUEUE + _gqueueDeinit(); #endif _gosDeinit(); } |