diff --git a/include/cs_api.h b/include/cs_api.h index 05b0c9f..8a3bdc4 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -11,12 +11,12 @@ typedef void (*cs_messenger) (unsigned int msg, unsigned int data); inline void cs_api_init() { - init_td_api(); + hal_api_init(); }; inline void cs_api_exit() { - shutdown_td_api(); + hal_api_exit(); }; #define cs_malloc_uncached malloc diff --git a/include/init.h b/include/init.h index 7ae0577..9203a65 100644 --- a/include/init.h +++ b/include/init.h @@ -1,5 +1,5 @@ #ifndef __init__ #define __init__ -void init_td_api(); -void shutdown_td_api(); +void hal_api_init(); +void hal_api_exit(); #endif // __init__ diff --git a/libarmbox/init.cpp b/libarmbox/init.cpp index bdb8b3f..367f6f4 100644 --- a/libarmbox/init.cpp +++ b/libarmbox/init.cpp @@ -18,7 +18,7 @@ static bool initialized = false; -void init_td_api() +void hal_api_init() { if (!initialized) hal_debug_init(); @@ -42,7 +42,7 @@ void init_td_api() hal_info("%s end\n", __FUNCTION__); } -void shutdown_td_api() +void hal_api_exit() { hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); initialized = false; diff --git a/libazbox/init.cpp b/libazbox/init.cpp index 1f6cce7..67c8d11 100644 --- a/libazbox/init.cpp +++ b/libazbox/init.cpp @@ -8,7 +8,7 @@ static bool initialized = false; -void init_td_api() +void hal_api_init() { if (!initialized) hal_debug_init(); @@ -16,7 +16,7 @@ void init_td_api() initialized = true; } -void shutdown_td_api() +void hal_api_exit() { hal_info("%s, initialized = %d\n", __func__, (int)initialized); initialized = false; diff --git a/libduckbox/init.cpp b/libduckbox/init.cpp index 738bd46..36c5303 100644 --- a/libduckbox/init.cpp +++ b/libduckbox/init.cpp @@ -19,7 +19,7 @@ static bool initialized = false; -void init_td_api() +void hal_api_init() { if (!initialized) hal_debug_init(); @@ -48,7 +48,7 @@ void init_td_api() hal_info("%s end\n", __FUNCTION__); } -void shutdown_td_api() +void hal_api_exit() { hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); initialized = false; diff --git a/libgeneric-pc/init.cpp b/libgeneric-pc/init.cpp index 8997ee5..1447eb3 100644 --- a/libgeneric-pc/init.cpp +++ b/libgeneric-pc/init.cpp @@ -13,7 +13,7 @@ static bool initialized = false; GLFramebuffer *glfb = NULL; bool HAL_nodec = false; -void init_td_api() +void hal_api_init() { if (!initialized) hal_debug_init(); @@ -47,7 +47,7 @@ void init_td_api() initialized = true; } -void shutdown_td_api() +void hal_api_exit() { hal_info("%s, initialized = %d\n", __func__, (int)initialized); if (glfb) diff --git a/libraspi/init.cpp b/libraspi/init.cpp index ce1521f..070d525 100644 --- a/libraspi/init.cpp +++ b/libraspi/init.cpp @@ -188,7 +188,7 @@ void Input::run() static Input *thread = NULL; -void init_td_api() +void hal_api_init() { if (!initialized) hal_debug_init(); @@ -218,7 +218,7 @@ void init_td_api() initialized = true; } -void shutdown_td_api() +void hal_api_exit() { hal_info("%s, initialized = %d\n", __func__, (int)initialized); if (glfb) diff --git a/libspark/init.cpp b/libspark/init.cpp index fac983a..3730a93 100644 --- a/libspark/init.cpp +++ b/libspark/init.cpp @@ -262,7 +262,7 @@ void stop_inmux_thread(void) static bool initialized = false; -void init_td_api() +void hal_api_init() { if (!initialized) hal_debug_init(); @@ -298,7 +298,7 @@ void init_td_api() hal_info("%s end\n", __FUNCTION__); } -void shutdown_td_api() +void hal_api_exit() { hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); if (initialized) { diff --git a/libtest.cpp b/libtest.cpp index d8ecce4..fab6ead 100644 --- a/libtest.cpp +++ b/libtest.cpp @@ -18,7 +18,7 @@ extern GLFramebuffer *glfb; int main(int argc __attribute__((unused)), char ** argv __attribute__((unused))) { - init_td_api(); + hal_api_init(); #if HAVE_GENERIC_HARDWARE int available = glfb->getOSDBuffer()->size(); /* allocated in glfb constructor */ fb_pixel_t *lfb = reinterpret_cast(glfb->getOSDBuffer()->data()); @@ -41,6 +41,6 @@ int main(int argc __attribute__((unused)), char ** argv __attribute__((unused))) break; } }; - shutdown_td_api(); + hal_api_exit(); return 0; } diff --git a/libtriple/init_td.cpp b/libtriple/init_td.cpp index 3456fbd..f8758d8 100644 --- a/libtriple/init_td.cpp +++ b/libtriple/init_td.cpp @@ -119,7 +119,7 @@ static void rc_init() hal_info("%s rc_addr=0x%02hx\n", __FUNCTION__, rc_addr); } -void init_td_api() +void hal_api_init() { if (!initialized) hal_debug_init(); @@ -147,7 +147,7 @@ void init_td_api() hal_info("%s end\n", __FUNCTION__); } -void shutdown_td_api() +void hal_api_exit() { hal_info("%s, initialized = %d\n", __FUNCTION__, (int)initialized); if (initialized)