diff --git a/application/main/src/MainThread.cpp b/application/main/src/MainThread.cpp index 417c57a..b567ea0 100644 --- a/application/main/src/MainThread.cpp +++ b/application/main/src/MainThread.cpp @@ -45,6 +45,7 @@ StatusCode MainThread::UnInit(void) } StatusCode MainThread::CreateAllModules(void) { + CreateLogModule(); CreateHalModule(); return CreateStatusCode(STATUS_CODE_OK); } diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index 8fda88a..a1c9ef0 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -58,4 +58,7 @@ add_custom_command( COMMAND make Hal_code_format WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) -endif() \ No newline at end of file +endif() + +define_file_name(${IMPL_TARGET}) +define_file_name(${ABSTRACT_TARGET}) \ No newline at end of file diff --git a/hal/abstract/IHal.cpp b/hal/abstract/IHal.cpp index 0db46f6..e851792 100644 --- a/hal/abstract/IHal.cpp +++ b/hal/abstract/IHal.cpp @@ -18,7 +18,7 @@ // #include #include static StatusCode IHalInit(IHal *object) { return IHalCpp::GetInstance()->Init(); } -static void IHalFree(IHal *object) {} +static void IHalFree(void *object) {} static StatusCode IHalUnInit(IHal *object) { return IHalCpp::GetInstance()->UnInit(); } static IHal default_hal = { .init = IHalInit, diff --git a/hal/include/IHal.h b/hal/include/IHal.h index f6bb7dc..be031b3 100644 --- a/hal/include/IHal.h +++ b/hal/include/IHal.h @@ -23,7 +23,7 @@ typedef struct i_hal { StatusCode (*init)(IHal *); StatusCode (*un_init)(IHal *); - void (*free)(IHal *); + void (*free)(void *); } IHal; IHal *GetHalIntance(void); StatusCode NewIHal(IHal **object); diff --git a/hal/src/Hal.c b/hal/src/Hal.c index 72f1c44..984a320 100644 --- a/hal/src/Hal.c +++ b/hal/src/Hal.c @@ -16,16 +16,17 @@ #include "ILog.h" #include #include -static void HalFree(IHal *object) +static void HalFree(void *object) { LogInfo("hal instance free.\n"); if (object) { free(object); } } -static void HalImplInit(Hal *hal) +void HalImplInit(Hal *hal) { LogInfo("HalImplInit\n"); + NewIHal((IHal **)&hal); ((IHal *)hal)->free = HalFree; } StatusCode NewHal(Hal **hal) @@ -38,15 +39,12 @@ StatusCode NewHal(Hal **hal) *hal = (Hal *)malloc(sizeof(Hal)); if (*hal) { LogInfo("NewHal succeed.\n"); - NewIHal((IHal **)hal); HalImplInit(*hal); return CreateStatusCode(STATUS_CODE_OK); } LogError("NewHal failed.\n"); return CreateStatusCode(STATUS_CODE_NOT_OK); } - { - HalImplInit(*hal); - return CreateStatusCode(STATUS_CODE_OK); - } + HalImplInit(*hal); + return CreateStatusCode(STATUS_CODE_OK); } \ No newline at end of file diff --git a/hal/src/Hal.h b/hal/src/Hal.h index 184d107..bc1da83 100644 --- a/hal/src/Hal.h +++ b/hal/src/Hal.h @@ -25,6 +25,7 @@ typedef struct hal IHal base; } Hal; StatusCode NewHal(Hal **hal); +void HalImplInit(Hal *hal); #ifdef __cplusplus } #endif