diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-02-28 13:06:15 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-02-28 13:06:15 +1000 |
| commit | dc4f706132dce07c6a394446157c6a46f5fd3c71 (patch) | |
| tree | a858c39e578b1aa77cfb448d456faee2e2b24009 /src | |
| parent | 73ba2778abef0d010eb9824161eb97edeed52ee6 (diff) | |
| download | uGFX-dc4f706132dce07c6a394446157c6a46f5fd3c71.tar.gz uGFX-dc4f706132dce07c6a394446157c6a46f5fd3c71.tar.bz2 uGFX-dc4f706132dce07c6a394446157c6a46f5fd3c71.zip | |
GFILE was not being initialised properly.
Added GFX_OS_EXTRA_INIT_FUNCTION and GFX_OS_EXTRA_DEINIT_FUNCTION macro's to enable special initialisation to occur being anything else happens.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gfx.c | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -20,10 +20,20 @@ static bool_t initDone = FALSE; /* These init functions are defined by each module but not published */ extern void _gosInit(void); extern void _gosDeinit(void); +#ifdef GFX_OS_EXTRA_INIT_FUNCTION + extern void GFX_OS_EXTRA_INIT_FUNCTION(void); +#endif +#ifdef GFX_OS_EXTRA_DEINIT_FUNCTION + extern void GFX_OS_EXTRA_DEINIT_FUNCTION(void); +#endif #if GFX_USE_GDRIVER extern void _gdriverInit(void); extern void _gdriverDeinit(void); #endif +#if GFX_USE_GFILE + extern void _gfileInit(void); + extern void _gfileDeinit(void); +#endif #if GFX_USE_GDISP extern void _gdispInit(void); extern void _gdispDeinit(void); @@ -71,6 +81,9 @@ void gfxInit(void) // These must be initialised in the order of their dependancies _gosInit(); + #ifdef GFX_OS_EXTRA_INIT_FUNCTION + GFX_OS_EXTRA_INIT_FUNCTION(); + #endif #if GFX_USE_GQUEUE _gqueueInit(); #endif @@ -86,6 +99,9 @@ void gfxInit(void) #if GFX_USE_GDRIVER _gdriverInit(); #endif + #if GFX_USE_GFILE + _gfileInit(); + #endif #if GFX_USE_GDISP _gdispInit(); #endif @@ -125,6 +141,9 @@ void gfxDeinit(void) #if GFX_USE_GDISP _gdispDeinit(); #endif + #if GFX_USE_GFILE + _gfileDeinit(); + #endif #if GFX_USE_GDRIVER _gdriverDeinit(); #endif @@ -140,5 +159,8 @@ void gfxDeinit(void) #if GFX_USE_GQUEUE _gqueueDeinit(); #endif + #ifdef GFX_OS_EXTRA_DEINIT_FUNCTION + GFX_OS_EXTRA_DEINIT_FUNCTION(); + #endif _gosDeinit(); } |