uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Make the uGFXMain() prototype always available

Browse Source
This commit is contained in:
inmarket 2017-03-04 17:35:17 +10:00
parent 3a0e49dabc
commit 7826664969
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx.h
View File

@ -229,6 +229,7 @@ extern "C" {
* @note If you define GFX_OS_EXTRA_DEINIT_FUNCTION in your gfxconf.h file the macro is the * @note If you define GFX_OS_EXTRA_DEINIT_FUNCTION in your gfxconf.h file the macro is the
* name of a void function with no parameters that is called immediately before * name of a void function with no parameters that is called immediately before
* operating system de-initialisation (as ugfx is exiting). * operating system de-initialisation (as ugfx is exiting).
* @note If GFX_OS_CALL_UGFXMAIN is set uGFXMain() is called after all initialisation is complete.
* *
* @api * @api
*/ */
@ -243,6 +244,17 @@ extern "C" {
*/ */
void gfxDeinit(void); void gfxDeinit(void);
#if GFX_OS_CALL_UGFXMAIN || defined(__DOXYGEN__)
/**
* @brief The function containing all the user uGFX application code.
*
* @note This is called by gfxInit() and is expected to never return.
* It is defined by the user.
*
* @pre GFX_OS_CALL_UGFXMAIN is GFXON
*/
void uGFXMain(void);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

3
src/gfx.c
View File

@ -78,9 +78,6 @@ extern void _gosDeinit(void);
extern void _gtransInit(void); extern void _gtransInit(void);
extern void _gtransDeinit(void); extern void _gtransDeinit(void);
#endif #endif
#if GFX_OS_CALL_UGFXMAIN
extern void uGFXMain(void);
#endif
void gfxInit(void) void gfxInit(void)
{ {

2
src/gos/gos_freertos.c
View File

@ -38,8 +38,6 @@ void _gosInit(void)
} }
#if !GFX_OS_NO_INIT && GFX_OS_CALL_UGFXMAIN #if !GFX_OS_NO_INIT && GFX_OS_CALL_UGFXMAIN
extern void uGFXMain(void);
static DECLARE_THREAD_FUNCTION(startUGFX_FreeRTOS, p) { static DECLARE_THREAD_FUNCTION(startUGFX_FreeRTOS, p) {
(void) p; (void) p;
uGFXMain(); uGFXMain();