using wrapper function call in OS files

nasa · Jan 8, 2025 · 088fd88 · 088fd88
1 parent 443106f
commit 088fd88
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/Os/Darwin/CMakeLists.txt b/Os/Darwin/CMakeLists.txt
@@ -8,8 +8,8 @@
 restrict_platforms(Darwin)
 add_custom_target("${FPRIME_CURRENT_MODULE}")
 
-add_fprime_supplied_os_module(Cpu Darwin)
-add_fprime_supplied_os_module(Memory Darwin)
+register_os_implementation(Cpu Darwin)
+register_os_implementation(Memory Darwin)
 
 # -----------------------------------------
 ### Os/Darwin/Cpu Section

diff --git a/Os/Linux/CMakeLists.txt b/Os/Linux/CMakeLists.txt
@@ -8,8 +8,8 @@
 restrict_platforms(Linux)
 add_custom_target("${FPRIME_CURRENT_MODULE}")
 
-add_fprime_supplied_os_module(Cpu Linux)
-add_fprime_supplied_os_module(Memory Linux)
+register_os_implementation(Cpu Linux)
+register_os_implementation(Memory Linux)
 
 # -----------------------------------------
 ### Os/Linux/Cpu Section

diff --git a/Os/Posix/CMakeLists.txt b/Os/Posix/CMakeLists.txt
@@ -22,11 +22,11 @@ set(MOD_DEPS config)
 register_fprime_module(Os_Posix_Shared)
 
 # Set up Posix implementations
-add_fprime_supplied_os_module("File;FileSystem;Directory" Posix Os_Posix_Shared)
-add_fprime_supplied_os_module("Console" Posix)
-add_fprime_supplied_os_module("Task" Posix Os_Posix_Shared Fw_Time)
-add_fprime_supplied_os_module("Mutex;ConditionVariable" Posix Os_Posix_Shared)
-add_fprime_supplied_os_module("RawTime" Posix Os_Posix_Shared)
+register_os_implementation("File;FileSystem;Directory" Posix Os_Posix_Shared)
+register_os_implementation("Console" Posix)
+register_os_implementation("Task" Posix Os_Posix_Shared Fw_Time)
+register_os_implementation("Mutex;ConditionVariable" Posix Os_Posix_Shared)
+register_os_implementation("RawTime" Posix Os_Posix_Shared)
 
 # -----------------------------------------
 ### Os/File/Posix Test Section

diff --git a/Os/Stub/CMakeLists.txt b/Os/Stub/CMakeLists.txt
@@ -7,14 +7,14 @@
 ####
 add_custom_target("${FPRIME_CURRENT_MODULE}")
 
-add_fprime_supplied_os_module("File;FileSystem;Directory" Stub)
-add_fprime_supplied_os_module(Console Stub)
-add_fprime_supplied_os_module(Task Stub)
-add_fprime_supplied_os_module("Mutex;ConditionVariable" Stub)
-add_fprime_supplied_os_module(Cpu Stub)
-add_fprime_supplied_os_module(Memory Stub)
-add_fprime_supplied_os_module(Queue Stub)
-add_fprime_supplied_os_module(RawTime Stub)
+register_os_implementation("File;FileSystem;Directory" Stub)
+register_os_implementation(Console Stub)
+register_os_implementation(Task Stub)
+register_os_implementation("Mutex;ConditionVariable" Stub)
+register_os_implementation(Cpu Stub)
+register_os_implementation(Memory Stub)
+register_os_implementation(Queue Stub)
+register_os_implementation(RawTime Stub)
 
 # Remainder of file is specific to UTs
 if (NOT BUILD_TESTING)

diff --git a/Os/Stub/test/CMakeLists.txt b/Os/Stub/test/CMakeLists.txt
@@ -10,14 +10,14 @@ if (NOT BUILD_TESTING)
 endif ()
 add_custom_target("${FPRIME_CURRENT_MODULE}")
 
-add_fprime_supplied_os_module("File;FileSystem;Directory" Test_Stub)
-add_fprime_supplied_os_module(Console Test_Stub)
-add_fprime_supplied_os_module(Task Test_Stub)
-add_fprime_supplied_os_module("Mutex;ConditionVariable" Test_Stub)
-add_fprime_supplied_os_module(Cpu Test_Stub)
-add_fprime_supplied_os_module(Memory Test_Stub)
-add_fprime_supplied_os_module(Queue Test_Stub)
-add_fprime_supplied_os_module(RawTime Test_Stub) # add Fw_Buffer here?
+register_os_implementation("File;FileSystem;Directory" Test_Stub)
+register_os_implementation(Console Test_Stub)
+register_os_implementation(Task Test_Stub)
+register_os_implementation("Mutex;ConditionVariable" Test_Stub)
+register_os_implementation(Cpu Test_Stub)
+register_os_implementation(Memory Test_Stub)
+register_os_implementation(Queue Test_Stub)
+register_os_implementation(RawTime Test_Stub) # add Fw_Buffer here?
 
 #### File Stub Testing ####
 set(UT_SOURCE_FILES