diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 19:56:05 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 19:56:05 +0100 |
| commit | 9774c86d0e8c171f414eecdf6b1b3f9598986b69 (patch) | |
| tree | 69ede6a9893ea9f157719ba2d9dfc84d05e4c588 /src/gfx.c | |
| parent | d646a43b6eb9e0cfb8abd37cf56344b8f65619a5 (diff) | |
| parent | d2de6c351785f323fd4b2a4e337a95bda4c9a626 (diff) | |
| download | uGFX-9774c86d0e8c171f414eecdf6b1b3f9598986b69.tar.gz uGFX-9774c86d0e8c171f414eecdf6b1b3f9598986b69.tar.bz2 uGFX-9774c86d0e8c171f414eecdf6b1b3f9598986b69.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'src/gfx.c')
| -rw-r--r-- | src/gfx.c | 58 |
1 files changed, 48 insertions, 10 deletions
@@ -15,47 +15,50 @@ #include "gfx.h" -void DEPRECATED("Use gfxInit() instead") gdispInit() { gfxInit(); } - /* These init functions are defined by each module but not published */ extern void _gosInit(void); +extern void _gosDeinit(void); #if GFX_USE_GDISP extern void _gdispInit(void); + extern void _gdispDeinit(void); #endif #if GFX_USE_GWIN extern void _gwinInit(void); + extern void _gwinDeinit(void); #endif #if GFX_USE_GEVENT extern void _geventInit(void); + extern void _geventDeinit(void); #endif #if GFX_USE_GTIMER extern void _gtimerInit(void); + extern void _gtimerDeinit(void); #endif #if GFX_USE_GINPUT extern void _ginputInit(void); + extern void _ginputDeinit(void); #endif #if GFX_USE_GADC extern void _gadcInit(void); + extern void _gadcDeinit(void); #endif #if GFX_USE_GAUDIN extern void _gaudinInit(void); + extern void _gaudinDeinit(void); #endif #if GFX_USE_GAUDOUT extern void _gaudoutInit(void); + extern void _gaudoutDeinit(void); #endif #if GFX_USE_GMISC extern void _gmiscInit(void); + extern void _gmiscDeinit(void); #endif -void gfxInit(void) { - static bool_t initDone = FALSE; - - /* Ensure we only initialise once */ - if (initDone) - return; - initDone = TRUE; +void gfxInit(void) +{ + // These must be initialised in the order of their dependancies - /* These must be initialised in the order of their dependancies */ _gosInit(); #if GFX_USE_GMISC _gmiscInit(); @@ -85,3 +88,38 @@ void gfxInit(void) { _gaudoutInit(); #endif } + +void gfxDeinit(void) +{ + // We deinitialise the opposit way as we initialised + + #if GFX_USE_GAUDOUT + _gaudoutDeinit(); + #endif + #if GFX_USE_GAUDIN + _gaoudinDeinit(); + #endif + #if GFX_USE_GADC + _gadcDeinit(); + #endif + #if GFX_USE_GINPUT + _ginputDeinit(); + #endif + #if GFX_USE_GWIN + _gwinDeinit(); + #endif + #if GFX_USE_GDISP + _gdispDeinit(); + #endif + #if GFX_USE_GTIMER + _gtimerDeinit(); + #endif + #if GFX_USE_GEVENT + _geventDeinit(); + #endif + #if GFX_USE_GMISC + _gmiscInit(); + #endif + _gosDeinit(); +} + |