Remove the name of the platform from the OS folder name

diff --git a/.cproject b/.cproject
index 0d0e6ce1453380eb2539c5683715d0aec2b567bd..9c1c9ef946688bd149c44d4fdb4603c905243ef7 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -35,7 +35,7 @@
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.ENUM_TYPE.61845731" name="Designate enum type (Default is packed for EABI) (--enum_type)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.ENUM_TYPE" value="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.ENUM_TYPE.packed" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.INCLUDE_PATH.899107020" name="Add dir to #include search path (--include_path, -I)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.INCLUDE_PATH" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${CG_TOOL_ROOT}/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/os/7.0.2_rm48/include}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/os/7.0.2/include}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/rpp/include/}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwip/src/include}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lwip/src/include/ipv4}&quot;"/>
@@ -50,7 +50,7 @@
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.DIAG_WRAP.192096968" name="Wrap diagnostic messages (--diag_wrap)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.GEN_FUNC_SUBSECTIONS.662453482" name="Place each function in a separate subsection (--gen_func_subsections, -ms)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.GEN_FUNC_SUBSECTIONS" value="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.GEN_FUNC_SUBSECTIONS.on" valueType="enumerated"/>
                                                                <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.LITTLE_ENDIAN.1133102083" name="Little endian code [See 'General' page to edit] (--little_endian, -me)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.LITTLE_ENDIAN" value="true" valueType="boolean"/>
-                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.DEFINE.1018447230" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.DEFINE" valueType="definedSymbols">
+                                                               <option id="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.DEFINE.1018447230" name="Pre-define NAME (--define, -D)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compilerID.DEFINE" valueType="definedSymbols">
                                                                        <listOptionValue builtIn="false" value="TARGET_RM48_HDK"/>
                                                                </option>
                                                                <inputType id="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compiler.inputType__C_SRCS.826130508" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.TMS470_5.1.compiler.inputType__C_SRCS"/>

diff --git a/Makefile.config b/Makefile.config
index 18955d4ef4ab1c1da8b01e0dc6c1f74af7d512e8..5de5b63f65761afdd3810537fb2a43f62177b14f 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,2 +1,2 @@
-TARGET=rm48_hdk
-TARGET_CFLAGS=-me -DTARGET_RM48_HDK
+TARGET ?= rm48_hdk
+TARGET_CFLAGS = -me -DTARGET_RM48_HDK

diff --git a/Makefile.var b/Makefile.var
index 729f038b5cc352adc2123b63f201f6566d982d54..dd68855cffb7e92077b9b777f3145251e61f7217 100644 (file)
--- a/Makefile.var
+++ b/Makefile.var
@@ -14,7 +14,7 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))Makefile.config
 
-rpp_lib_OS ?= 7.0.2_rm48
+rpp_lib_OS ?= 7.0.2
 
 rpp_lib_SOURCES =                                                              \
        os/$(rpp_lib_OS)/src/os/croutine.c              \
@@ -23,24 +23,21 @@ rpp_lib_SOURCES =                                                           \
        os/$(rpp_lib_OS)/src/os/port.c                  \
        os/$(rpp_lib_OS)/src/os/queue.c                 \
        os/$(rpp_lib_OS)/src/os/tasks.c                 \
-          $(rpp_lib_SOURCES_$(rpp_lib_OS))
+          $(rpp_lib_SOURCES_$(rpp_lib_OS)_$(TARGET))
 
-rpp_lib_SOURCES_7.0.2_rm48 += \
+rpp_lib_SOURCES_7.0.2_rm48_hdk += \
        os/$(rpp_lib_OS)/src/os/portASM.asm             \
        os/$(rpp_lib_OS)/src/os/timers.c
 
-rpp_lib_SOURCES_6.0.4_posix += \
+rpp_lib_SOURCES_6.0.4_posix_linux += \
        os/$(rpp_lib_OS)/src/rpp/sci_posix.c
 
-rpp_lib_SOURCES +=                                                             \
+rpp_lib_SOURCES_7.0.2_rm48_hdk +=                                      \
        rpp/src/rpp/_$(TARGET)/adc.c                            \
        rpp/src/rpp/can.c                                               \
        rpp/src/rpp/_$(TARGET)/rpp.c                            \
        rpp/src/rpp/gio.c                                               \
-       rpp/src/rpp/sci.c                                               
-       
-
-rpp_lib_SOURCES_7.0.2_rm48 +=                                  \
+       rpp/src/rpp/sci.c                                               \
        rpp/src/drv/_$(TARGET)/adc.c                            \
        rpp/src/drv/sci.c                                               \
        rpp/src/hal/gpio.c                                              \

diff --git a/POSIX/GNUmakefile b/POSIX/GNUmakefile
index 9740934361f79526cbd006aa3b23ba822133b13a..b9407d6b652fe3b7fbc70719f5572b74bebe24e3 100644 (file)
--- a/POSIX/GNUmakefile
+++ b/POSIX/GNUmakefile
@@ -1,5 +1,5 @@
 rpp_lib_OS = 6.0.4_posix
-
+TARGET=linux
 include ../Makefile.var
 
 rpp_lib_CFLAGS = -Wall -g -O0 -I../apps/rpp-lib_posix/include $(rpp_lib_INCLUDES:%=-I../%)

diff --git a/apps/rpp-test-suite/src/ain.c b/apps/rpp-test-suite/src/ain.c
index d90f56d4b9cfdfa7180ff339a2b231361ce37091..51fd8766f313482fe2fcd14b18ce09b0f05a5c2c 100644 (file)
--- a/apps/rpp-test-suite/src/ain.c
+++ b/apps/rpp-test-suite/src/ain.c
@@ -33,6 +33,7 @@ static uint8_t tasks_running = 0;
  */
 void adc_test_task(void *par)
 {
+       #ifndef FREERTOS_POSIX
        rpp_sci_printf((const char *)
                                   "Analog Inputs Test [1-12]:\r\n"
                                   );
@@ -86,6 +87,7 @@ void adc_test_task(void *par)
        // Delete myself
        tasks_running--;
        vTaskDelete(NULL);
+       #endif
 }
 
 
@@ -94,6 +96,7 @@ void adc_test_task(void *par)
  */
 void test_adc()
 {
+       #ifndef FREERTOS_POSIX
        /// Configure module
        // - Not needed
 
@@ -141,6 +144,9 @@ void test_adc()
 
 
        rpp_sci_printf((const char *)"\r\n");
+       #else
+       rpp_sci_printf((const char *)"ADC not supported on Linux target.\r\n");
+       #endif
 
        return;
 }

diff --git a/apps/rpp-test-suite/src/main.c b/apps/rpp-test-suite/src/main.c
index 9fc3843899ff8d88ccc8d100bf81f93455b3ad30..534fba335a6803e3d458588b32b0a88a386c5584 100644 (file)
--- a/apps/rpp-test-suite/src/main.c
+++ b/apps/rpp-test-suite/src/main.c
@@ -173,12 +173,13 @@ void busy_infinite_loop()
  */
 int main(void)
 {
+       #ifndef FREERTOS_POSIX
        // Initialize library
        rpp_init();
 
        // Speed up the SCI
        rpp_sci_setup(115200);
-
+       #endif
        // Spawn tasks
        portBASE_TYPE task_created =
                xTaskCreate(test_cmdproc,

diff --git a/os/7.0.2_rm48/include/os/FreeRTOS.h b/os/7.0.2/include/os/FreeRTOS.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/FreeRTOS.h
rename to os/7.0.2/include/os/FreeRTOS.h

diff --git a/os/7.0.2_rm48/include/os/FreeRTOSConfig.h b/os/7.0.2/include/os/FreeRTOSConfig.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/FreeRTOSConfig.h
rename to os/7.0.2/include/os/FreeRTOSConfig.h

diff --git a/os/7.0.2_rm48/include/os/StackMacros.h b/os/7.0.2/include/os/StackMacros.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/StackMacros.h
rename to os/7.0.2/include/os/StackMacros.h

diff --git a/os/7.0.2_rm48/include/os/croutine.h b/os/7.0.2/include/os/croutine.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/croutine.h
rename to os/7.0.2/include/os/croutine.h

diff --git a/os/7.0.2_rm48/include/os/list.h b/os/7.0.2/include/os/list.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/list.h
rename to os/7.0.2/include/os/list.h

diff --git a/os/7.0.2_rm48/include/os/mpu_wrappers.h b/os/7.0.2/include/os/mpu_wrappers.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/mpu_wrappers.h
rename to os/7.0.2/include/os/mpu_wrappers.h

diff --git a/os/7.0.2_rm48/include/os/os.h b/os/7.0.2/include/os/os.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/os.h
rename to os/7.0.2/include/os/os.h

diff --git a/os/7.0.2_rm48/include/os/portable.h b/os/7.0.2/include/os/portable.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/portable.h
rename to os/7.0.2/include/os/portable.h

diff --git a/os/7.0.2_rm48/include/os/portmacro.h b/os/7.0.2/include/os/portmacro.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/portmacro.h
rename to os/7.0.2/include/os/portmacro.h

diff --git a/os/7.0.2_rm48/include/os/projdefs.h b/os/7.0.2/include/os/projdefs.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/projdefs.h
rename to os/7.0.2/include/os/projdefs.h

diff --git a/os/7.0.2_rm48/include/os/queue.h b/os/7.0.2/include/os/queue.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/queue.h
rename to os/7.0.2/include/os/queue.h

diff --git a/os/7.0.2_rm48/include/os/semphr.h b/os/7.0.2/include/os/semphr.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/semphr.h
rename to os/7.0.2/include/os/semphr.h

diff --git a/os/7.0.2_rm48/include/os/task.h b/os/7.0.2/include/os/task.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/task.h
rename to os/7.0.2/include/os/task.h

diff --git a/os/7.0.2_rm48/include/os/timers.h b/os/7.0.2/include/os/timers.h
similarity index 100%
rename from os/7.0.2_rm48/include/os/timers.h
rename to os/7.0.2/include/os/timers.h

diff --git a/os/7.0.2_rm48/src/os/croutine.c b/os/7.0.2/src/os/croutine.c
similarity index 100%
rename from os/7.0.2_rm48/src/os/croutine.c
rename to os/7.0.2/src/os/croutine.c

diff --git a/os/7.0.2_rm48/src/os/heap.c b/os/7.0.2/src/os/heap.c
similarity index 100%
rename from os/7.0.2_rm48/src/os/heap.c
rename to os/7.0.2/src/os/heap.c

diff --git a/os/7.0.2_rm48/src/os/list.c b/os/7.0.2/src/os/list.c
similarity index 100%
rename from os/7.0.2_rm48/src/os/list.c
rename to os/7.0.2/src/os/list.c

diff --git a/os/7.0.2_rm48/src/os/port.c b/os/7.0.2/src/os/port.c
similarity index 100%
rename from os/7.0.2_rm48/src/os/port.c
rename to os/7.0.2/src/os/port.c

diff --git a/os/7.0.2_rm48/src/os/portASM.asm b/os/7.0.2/src/os/portASM.asm
similarity index 100%
rename from os/7.0.2_rm48/src/os/portASM.asm
rename to os/7.0.2/src/os/portASM.asm

diff --git a/os/7.0.2_rm48/src/os/queue.c b/os/7.0.2/src/os/queue.c
similarity index 100%
rename from os/7.0.2_rm48/src/os/queue.c
rename to os/7.0.2/src/os/queue.c

diff --git a/os/7.0.2_rm48/src/os/tasks.c b/os/7.0.2/src/os/tasks.c
similarity index 100%
rename from os/7.0.2_rm48/src/os/tasks.c
rename to os/7.0.2/src/os/tasks.c

diff --git a/os/7.0.2_rm48/src/os/timers.c b/os/7.0.2/src/os/timers.c
similarity index 100%
rename from os/7.0.2_rm48/src/os/timers.c
rename to os/7.0.2/src/os/timers.c

diff --git a/os/7.4.0_rm48/include/os/FreeRTOS.h b/os/7.4.0/include/os/FreeRTOS.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/FreeRTOS.h
rename to os/7.4.0/include/os/FreeRTOS.h

diff --git a/os/7.4.0_rm48/include/os/FreeRTOSConfig.h b/os/7.4.0/include/os/FreeRTOSConfig.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/FreeRTOSConfig.h
rename to os/7.4.0/include/os/FreeRTOSConfig.h

diff --git a/os/7.4.0_rm48/include/os/StackMacros.h b/os/7.4.0/include/os/StackMacros.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/StackMacros.h
rename to os/7.4.0/include/os/StackMacros.h

diff --git a/os/7.4.0_rm48/include/os/croutine.h b/os/7.4.0/include/os/croutine.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/croutine.h
rename to os/7.4.0/include/os/croutine.h

diff --git a/os/7.4.0_rm48/include/os/list.h b/os/7.4.0/include/os/list.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/list.h
rename to os/7.4.0/include/os/list.h

diff --git a/os/7.4.0_rm48/include/os/mpu_wrappers.h b/os/7.4.0/include/os/mpu_wrappers.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/mpu_wrappers.h
rename to os/7.4.0/include/os/mpu_wrappers.h

diff --git a/os/7.4.0_rm48/include/os/os.h b/os/7.4.0/include/os/os.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/os.h
rename to os/7.4.0/include/os/os.h

diff --git a/os/7.4.0_rm48/include/os/portable.h b/os/7.4.0/include/os/portable.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/portable.h
rename to os/7.4.0/include/os/portable.h

diff --git a/os/7.4.0_rm48/include/os/portmacro.h b/os/7.4.0/include/os/portmacro.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/portmacro.h
rename to os/7.4.0/include/os/portmacro.h

diff --git a/os/7.4.0_rm48/include/os/projdefs.h b/os/7.4.0/include/os/projdefs.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/projdefs.h
rename to os/7.4.0/include/os/projdefs.h

diff --git a/os/7.4.0_rm48/include/os/queue.h b/os/7.4.0/include/os/queue.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/queue.h
rename to os/7.4.0/include/os/queue.h

diff --git a/os/7.4.0_rm48/include/os/semphr.h b/os/7.4.0/include/os/semphr.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/semphr.h
rename to os/7.4.0/include/os/semphr.h

diff --git a/os/7.4.0_rm48/include/os/task.h b/os/7.4.0/include/os/task.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/task.h
rename to os/7.4.0/include/os/task.h

diff --git a/os/7.4.0_rm48/include/os/timers.h b/os/7.4.0/include/os/timers.h
similarity index 100%
rename from os/7.4.0_rm48/include/os/timers.h
rename to os/7.4.0/include/os/timers.h

diff --git a/os/7.4.0_rm48/src/os/croutine.c b/os/7.4.0/src/os/croutine.c
similarity index 100%
rename from os/7.4.0_rm48/src/os/croutine.c
rename to os/7.4.0/src/os/croutine.c

diff --git a/os/7.4.0_rm48/src/os/heap.c b/os/7.4.0/src/os/heap.c
similarity index 100%
rename from os/7.4.0_rm48/src/os/heap.c
rename to os/7.4.0/src/os/heap.c

diff --git a/os/7.4.0_rm48/src/os/list.c b/os/7.4.0/src/os/list.c
similarity index 100%
rename from os/7.4.0_rm48/src/os/list.c
rename to os/7.4.0/src/os/list.c

diff --git a/os/7.4.0_rm48/src/os/mpu_wrappers.c b/os/7.4.0/src/os/mpu_wrappers.c
similarity index 100%
rename from os/7.4.0_rm48/src/os/mpu_wrappers.c
rename to os/7.4.0/src/os/mpu_wrappers.c

diff --git a/os/7.4.0_rm48/src/os/port.c b/os/7.4.0/src/os/port.c
similarity index 100%
rename from os/7.4.0_rm48/src/os/port.c
rename to os/7.4.0/src/os/port.c

diff --git a/os/7.4.0_rm48/src/os/portASM.asm b/os/7.4.0/src/os/portASM.asm
similarity index 100%
rename from os/7.4.0_rm48/src/os/portASM.asm
rename to os/7.4.0/src/os/portASM.asm

diff --git a/os/7.4.0_rm48/src/os/queue.c b/os/7.4.0/src/os/queue.c
similarity index 100%
rename from os/7.4.0_rm48/src/os/queue.c
rename to os/7.4.0/src/os/queue.c

diff --git a/os/7.4.0_rm48/src/os/tasks.c b/os/7.4.0/src/os/tasks.c
similarity index 100%
rename from os/7.4.0_rm48/src/os/tasks.c
rename to os/7.4.0/src/os/tasks.c

diff --git a/os/7.4.0_rm48/src/os/timers.c b/os/7.4.0/src/os/timers.c
similarity index 100%
rename from os/7.4.0_rm48/src/os/timers.c
rename to os/7.4.0/src/os/timers.c

diff --git a/os/7.4.2_rm48/include/os/FreeRTOS.h b/os/7.4.2/include/os/FreeRTOS.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/FreeRTOS.h
rename to os/7.4.2/include/os/FreeRTOS.h

diff --git a/os/7.4.2_rm48/include/os/FreeRTOSConfig.h b/os/7.4.2/include/os/FreeRTOSConfig.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/FreeRTOSConfig.h
rename to os/7.4.2/include/os/FreeRTOSConfig.h

diff --git a/os/7.4.2_rm48/include/os/StackMacros.h b/os/7.4.2/include/os/StackMacros.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/StackMacros.h
rename to os/7.4.2/include/os/StackMacros.h

diff --git a/os/7.4.2_rm48/include/os/croutine.h b/os/7.4.2/include/os/croutine.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/croutine.h
rename to os/7.4.2/include/os/croutine.h

diff --git a/os/7.4.2_rm48/include/os/list.h b/os/7.4.2/include/os/list.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/list.h
rename to os/7.4.2/include/os/list.h

diff --git a/os/7.4.2_rm48/include/os/mpu_wrappers.h b/os/7.4.2/include/os/mpu_wrappers.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/mpu_wrappers.h
rename to os/7.4.2/include/os/mpu_wrappers.h

diff --git a/os/7.4.2_rm48/include/os/os.h b/os/7.4.2/include/os/os.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/os.h
rename to os/7.4.2/include/os/os.h

diff --git a/os/7.4.2_rm48/include/os/portable.h b/os/7.4.2/include/os/portable.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/portable.h
rename to os/7.4.2/include/os/portable.h

diff --git a/os/7.4.2_rm48/include/os/portmacro.h b/os/7.4.2/include/os/portmacro.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/portmacro.h
rename to os/7.4.2/include/os/portmacro.h

diff --git a/os/7.4.2_rm48/include/os/projdefs.h b/os/7.4.2/include/os/projdefs.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/projdefs.h
rename to os/7.4.2/include/os/projdefs.h

diff --git a/os/7.4.2_rm48/include/os/queue.h b/os/7.4.2/include/os/queue.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/queue.h
rename to os/7.4.2/include/os/queue.h

diff --git a/os/7.4.2_rm48/include/os/semphr.h b/os/7.4.2/include/os/semphr.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/semphr.h
rename to os/7.4.2/include/os/semphr.h

diff --git a/os/7.4.2_rm48/include/os/task.h b/os/7.4.2/include/os/task.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/task.h
rename to os/7.4.2/include/os/task.h

diff --git a/os/7.4.2_rm48/include/os/timers.h b/os/7.4.2/include/os/timers.h
similarity index 100%
rename from os/7.4.2_rm48/include/os/timers.h
rename to os/7.4.2/include/os/timers.h

diff --git a/os/7.4.2_rm48/os.txt b/os/7.4.2/os.txt
similarity index 100%
rename from os/7.4.2_rm48/os.txt
rename to os/7.4.2/os.txt

diff --git a/os/7.4.2_rm48/src/os/croutine.c b/os/7.4.2/src/os/croutine.c
similarity index 100%
rename from os/7.4.2_rm48/src/os/croutine.c
rename to os/7.4.2/src/os/croutine.c

diff --git a/os/7.4.2_rm48/src/os/heap.c b/os/7.4.2/src/os/heap.c
similarity index 100%
rename from os/7.4.2_rm48/src/os/heap.c
rename to os/7.4.2/src/os/heap.c

diff --git a/os/7.4.2_rm48/src/os/list.c b/os/7.4.2/src/os/list.c
similarity index 100%
rename from os/7.4.2_rm48/src/os/list.c
rename to os/7.4.2/src/os/list.c

diff --git a/os/7.4.2_rm48/src/os/port.c b/os/7.4.2/src/os/port.c
similarity index 100%
rename from os/7.4.2_rm48/src/os/port.c
rename to os/7.4.2/src/os/port.c

diff --git a/os/7.4.2_rm48/src/os/portASM.asm b/os/7.4.2/src/os/portASM.asm
similarity index 100%
rename from os/7.4.2_rm48/src/os/portASM.asm
rename to os/7.4.2/src/os/portASM.asm

diff --git a/os/7.4.2_rm48/src/os/queue.c b/os/7.4.2/src/os/queue.c
similarity index 100%
rename from os/7.4.2_rm48/src/os/queue.c
rename to os/7.4.2/src/os/queue.c

diff --git a/os/7.4.2_rm48/src/os/tasks.c b/os/7.4.2/src/os/tasks.c
similarity index 100%
rename from os/7.4.2_rm48/src/os/tasks.c
rename to os/7.4.2/src/os/tasks.c

diff --git a/os/7.4.2_rm48/src/os/timers.c b/os/7.4.2/src/os/timers.c
similarity index 100%
rename from os/7.4.2_rm48/src/os/timers.c
rename to os/7.4.2/src/os/timers.c