diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-03-14 07:39:38 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-03-14 07:39:38 +1000 |
| commit | ad1d70d2957d95161c831e764c6f81c84c332458 (patch) | |
| tree | 639cc66297de6fe98e26608003871fe83406879a /src/gfx.c | |
| parent | b82448c3e23663a25a423402343fbca78253b80c (diff) | |
| parent | ea5a1b849df6e5085a92957ad387f9e653674415 (diff) | |
| download | uGFX-ad1d70d2957d95161c831e764c6f81c84c332458.tar.gz uGFX-ad1d70d2957d95161c831e764c6f81c84c332458.tar.bz2 uGFX-ad1d70d2957d95161c831e764c6f81c84c332458.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'src/gfx.c')
| -rw-r--r-- | src/gfx.c | 22 |
1 files changed, 6 insertions, 16 deletions
@@ -44,13 +44,9 @@ extern void _gosDeinit(void); 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); +#if GFX_USE_GAUDIO + extern void _gaudioInit(void); + extern void _gaudioDeinit(void); #endif #if GFX_USE_GMISC extern void _gmiscInit(void); @@ -88,11 +84,8 @@ void gfxInit(void) #if GFX_USE_GADC _gadcInit(); #endif - #if GFX_USE_GAUDIN - _gaudinInit(); - #endif - #if GFX_USE_GAUDOUT - _gaudoutInit(); + #if GFX_USE_GAUDIO + _gaudioInit(); #endif } @@ -103,11 +96,8 @@ void gfxDeinit(void) initDone = FALSE; // We deinitialise the opposite way as we initialised - #if GFX_USE_GAUDOUT - _gaudoutDeinit(); - #endif #if GFX_USE_GAUDIN - _gaudinDeinit(); + _gaudioDeinit(); #endif #if GFX_USE_GADC _gadcDeinit(); |