- init: align init/exit function names

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-12-26 00:34:00 +01:00
committed by Thilo Graf
parent 3da91b1463
commit 77d5cafd32
10 changed files with 20 additions and 20 deletions

View File

@@ -11,12 +11,12 @@ typedef void (*cs_messenger) (unsigned int msg, unsigned int data);
inline void cs_api_init() inline void cs_api_init()
{ {
init_td_api(); hal_api_init();
}; };
inline void cs_api_exit() inline void cs_api_exit()
{ {
shutdown_td_api(); hal_api_exit();
}; };
#define cs_malloc_uncached malloc #define cs_malloc_uncached malloc

View File

@@ -1,5 +1,5 @@
#ifndef __init__ #ifndef __init__
#define __init__ #define __init__
void init_td_api(); void hal_api_init();
void shutdown_td_api(); void hal_api_exit();
#endif // __init__ #endif // __init__

View File

@@ -18,7 +18,7 @@
static bool initialized = false; static bool initialized = false;
void init_td_api() void hal_api_init()
{ {
if (!initialized) if (!initialized)
hal_debug_init(); hal_debug_init();
@@ -42,7 +42,7 @@ void init_td_api()
hal_info("%s end\n", __FUNCTION__); hal_info("%s end\n", __FUNCTION__);
} }
void shutdown_td_api() void hal_api_exit()
{ {
hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized);
initialized = false; initialized = false;

View File

@@ -8,7 +8,7 @@
static bool initialized = false; static bool initialized = false;
void init_td_api() void hal_api_init()
{ {
if (!initialized) if (!initialized)
hal_debug_init(); hal_debug_init();
@@ -16,7 +16,7 @@ void init_td_api()
initialized = true; initialized = true;
} }
void shutdown_td_api() void hal_api_exit()
{ {
hal_info("%s, initialized = %d\n", __func__, (int)initialized); hal_info("%s, initialized = %d\n", __func__, (int)initialized);
initialized = false; initialized = false;

View File

@@ -19,7 +19,7 @@
static bool initialized = false; static bool initialized = false;
void init_td_api() void hal_api_init()
{ {
if (!initialized) if (!initialized)
hal_debug_init(); hal_debug_init();
@@ -48,7 +48,7 @@ void init_td_api()
hal_info("%s end\n", __FUNCTION__); hal_info("%s end\n", __FUNCTION__);
} }
void shutdown_td_api() void hal_api_exit()
{ {
hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized);
initialized = false; initialized = false;

View File

@@ -13,7 +13,7 @@ static bool initialized = false;
GLFramebuffer *glfb = NULL; GLFramebuffer *glfb = NULL;
bool HAL_nodec = false; bool HAL_nodec = false;
void init_td_api() void hal_api_init()
{ {
if (!initialized) if (!initialized)
hal_debug_init(); hal_debug_init();
@@ -47,7 +47,7 @@ void init_td_api()
initialized = true; initialized = true;
} }
void shutdown_td_api() void hal_api_exit()
{ {
hal_info("%s, initialized = %d\n", __func__, (int)initialized); hal_info("%s, initialized = %d\n", __func__, (int)initialized);
if (glfb) if (glfb)

View File

@@ -188,7 +188,7 @@ void Input::run()
static Input *thread = NULL; static Input *thread = NULL;
void init_td_api() void hal_api_init()
{ {
if (!initialized) if (!initialized)
hal_debug_init(); hal_debug_init();
@@ -218,7 +218,7 @@ void init_td_api()
initialized = true; initialized = true;
} }
void shutdown_td_api() void hal_api_exit()
{ {
hal_info("%s, initialized = %d\n", __func__, (int)initialized); hal_info("%s, initialized = %d\n", __func__, (int)initialized);
if (glfb) if (glfb)

View File

@@ -262,7 +262,7 @@ void stop_inmux_thread(void)
static bool initialized = false; static bool initialized = false;
void init_td_api() void hal_api_init()
{ {
if (!initialized) if (!initialized)
hal_debug_init(); hal_debug_init();
@@ -298,7 +298,7 @@ void init_td_api()
hal_info("%s end\n", __FUNCTION__); hal_info("%s end\n", __FUNCTION__);
} }
void shutdown_td_api() void hal_api_exit()
{ {
hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized);
if (initialized) { if (initialized) {

View File

@@ -18,7 +18,7 @@ extern GLFramebuffer *glfb;
int main(int argc __attribute__((unused)), char ** argv __attribute__((unused))) int main(int argc __attribute__((unused)), char ** argv __attribute__((unused)))
{ {
init_td_api(); hal_api_init();
#if HAVE_GENERIC_HARDWARE #if HAVE_GENERIC_HARDWARE
int available = glfb->getOSDBuffer()->size(); /* allocated in glfb constructor */ int available = glfb->getOSDBuffer()->size(); /* allocated in glfb constructor */
fb_pixel_t *lfb = reinterpret_cast<fb_pixel_t*>(glfb->getOSDBuffer()->data()); fb_pixel_t *lfb = reinterpret_cast<fb_pixel_t*>(glfb->getOSDBuffer()->data());
@@ -41,6 +41,6 @@ int main(int argc __attribute__((unused)), char ** argv __attribute__((unused)))
break; break;
} }
}; };
shutdown_td_api(); hal_api_exit();
return 0; return 0;
} }

View File

@@ -119,7 +119,7 @@ static void rc_init()
hal_info("%s rc_addr=0x%02hx\n", __FUNCTION__, rc_addr); hal_info("%s rc_addr=0x%02hx\n", __FUNCTION__, rc_addr);
} }
void init_td_api() void hal_api_init()
{ {
if (!initialized) if (!initialized)
hal_debug_init(); hal_debug_init();
@@ -147,7 +147,7 @@ void init_td_api()
hal_info("%s end\n", __FUNCTION__); hal_info("%s end\n", __FUNCTION__);
} }
void shutdown_td_api() void hal_api_exit()
{ {
hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized);
if (initialized) if (initialized)