Merge pull request #511 from ut-issl/feature/use-std-stdint

sksat · web-flow · commit e4143ed40aa3 · 2023-03-16T19:00:59.000+09:00
Use standard Pre Release (v3.8.0-beta.6): stdint.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,7 @@ option(USE_ALL_C2A_CORE_LIB         "use C2A-core all Library" ON)
 option(USE_32BIT_COMPILER           "use 32bit compiler" OFF)
 
 option(C2A_USE_SIMPLE_LIBC          "use C2A-core hosted simple libc implementation" OFF)
+option(C2A_USE_C99_STDINT           "use C99 standard stdint.h" ON)
 
 option(BUILD_C2A_AS_SILS_FW         "build C2A as SILS firmware" ON)
 option(BUILD_C2A_AS_CXX             "build C2A as C++" OFF)
@@ -50,6 +51,11 @@ set(C2A_SRCS
   TlmCmd/Ccsds/tlm_space_packet.c
 )
 
+if(NOT C2A_USE_C99_STDINT)
+  message("Use stdint.h wrapper")
+  include_directories(Library/stdint_wrapper)
+endif()
+
 if(BUILD_C2A_AS_CXX)
   set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX)  # C++
 endif()
diff --git a/Drivers/Protocol/common_tlm_cmd_packet_for_driver_super.h b/Drivers/Protocol/common_tlm_cmd_packet_for_driver_super.h
@@ -8,7 +8,7 @@
 #ifndef COMMON_TLM_CMD_PACKET_FOR_DRIVER_SUPER_H_
 #define COMMON_TLM_CMD_PACKET_FOR_DRIVER_SUPER_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 #include "../Super/driver_super.h"
 #include "../../TlmCmd/common_tlm_cmd_packet.h"
 
diff --git a/Drivers/Protocol/eb90_frame_for_driver_super.h b/Drivers/Protocol/eb90_frame_for_driver_super.h
@@ -34,7 +34,7 @@
 #ifndef EB90_FRAME_FOR_DRIVER_SUPER_H_
 #define EB90_FRAME_FOR_DRIVER_SUPER_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 #include "../Super/driver_super.h"
 
 #define EB90_FRAME_STX_SIZE     (2)           //!< EB90 Frame の STX のサイズ
diff --git a/Drivers/Protocol/eb90_packet_for_driver_super.h b/Drivers/Protocol/eb90_packet_for_driver_super.h
@@ -26,7 +26,7 @@
 #ifndef EB90_PACKET_FOR_DRIVER_SUPER_H_
 #define EB90_PACKET_FOR_DRIVER_SUPER_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 #include "../Super/driver_super.h"
 
 #define EB90_PACKET_HEADER_SIZE  (4)  //!< EB90 Packet のヘッダサイズ
diff --git a/Drivers/Super/driver_super.h b/Drivers/Super/driver_super.h
@@ -24,7 +24,7 @@
 #define DRIVER_SUPER_H_
 
 #include <src_user/IfWrapper/if_list.h>
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 #include "../../Library/endian.h"        // パスが不定な自動生成コード類で使えるように
 #include "../../System/TimeManager/time_manager.h"
 
diff --git a/Examples/2nd_obc_user/src/src_user/Applications/UserDefined/debug_apps.c b/Examples/2nd_obc_user/src/src_user/Applications/UserDefined/debug_apps.c
@@ -2,6 +2,7 @@
 #include "debug_apps.h"
 
 #include <stddef.h> // for NULL
+#include <stdint.h>
 
 #include <src_core/Library/print.h>
 #include <src_core/System/TimeManager/time_manager.h>
@@ -20,7 +21,6 @@
 // #include <src_core/TlmCmd/telemetry_generator.h>
 #include "../../Library/git_revision.h"
 #include "../../Library/vt100.h"
-#include "../../Library/stdint.h"
 
 void APP_DBG_flush_screen_(void);
 void APP_DBG_print_time_stamp_(void);
diff --git a/Examples/2nd_obc_user/src/src_user/Library/git_revision.h b/Examples/2nd_obc_user/src/src_user/Library/git_revision.h
@@ -5,7 +5,7 @@
 #ifndef GIT_REVISION_H_
 #define GIT_REVISION_H_
 
-#include "stdint.h"
+#include <stdint.h>
 
 extern const char GIT_REV_CORE[41];
 extern const uint32_t GIT_REV_CORE_SHORT;
diff --git a/Examples/2nd_obc_user/src/src_user/Library/stdint.h b/Examples/2nd_obc_user/src/src_user/Library/stdint.h
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.h b/Examples/2nd_obc_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.h
@@ -6,7 +6,7 @@
 #ifndef APID_DEFINE_H_
 #define APID_DEFINE_H_
 
-#include "../../../Library/stdint.h"
+#include <stdint.h>
 
 /**
  * @enum   APID
diff --git a/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_gs.h b/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_gs.h
@@ -5,10 +5,11 @@
 #ifndef DI_GS_H_
 #define DI_GS_H_
 
+#include <stdint.h>
+
 #include "../../Drivers/Com/gs.h"
 #include "../../TlmCmd/Ccsds/tcp_to_m_pdu.h"
 #include "../../TlmCmd/Ccsds/vcdu.h"
-#include "../../Library/stdint.h"
 #include <src_core/System/ApplicationManager/app_info.h>
 
 /**
diff --git a/Examples/minimum_user/src/src_user/Applications/UserDefined/debug_apps.c b/Examples/minimum_user/src/src_user/Applications/UserDefined/debug_apps.c
@@ -2,6 +2,7 @@
 #include "debug_apps.h"
 
 #include <stddef.h> // for NULL
+#include <stdint.h>
 
 #include <src_core/Library/print.h>
 #include <src_core/System/TimeManager/time_manager.h>
@@ -21,7 +22,6 @@
 // #include <src_core/TlmCmd/telemetry_generator.h>
 #include "../../Library/git_revision.h"
 #include "../../Library/vt100.h"
-#include "../../Library/stdint.h"
 
 void APP_DBG_flush_screen_(void);
 void APP_DBG_print_time_stamp_(void);
diff --git a/Examples/minimum_user/src/src_user/Drivers/Com/gs.c b/Examples/minimum_user/src/src_user/Drivers/Com/gs.c
@@ -7,12 +7,13 @@
 #include "gs.h"
 
 #include <string.h>
+#include <stdint.h>
+
 #include "../../IfWrapper/ccsds_user.h"
 #include "../../TlmCmd/Ccsds/tc_transfer_frame.h"
 #include <src_core/Drivers/Super/driver_super.h>
 #include <src_core/TlmCmd/packet_handler.h>
 #include <src_core/TlmCmd/Ccsds/space_packet_typedef.h>
-#include "../../Library/stdint.h"
 
 
 #define GS_RX_HEADER_SIZE (2)
diff --git a/Examples/minimum_user/src/src_user/Drivers/Com/gs_validate.h b/Examples/minimum_user/src/src_user/Drivers/Com/gs_validate.h
@@ -12,8 +12,9 @@
 #ifndef GS_VALIDATE_H_
 #define GS_VALIDATE_H_
 
+#include <stdint.h>
+
 #include "../../TlmCmd/Ccsds/tc_transfer_frame.h"
-#include "../../Library/stdint.h"
 
 /**
  * @enum GS_VALIDATE_ERR
diff --git a/Examples/minimum_user/src/src_user/IfWrapper/ccsds_user.h b/Examples/minimum_user/src/src_user/IfWrapper/ccsds_user.h
@@ -5,8 +5,8 @@
 #ifndef CCSDS_USER_H_
 #define CCSDS_USER_H_
 
+#include <stdint.h>
 #include <src_core/IfWrapper/ccsds.h>
-#include "../Library/stdint.h"
 
 #define CCSDS_FIFO_SIZE (8) // 現在使っている CCSDS API の設計上決まっている
 
diff --git a/Examples/minimum_user/src/src_user/Library/git_revision.h b/Examples/minimum_user/src/src_user/Library/git_revision.h
@@ -5,7 +5,7 @@
 #ifndef GIT_REVISION_H_
 #define GIT_REVISION_H_
 
-#include "stdint.h"
+#include <stdint.h>
 
 extern const char GIT_REV_CORE[41];
 extern const uint32_t GIT_REV_CORE_SHORT;
diff --git a/Examples/minimum_user/src/src_user/Library/stdint.h b/Examples/minimum_user/src/src_user/Library/stdint.h
diff --git a/Examples/minimum_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.h b/Examples/minimum_user/src/src_user/Settings/TlmCmd/Ccsds/apid_define.h
@@ -6,7 +6,7 @@
 #ifndef APID_DEFINE_H_
 #define APID_DEFINE_H_
 
-#include "../../../Library/stdint.h"
+#include <stdint.h>
 
 /**
  * @enum   APID
diff --git a/Examples/minimum_user/src/src_user/TlmCmd/Ccsds/m_pdu.h b/Examples/minimum_user/src/src_user/TlmCmd/Ccsds/m_pdu.h
@@ -2,9 +2,8 @@
 #define M_PDU_H_
 
 
-#include "stddef.h"
-
-#include "../../Library/stdint.h"
+#include <stddef.h>
+#include <stdint.h>
 
 
 #define M_PDU_HEADER_SIZE (2u)
diff --git a/Examples/minimum_user/src/src_user/TlmCmd/Ccsds/tc_segment.h b/Examples/minimum_user/src/src_user/TlmCmd/Ccsds/tc_segment.h
@@ -19,7 +19,7 @@
 #ifndef TC_SEGMENT_H_
 #define TC_SEGMENT_H_
 
-#include "../../Library/stdint.h"
+#include <stdint.h>
 #include <src_core/TlmCmd/Ccsds/cmd_space_packet.h>
 #include <src_user/Settings/TlmCmd/Ccsds/space_packet_typedef_params.h>
 
diff --git a/Examples/minimum_user/src/src_user/TlmCmd/Ccsds/tc_transfer_frame.h b/Examples/minimum_user/src/src_user/TlmCmd/Ccsds/tc_transfer_frame.h
@@ -29,8 +29,8 @@
 #define TC_TRANSFER_FRAME_H_
 
 #include <stddef.h>
+#include <stdint.h>
 
-#include "../../Library/stdint.h"
 #include "tc_segment.h"
 
 #define TCTF_MAX_LEN     (1024)
diff --git a/IfWrapper/aa.h b/IfWrapper/aa.h
@@ -12,7 +12,7 @@
 #ifndef AA_H_
 #define AA_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 /**
  * @class AA_Config
diff --git a/IfWrapper/ccsds.h b/IfWrapper/ccsds.h
@@ -12,7 +12,7 @@
 #ifndef CCSDS_H_
 #define CCSDS_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 /**
  * @struct CCSDS_Config
diff --git a/IfWrapper/dc.h b/IfWrapper/dc.h
@@ -9,7 +9,7 @@
 #ifndef DC_H_
 #define DC_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 /**
  * @class DC_Config
diff --git a/IfWrapper/i2c.h b/IfWrapper/i2c.h
@@ -11,7 +11,7 @@
 #ifndef I2C_H_
 #define I2C_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
  /**
   * @struct I2cConfig
diff --git a/IfWrapper/pa.h b/IfWrapper/pa.h
@@ -12,7 +12,7 @@
 #ifndef PA_H_
 #define PA_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 /**
  * @class PA_Config
diff --git a/IfWrapper/spi.h b/IfWrapper/spi.h
@@ -10,7 +10,7 @@
 #ifndef SPI_H_
 #define SPI_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
  /**
   * @enum  SPI_MODE
diff --git a/IfWrapper/spwire.h b/IfWrapper/spwire.h
@@ -17,7 +17,7 @@
 #ifndef SPWIRE_H_
 #define SPWIRE_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 /**
  * @class SPWIRE_Config
diff --git a/IfWrapper/uart.h b/IfWrapper/uart.h
@@ -12,7 +12,7 @@
 #ifndef UART_H_
 #define UART_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 /**
  * @enum  PARITY_SETTINGS
diff --git a/IfWrapper/wdt.h b/IfWrapper/wdt.h
@@ -5,7 +5,7 @@
 #ifndef WDT_H_
 #define WDT_H_
 
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 typedef struct
 {
diff --git a/Library/crc.h b/Library/crc.h
@@ -6,7 +6,7 @@
 #define CRC_H_
 
 #include <stddef.h>   // for size_t
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 /**
  * @brief CRC-16-IBM
diff --git a/Library/endian.c b/Library/endian.c
@@ -5,7 +5,7 @@
 #pragma section REPRO
 #include "endian.h"
 #include <src_user/Settings/build_settings.h>
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 void* ENDIAN_memcpy(void* dest, const void* src, size_t size)
 {
diff --git a/Library/majority_vote_for3.h b/Library/majority_vote_for3.h
@@ -6,7 +6,7 @@
 #define MAJORITY_VOTE_FOR3_H_
 
 #include <stdio.h>
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 
 typedef enum
 {
diff --git a/Library/stdint_wrapper/stdint.h b/Library/stdint_wrapper/stdint.h
@@ -0,0 +1,18 @@
+/**
+ * @file
+ * @brief C89 環境用 stdint.h
+ * @note  真に C89 で，stdint.h が提供されない環境では，このパスを include path に追加し， src_user/Library/stdint_impl.h を自前で用意すること
+ */
+#ifndef STDINT_H_
+#define STDINT_H_
+
+// C99 stdint.h ないしはそれと同等のヘッダへのラッパー用ヘッダ
+// 実機向けのコンパイラが C89 であるときのみ使用すること（CMake では C2A_USE_C99_STDINT=OFF すること）
+
+#ifdef SILS_FW
+#include <stdint.h> // このヘッダを使う OBC であっても，SILS 環境下では C99 stdint.h が存在することが期待できる
+#else
+#include <src_user/Library/stdint_impl.h>   // 真に C89 環境下では C2A user で C99 stdint.h と同等の型を提供する
+#endif // SILS_FW
+
+#endif // STDINT_H_
diff --git a/System/EventManager/event_logger.h b/System/EventManager/event_logger.h
@@ -41,7 +41,7 @@
 // TODO: ObcTime の初期化が OBCT_clear ではなく memset 0x00 である（現状問題ないが，今後問題になるかも）
 
 #include <stddef.h>
-#include <src_user/Library/stdint.h>
+#include <stdint.h>
 #include "../../TlmCmd/common_cmd_packet.h"
 #include "../TimeManager/obc_time.h"
 
diff --git a/System/TimeManager/obc_time.h b/System/TimeManager/obc_time.h
diff --git a/TlmCmd/Ccsds/cmd_space_packet.h b/TlmCmd/Ccsds/cmd_space_packet.h
diff --git a/TlmCmd/Ccsds/space_packet.h b/TlmCmd/Ccsds/space_packet.h
diff --git a/TlmCmd/Ccsds/space_packet_typedef.h b/TlmCmd/Ccsds/space_packet_typedef.h
diff --git a/TlmCmd/Ccsds/tlm_space_packet.h b/TlmCmd/Ccsds/tlm_space_packet.h
diff --git a/TlmCmd/block_command_table.h b/TlmCmd/block_command_table.h
diff --git a/TlmCmd/common_tlm_cmd_packet.h b/TlmCmd/common_tlm_cmd_packet.h
diff --git a/TlmCmd/packet_list.c b/TlmCmd/packet_list.c
diff --git a/TlmCmd/telemetry_frame.c b/TlmCmd/telemetry_frame.c
diff --git a/c2a_core_main.h b/c2a_core_main.h
