diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:23:53 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:23:53 +1000 |
| commit | f26581dc7e85f77393143a44c0c3eb3eef0da8b4 (patch) | |
| tree | 9a83c5eaf1abe2cc61b216012f997e6891840a19 /include | |
| parent | b6daaabf32bf2092689e0732ca4486f25e80317f (diff) | |
| parent | d869d9b3b80cb9ab2314840b2fa274e89e5342db (diff) | |
| download | uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.gz uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.bz2 uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'include')
| -rw-r--r-- | include/gfx.h | 11 | ||||
| -rw-r--r-- | include/gtimer/gtimer.h | 15 |
2 files changed, 21 insertions, 5 deletions
diff --git a/include/gfx.h b/include/gfx.h index 3a10103f..d261a6ce 100644 --- a/include/gfx.h +++ b/include/gfx.h @@ -204,8 +204,15 @@ extern "C" { */ void gfxInit(void); - /* Compatibility for old programs */ - void DEPRECATED("Use gfxInit() instead") gdispInit(void); + /** + * @brief The one call to end it all + * + * @note This will deinitialise each sub-system that has been turned on. + * @note Do not call this without a previous @p gfxInit(); + * + * @api + */ + void gfxDeinit(void); #ifdef __cplusplus } diff --git a/include/gtimer/gtimer.h b/include/gtimer/gtimer.h index 14de352f..06072c7c 100644 --- a/include/gtimer/gtimer.h +++ b/include/gtimer/gtimer.h @@ -68,13 +68,22 @@ extern "C" { #endif /** - * @brief Initialise a timer. + * @brief Initialise a timer * - * @param[in] pt pointer to a GTimer structure + * @param[in] pt Pointer to a GTimer structure * * @api */ -void gtimerInit(GTimer *pt); +void gtimerInit(GTimer* pt); + +/** + * @brief Deinitialise a timer + * + * @param[in] pt Pointer to a GTimer structure + * + * @api + */ +void gtimerDeinit(GTimer* pt); /** * @brief Set a timer going or alter its properties if it is already going. |