From 871256c1b7e0a573d9786063e64ee259a89c70ee Mon Sep 17 00:00:00 2001 From: sksat Date: Fri, 27 Oct 2023 00:02:40 +0900 Subject: [PATCH] examples/subobc: apply IF list rename migration --- .../src/src_user/Settings/CMakeLists.txt | 1 + .../driver_buffer_define.h | 4 ++-- .../hal_handler_registry.c | 14 +++++++++++ .../hal_handler_registry.h | 24 +++++++++++++++++++ .../src/src_user/component_driver/etc/mobc.c | 2 +- .../subobc/src/src_user/hal/CMakeLists.txt | 2 +- examples/subobc/src/src_user/hal/if_list.c | 14 ----------- examples/subobc/src/src_user/hal/if_list.h | 24 ------------------- 8 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c create mode 100644 examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h delete mode 100644 examples/subobc/src/src_user/hal/if_list.c delete mode 100644 examples/subobc/src/src_user/hal/if_list.h diff --git a/examples/subobc/src/src_user/Settings/CMakeLists.txt b/examples/subobc/src/src_user/Settings/CMakeLists.txt index ecc5cd7dc..231426ae4 100644 --- a/examples/subobc/src/src_user/Settings/CMakeLists.txt +++ b/examples/subobc/src/src_user/Settings/CMakeLists.txt @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.13) project(C2A_USER_SETTINGS) set(C2A_SRCS + component_driver_super/hal_handler_registry.c Modes/mode_definitions.c Modes/TaskLists/tl_initial.c Modes/TaskLists/Elements/tl_elem_debug_display.c diff --git a/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h b/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h index dea128d49..8604559e0 100644 --- a/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h +++ b/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h @@ -7,8 +7,8 @@ #include "./driver_super_params.h" -#define CDS_STREAM_REC_BUFFER_SIZE_DEFAULT (CDS_IF_RX_BUFFER_SIZE * 2) /*!< CDS_StreamRecBuffer のバッファサイズのデフォルト値 - UART などの非同期通信はメモリに余力があれば CDS_IF_RX_BUFFER_SIZE * 2 を推奨 +#define CDS_STREAM_REC_BUFFER_SIZE_DEFAULT (CDS_HAL_RX_BUFFER_SIZE * 2) /*!< CDS_StreamRecBuffer のバッファサイズのデフォルト値 + UART などの非同期通信はメモリに余力があれば CDS_HAL_RX_BUFFER_SIZE * 2 を推奨 詳細は dirver_super.c の @note を参照 */ #endif diff --git a/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c b/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c new file mode 100644 index 000000000..1869e23dc --- /dev/null +++ b/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c @@ -0,0 +1,14 @@ +#pragma section REPRO +#include "hal_handler_registry.h" + +#include + +int (*HAL_init_handlers[])(void* my_if) = { UART_init}; + +int (*HAL_rx_handlers[])(void* my_if, void* data_v, int buffer_size) = { UART_rx}; + +int (*HAL_tx_handlers[])(void* my_if, void* data_v, int data_size) = { UART_tx}; + +int (*HAL_reopen_handlers[])(void* my_if, int reason) = { UART_reopen}; + +#pragma section diff --git a/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h b/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h new file mode 100644 index 000000000..4d3603088 --- /dev/null +++ b/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h @@ -0,0 +1,24 @@ +#ifndef HAL_HANDLER_REGISTRY_H_ +#define HAL_HANDLER_REGISTRY_H_ + + +#include +#include + +typedef enum +{ + UART, + HAL_HANDLER_ID_MAX +} HAL_HANDLER_ID; + +typedef enum +{ + IF_REOPEN_TLM_DISRUPTION = 100 +} HAL_HANDLER_REOPEN_REASON; + +extern int (*HAL_init_handlers[] )(void* my_if); +extern int (*HAL_rx_handlers[] )(void* my_if, void* data_v, int buffer_size); +extern int (*HAL_tx_handlers[] )(void* my_if, void* data_v, int data_size); +extern int (*HAL_reopen_handlers[])(void* my_if, int reason); + +#endif diff --git a/examples/subobc/src/src_user/component_driver/etc/mobc.c b/examples/subobc/src/src_user/component_driver/etc/mobc.c index 535f3070d..9515f68e3 100644 --- a/examples/subobc/src/src_user/component_driver/etc/mobc.c +++ b/examples/subobc/src/src_user/component_driver/etc/mobc.c @@ -48,7 +48,7 @@ static CDS_ERR_CODE MOBC_load_driver_super_init_settings_(ComponentDriverSuper* { CDS_StreamConfig* p_stream_config; - p_super->interface = UART; + p_super->hal_handler_id = UART; // stream は 0 のみ p_stream_config = &(p_super->stream_config[MOBC_STREAM_TLM_CMD]); diff --git a/examples/subobc/src/src_user/hal/CMakeLists.txt b/examples/subobc/src/src_user/hal/CMakeLists.txt index 5297e0708..84ee62e6c 100644 --- a/examples/subobc/src/src_user/hal/CMakeLists.txt +++ b/examples/subobc/src/src_user/hal/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13) project(C2A_USER_HAL) set(C2A_COMMON_SRCS - if_list.c + ) # 通常，S2EではC++ビルドされるが，C2A core開発のため，C2A単体をC89でライブラリビルドする場合は，mockupをビルド対象にする diff --git a/examples/subobc/src/src_user/hal/if_list.c b/examples/subobc/src/src_user/hal/if_list.c deleted file mode 100644 index 8bb01d1b3..000000000 --- a/examples/subobc/src/src_user/hal/if_list.c +++ /dev/null @@ -1,14 +0,0 @@ -#pragma section REPRO -#include "if_list.h" - -#include - -int (*IF_init[])(void* my_if) = { UART_init}; - -int (*IF_RX[])(void* my_if, void* data_v, int buffer_size) = { UART_rx}; - -int (*IF_TX[])(void* my_if, void* data_v, int data_size) = { UART_tx}; - -int (*IF_reopen[])(void* my_if, int reason) = { UART_reopen}; - -#pragma section diff --git a/examples/subobc/src/src_user/hal/if_list.h b/examples/subobc/src/src_user/hal/if_list.h deleted file mode 100644 index d586297c4..000000000 --- a/examples/subobc/src/src_user/hal/if_list.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef IF_LIST_H_ -#define IF_LIST_H_ - - -#include -#include - -typedef enum -{ - UART, - IF_LIST_MAX -} IF_LIST_ENUM; - -typedef enum -{ - IF_REOPEN_TLM_DISRUPTION = 100 -} IF_REOPEN_REASON; - -extern int (*IF_init[] )(void* my_if); -extern int (*IF_RX[] )(void* my_if, void* data_v, int buffer_size); -extern int (*IF_TX[] )(void* my_if, void* data_v, int data_size); -extern int (*IF_reopen[])(void* my_if, int reason); - -#endif