From 7724e0ec69be4c473c4dc268d17e214dff341c52 Mon Sep 17 00:00:00 2001 From: sksat Date: Fri, 21 Jul 2023 22:48:14 +0900 Subject: [PATCH] Examples/mobc: apply rename migration(IfWrapper -> hal) --- Examples/mobc/CMakeLists.txt | 4 +- .../mobc/src/src_user/Drivers/Aocs/aobc.h | 2 +- Examples/mobc/src/src_user/Drivers/Com/gs.c | 2 +- Examples/mobc/src/src_user/Drivers/Com/gs.h | 6 +-- .../mobc/src/src_user/Drivers/Etc/uart_test.h | 2 +- .../src_user/Script/AddSection/settings.pl | 2 +- .../{IfWrapper => hal}/CMakeLists.txt | 40 +++++++++---------- .../src_user/{IfWrapper => hal}/ccsds_user.h | 2 +- .../{IfWrapper/Common => hal/common}/.gitkeep | 0 .../src/src_user/{IfWrapper => hal}/if_list.c | 0 .../src/src_user/{IfWrapper => hal}/if_list.h | 4 +- .../Sils => hal/sils}/ccsds_sils.cpp | 0 .../Sils => hal/sils}/ccsds_sils_sci_if.cpp | 0 .../Sils => hal/sils}/ccsds_sils_sci_if.hpp | 0 .../{IfWrapper/Sils => hal/sils}/i2c_sils.cpp | 2 +- .../Sils => hal/sils}/uart_sils.cpp | 2 +- .../Sils => hal/sils}/uart_sils_sci_if.cpp | 0 .../Sils => hal/sils}/uart_sils_sci_if.hpp | 0 .../{IfWrapper/Sils => hal/sils}/wdt_sils.cpp | 2 +- .../SilsMockup => hal/sils_mockup}/README.md | 4 +- .../sils_mockup}/ccsds_sils.c | 0 .../SilsMockup => hal/sils_mockup}/i2c_sils.c | 2 +- .../sils_mockup}/uart_sils.c | 2 +- .../SilsMockup => hal/sils_mockup}/wdt_sils.c | 2 +- 24 files changed, 40 insertions(+), 40 deletions(-) rename Examples/mobc/src/src_user/{IfWrapper => hal}/CMakeLists.txt (63%) rename Examples/mobc/src/src_user/{IfWrapper => hal}/ccsds_user.h (97%) rename Examples/mobc/src/src_user/{IfWrapper/Common => hal/common}/.gitkeep (100%) rename Examples/mobc/src/src_user/{IfWrapper => hal}/if_list.c (100%) rename Examples/mobc/src/src_user/{IfWrapper => hal}/if_list.h (85%) rename Examples/mobc/src/src_user/{IfWrapper/Sils => hal/sils}/ccsds_sils.cpp (100%) rename Examples/mobc/src/src_user/{IfWrapper/Sils => hal/sils}/ccsds_sils_sci_if.cpp (100%) rename Examples/mobc/src/src_user/{IfWrapper/Sils => hal/sils}/ccsds_sils_sci_if.hpp (100%) rename Examples/mobc/src/src_user/{IfWrapper/Sils => hal/sils}/i2c_sils.cpp (95%) rename Examples/mobc/src/src_user/{IfWrapper/Sils => hal/sils}/uart_sils.cpp (97%) rename Examples/mobc/src/src_user/{IfWrapper/Sils => hal/sils}/uart_sils_sci_if.cpp (100%) rename Examples/mobc/src/src_user/{IfWrapper/Sils => hal/sils}/uart_sils_sci_if.hpp (100%) rename Examples/mobc/src/src_user/{IfWrapper/Sils => hal/sils}/wdt_sils.cpp (93%) rename Examples/mobc/src/src_user/{IfWrapper/SilsMockup => hal/sils_mockup}/README.md (72%) rename Examples/mobc/src/src_user/{IfWrapper/SilsMockup => hal/sils_mockup}/ccsds_sils.c (100%) rename Examples/mobc/src/src_user/{IfWrapper/SilsMockup => hal/sils_mockup}/i2c_sils.c (95%) rename Examples/mobc/src/src_user/{IfWrapper/SilsMockup => hal/sils_mockup}/uart_sils.c (92%) rename Examples/mobc/src/src_user/{IfWrapper/SilsMockup => hal/sils_mockup}/wdt_sils.c (91%) diff --git a/Examples/mobc/CMakeLists.txt b/Examples/mobc/CMakeLists.txt index 9e624402b..185ad1798 100644 --- a/Examples/mobc/CMakeLists.txt +++ b/Examples/mobc/CMakeLists.txt @@ -60,7 +60,7 @@ add_subdirectory(${C2A_CORE_DIR}) add_subdirectory(${C2A_USER_DIR}/Applications) add_subdirectory(${C2A_USER_DIR}/Drivers) -add_subdirectory(${C2A_USER_DIR}/IfWrapper) +add_subdirectory(${C2A_USER_DIR}/hal) add_subdirectory(${C2A_USER_DIR}/Library) add_subdirectory(${C2A_USER_DIR}/Settings) add_subdirectory(${C2A_USER_DIR}/TlmCmd) @@ -85,7 +85,7 @@ set(C2A_USER_MODULES C2A_USER_APPS C2A_USER_CMD_TLM C2A_USER_DRIVERS - C2A_USER_IF_WRAPPER + C2A_USER_HAL C2A_USER_LIB C2A_USER_SETTINGS ) diff --git a/Examples/mobc/src/src_user/Drivers/Aocs/aobc.h b/Examples/mobc/src/src_user/Drivers/Aocs/aobc.h index f1ac3e42c..edc9139bc 100644 --- a/Examples/mobc/src/src_user/Drivers/Aocs/aobc.h +++ b/Examples/mobc/src/src_user/Drivers/Aocs/aobc.h @@ -5,7 +5,7 @@ #ifndef AOBC_H_ #define AOBC_H_ -#include +#include #include #include #include diff --git a/Examples/mobc/src/src_user/Drivers/Com/gs.c b/Examples/mobc/src/src_user/Drivers/Com/gs.c index 2c400cb0e..24ee8582b 100644 --- a/Examples/mobc/src/src_user/Drivers/Com/gs.c +++ b/Examples/mobc/src/src_user/Drivers/Com/gs.c @@ -9,7 +9,7 @@ #include #include -#include "../../IfWrapper/ccsds_user.h" +#include "../../hal/ccsds_user.h" #include "../../TlmCmd/Ccsds/tc_transfer_frame.h" #include #include diff --git a/Examples/mobc/src/src_user/Drivers/Com/gs.h b/Examples/mobc/src/src_user/Drivers/Com/gs.h index e47070dcd..278dfdf04 100644 --- a/Examples/mobc/src/src_user/Drivers/Com/gs.h +++ b/Examples/mobc/src/src_user/Drivers/Com/gs.h @@ -7,9 +7,9 @@ #include #include -#include -#include -#include "../../IfWrapper/ccsds_user.h" +#include +#include +#include "../../hal/ccsds_user.h" #include "../../TlmCmd/Ccsds/vcdu.h" #include "gs_validate.h" diff --git a/Examples/mobc/src/src_user/Drivers/Etc/uart_test.h b/Examples/mobc/src/src_user/Drivers/Etc/uart_test.h index 92f857603..69cd9ef52 100644 --- a/Examples/mobc/src/src_user/Drivers/Etc/uart_test.h +++ b/Examples/mobc/src/src_user/Drivers/Etc/uart_test.h @@ -5,7 +5,7 @@ #ifndef UART_TEST_H_ #define UART_TEST_H_ -#include +#include #include /** diff --git a/Examples/mobc/src/src_user/Script/AddSection/settings.pl b/Examples/mobc/src/src_user/Script/AddSection/settings.pl index 9b941bd2d..433f33619 100644 --- a/Examples/mobc/src/src_user/Script/AddSection/settings.pl +++ b/Examples/mobc/src/src_user/Script/AddSection/settings.pl @@ -18,7 +18,7 @@ sub GetSetting { $SETTING{'SEARCH_PATH'} = [ 'Applications', 'Drivers', - 'IfWrapper', + 'hal', 'Library', 'Settings', 'TlmCmd' diff --git a/Examples/mobc/src/src_user/IfWrapper/CMakeLists.txt b/Examples/mobc/src/src_user/hal/CMakeLists.txt similarity index 63% rename from Examples/mobc/src/src_user/IfWrapper/CMakeLists.txt rename to Examples/mobc/src/src_user/hal/CMakeLists.txt index 7412ef457..e9f0b4703 100644 --- a/Examples/mobc/src/src_user/IfWrapper/CMakeLists.txt +++ b/Examples/mobc/src/src_user/hal/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.13) -project(C2A_USER_IF_WRAPPER) +project(C2A_USER_HAL) set(C2A_COMMON_SRCS if_list.c @@ -11,26 +11,26 @@ if(USE_SILS_MOCKUP) message("USE SILS_MOCKUP") #target_sources(${PROJECT_NAME} PRIVATE - set(C2A_IF_IMPL_SRCS - SilsMockup/ccsds_sils.c - SilsMockup/i2c_sils.c - SilsMockup/uart_sils.c - SilsMockup/wdt_sils.c + set(C2A_HAL_IMPL_SRCS + sils_mockup/ccsds_sils.c + sils_mockup/i2c_sils.c + sils_mockup/uart_sils.c + sils_mockup/wdt_sils.c ) else() #target_sources(${PROJECT_NAME} PUBLIC - set(C2A_IF_IMPL_COMMON_SRCS - Sils/ccsds_sils.cpp - Sils/i2c_sils.cpp - Sils/uart_sils.cpp - Sils/wdt_sils.cpp + set(C2A_HAL_IMPL_COMMON_SRCS + sils/ccsds_sils.cpp + sils/i2c_sils.cpp + sils/uart_sils.cpp + sils/wdt_sils.cpp ) if(USE_SCI_COM_WINGS) add_definitions(-DUSE_SCI_COM_WINGS) #target_sources(${PROJECT_NAME} PUBLIC - set(C2A_IF_COM_WINGS_SRCS - Sils/ccsds_sils_sci_if.cpp + set(C2A_HAL_COM_WINGS_SRCS + sils/ccsds_sils_sci_if.cpp ) message("USE SCI_COM_WINGS") endif() @@ -38,22 +38,22 @@ else() if(USE_SCI_COM_UART) add_definitions(-DUSE_SCI_COM_UART) #target_sources(${PROJECT_NAME} PUBLIC - set(C2A_IF_COM_UART_SRCS - Sils/uart_sils_sci_if.cpp + set(C2A_HAL_COM_UART_SRCS + sils/uart_sils_sci_if.cpp ) message("USE SCI_COM_UART") endif() - set(C2A_IF_IMPL_SRCS - ${C2A_IF_IMPL_COMMON_SRCS} - ${C2A_IF_COM_WINGS_SRCS} - ${C2A_IF_COM_UART_SRCS} + set(C2A_HAL_IMPL_SRCS + ${C2A_HAL_IMPL_COMMON_SRCS} + ${C2A_HAL_COM_WINGS_SRCS} + ${C2A_HAL_COM_UART_SRCS} ) endif() set(C2A_SRCS ${C2A_COMMON_SRCS} - ${C2A_IF_IMPL_SRCS} + ${C2A_HAL_IMPL_SRCS} ) if(BUILD_C2A_AS_CXX) diff --git a/Examples/mobc/src/src_user/IfWrapper/ccsds_user.h b/Examples/mobc/src/src_user/hal/ccsds_user.h similarity index 97% rename from Examples/mobc/src/src_user/IfWrapper/ccsds_user.h rename to Examples/mobc/src/src_user/hal/ccsds_user.h index 317ee7145..3c90e5173 100644 --- a/Examples/mobc/src/src_user/IfWrapper/ccsds_user.h +++ b/Examples/mobc/src/src_user/hal/ccsds_user.h @@ -6,7 +6,7 @@ #define CCSDS_USER_H_ #include -#include +#include #define CCSDS_FIFO_SIZE (8) // 現在使っている CCSDS API の設計上決まっている diff --git a/Examples/mobc/src/src_user/IfWrapper/Common/.gitkeep b/Examples/mobc/src/src_user/hal/common/.gitkeep similarity index 100% rename from Examples/mobc/src/src_user/IfWrapper/Common/.gitkeep rename to Examples/mobc/src/src_user/hal/common/.gitkeep diff --git a/Examples/mobc/src/src_user/IfWrapper/if_list.c b/Examples/mobc/src/src_user/hal/if_list.c similarity index 100% rename from Examples/mobc/src/src_user/IfWrapper/if_list.c rename to Examples/mobc/src/src_user/hal/if_list.c diff --git a/Examples/mobc/src/src_user/IfWrapper/if_list.h b/Examples/mobc/src/src_user/hal/if_list.h similarity index 85% rename from Examples/mobc/src/src_user/IfWrapper/if_list.h rename to Examples/mobc/src/src_user/hal/if_list.h index d4ee1d7da..125b43fbc 100644 --- a/Examples/mobc/src/src_user/IfWrapper/if_list.h +++ b/Examples/mobc/src/src_user/hal/if_list.h @@ -2,8 +2,8 @@ #define IF_LIST_H_ -#include -#include +#include +#include typedef enum { diff --git a/Examples/mobc/src/src_user/IfWrapper/Sils/ccsds_sils.cpp b/Examples/mobc/src/src_user/hal/sils/ccsds_sils.cpp similarity index 100% rename from Examples/mobc/src/src_user/IfWrapper/Sils/ccsds_sils.cpp rename to Examples/mobc/src/src_user/hal/sils/ccsds_sils.cpp diff --git a/Examples/mobc/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.cpp b/Examples/mobc/src/src_user/hal/sils/ccsds_sils_sci_if.cpp similarity index 100% rename from Examples/mobc/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.cpp rename to Examples/mobc/src/src_user/hal/sils/ccsds_sils_sci_if.cpp diff --git a/Examples/mobc/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp b/Examples/mobc/src/src_user/hal/sils/ccsds_sils_sci_if.hpp similarity index 100% rename from Examples/mobc/src/src_user/IfWrapper/Sils/ccsds_sils_sci_if.hpp rename to Examples/mobc/src/src_user/hal/sils/ccsds_sils_sci_if.hpp diff --git a/Examples/mobc/src/src_user/IfWrapper/Sils/i2c_sils.cpp b/Examples/mobc/src/src_user/hal/sils/i2c_sils.cpp similarity index 95% rename from Examples/mobc/src/src_user/IfWrapper/Sils/i2c_sils.cpp rename to Examples/mobc/src/src_user/hal/sils/i2c_sils.cpp index f363a1727..9797ea9b5 100644 --- a/Examples/mobc/src/src_user/IfWrapper/Sils/i2c_sils.cpp +++ b/Examples/mobc/src/src_user/hal/sils/i2c_sils.cpp @@ -1,5 +1,5 @@ #pragma section REPRO -#include +#include int I2C_init(void* my_i2c_v) { diff --git a/Examples/mobc/src/src_user/IfWrapper/Sils/uart_sils.cpp b/Examples/mobc/src/src_user/hal/sils/uart_sils.cpp similarity index 97% rename from Examples/mobc/src/src_user/IfWrapper/Sils/uart_sils.cpp rename to Examples/mobc/src/src_user/hal/sils/uart_sils.cpp index 2209d1b39..62e8dae5c 100644 --- a/Examples/mobc/src/src_user/IfWrapper/Sils/uart_sils.cpp +++ b/Examples/mobc/src/src_user/hal/sils/uart_sils.cpp @@ -1,5 +1,5 @@ #pragma section REPRO -#include +#include #include "../../Settings/port_config.h" #ifdef USE_SCI_COM_UART diff --git a/Examples/mobc/src/src_user/IfWrapper/Sils/uart_sils_sci_if.cpp b/Examples/mobc/src/src_user/hal/sils/uart_sils_sci_if.cpp similarity index 100% rename from Examples/mobc/src/src_user/IfWrapper/Sils/uart_sils_sci_if.cpp rename to Examples/mobc/src/src_user/hal/sils/uart_sils_sci_if.cpp diff --git a/Examples/mobc/src/src_user/IfWrapper/Sils/uart_sils_sci_if.hpp b/Examples/mobc/src/src_user/hal/sils/uart_sils_sci_if.hpp similarity index 100% rename from Examples/mobc/src/src_user/IfWrapper/Sils/uart_sils_sci_if.hpp rename to Examples/mobc/src/src_user/hal/sils/uart_sils_sci_if.hpp diff --git a/Examples/mobc/src/src_user/IfWrapper/Sils/wdt_sils.cpp b/Examples/mobc/src/src_user/hal/sils/wdt_sils.cpp similarity index 93% rename from Examples/mobc/src/src_user/IfWrapper/Sils/wdt_sils.cpp rename to Examples/mobc/src/src_user/hal/sils/wdt_sils.cpp index 858c904d8..dfc4d62a2 100644 --- a/Examples/mobc/src/src_user/IfWrapper/Sils/wdt_sils.cpp +++ b/Examples/mobc/src/src_user/hal/sils/wdt_sils.cpp @@ -1,4 +1,4 @@ -#include +#include int WDT_initialize(void* wdt_config) { diff --git a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/README.md b/Examples/mobc/src/src_user/hal/sils_mockup/README.md similarity index 72% rename from Examples/mobc/src/src_user/IfWrapper/SilsMockup/README.md rename to Examples/mobc/src/src_user/hal/sils_mockup/README.md index 6bb2bec45..bf26c57a7 100644 --- a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/README.md +++ b/Examples/mobc/src/src_user/hal/sils_mockup/README.md @@ -1,6 +1,6 @@ # SILS MOCKUP -- C2A Core 開発のために， Core 単体で C89 ビルドするための IF Wrapper Mockup +- C2A Core 開発のために， Core 単体で C89 ビルドするための HAL Mockup - Core 開発では特定のハードウェアを仮定できないので， SILS を用いるが，現在のデフォルトの SILS である S2E は， C++ ビルドを行う． - それでは， C89 の Core のコンパイルエラー，ワーニングのチェックができないため，非環境依存の Mockup を用いて， C89 ビルドする環境を用意したものがこれ． - - 検証したいコードは `src_user/IfWrapper/Sils` には存在しないはずなので，ビルドのみで実行しないのであれば，これで良い． + - 検証したいコードは `src_user/hal/sils` には存在しないはずなので，ビルドのみで実行しないのであれば，これで良い． - 参考: https://github.com/ut-issl/c2a-core/issues/27 diff --git a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/ccsds_sils.c b/Examples/mobc/src/src_user/hal/sils_mockup/ccsds_sils.c similarity index 100% rename from Examples/mobc/src/src_user/IfWrapper/SilsMockup/ccsds_sils.c rename to Examples/mobc/src/src_user/hal/sils_mockup/ccsds_sils.c diff --git a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/i2c_sils.c b/Examples/mobc/src/src_user/hal/sils_mockup/i2c_sils.c similarity index 95% rename from Examples/mobc/src/src_user/IfWrapper/SilsMockup/i2c_sils.c rename to Examples/mobc/src/src_user/hal/sils_mockup/i2c_sils.c index c42ff135d..011a24d17 100644 --- a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/i2c_sils.c +++ b/Examples/mobc/src/src_user/hal/sils_mockup/i2c_sils.c @@ -1,5 +1,5 @@ #pragma section REPRO -#include +#include int I2C_init(void* my_i2c_v) { diff --git a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/uart_sils.c b/Examples/mobc/src/src_user/hal/sils_mockup/uart_sils.c similarity index 92% rename from Examples/mobc/src/src_user/IfWrapper/SilsMockup/uart_sils.c rename to Examples/mobc/src/src_user/hal/sils_mockup/uart_sils.c index 9cd083400..e6c372169 100644 --- a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/uart_sils.c +++ b/Examples/mobc/src/src_user/hal/sils_mockup/uart_sils.c @@ -1,5 +1,5 @@ #pragma section REPRO -#include +#include int UART_init(void* my_uart_v) { diff --git a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/wdt_sils.c b/Examples/mobc/src/src_user/hal/sils_mockup/wdt_sils.c similarity index 91% rename from Examples/mobc/src/src_user/IfWrapper/SilsMockup/wdt_sils.c rename to Examples/mobc/src/src_user/hal/sils_mockup/wdt_sils.c index c1aab9b08..c40c5d1cb 100644 --- a/Examples/mobc/src/src_user/IfWrapper/SilsMockup/wdt_sils.c +++ b/Examples/mobc/src/src_user/hal/sils_mockup/wdt_sils.c @@ -1,4 +1,4 @@ -#include +#include int WDT_initialize(void* wdt_config) {