From 4c34372ea5728330f8ecf0abe7be4e1d4b836902 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sat, 31 Aug 2013 16:03:11 +0000 Subject: [PATCH] Rename CORTEX_M)_Infineion_Boot_Kits_IAR_Keil to CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC as it now contains projects for all three compilers. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2013 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../.cproject | 0 .../.project | 0 ...lic.truestudio.debug.hardware_device.prefs | 0 .../org.eclipse.cdt.managedbuilder.core.prefs | 0 .../Atollic_Specific/RegTest.c | 0 .../Atollic_Specific/startup_XMC1200.s | 0 .../Atollic_Specific/xmc1000_flash.ld | 0 .../CMSIS/core_cm0.h | 0 .../CMSIS/core_cmFunc.h | 0 .../CMSIS/core_cmInstr.h | 0 .../FreeRTOSConfig.h | 0 .../IAR_Specific/RegTest_IAR.s | 0 .../IAR_Specific/startup_XMC1200.s | 0 .../JLinkSettings.ini | 0 .../Keil_Specific/RegTest_Keil.s | 0 .../Keil_Specific/startup_XMC1300.s | 0 .../Keil_Specific/system_XMC1100.c | 0 .../Keil_Specific/system_XMC1200.c | 0 .../Keil_Specific/system_XMC1300.c | 0 .../ParTest_XMC1200.c | 0 .../RTOSDemo.ewd | 0 .../RTOSDemo.ewp | 0 .../RTOSDemo.eww | 0 .../RTOSDemo.plg | 0 .../RTOSDemo.uvopt | 0 .../RTOSDemo.uvproj | 0 .../XMC1200.h | 0 .../main-blinky.c | 0 .../main-full.c | 0 .../main.c | 0 .../settings/RTOSDemo.cspy.bat | 0 .../settings/RTOSDemo.dni | 0 .../settings/RTOSDemo.wsdt | 0 .../settings/RTOSDemo_Debug.jlink | 0 .../system_XMC1200.c | 0 .../system_XMC1200.h | 0 .../CORTUS_APS3_GCC/Demo/FreeRTOSConfig.h | 14 --- FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c | 93 +------------------ FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/serial.c | 3 - 39 files changed, 2 insertions(+), 108 deletions(-) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/.cproject (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/.project (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/.settings/com.atollic.truestudio.debug.hardware_device.prefs (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/.settings/org.eclipse.cdt.managedbuilder.core.prefs (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/Atollic_Specific/RegTest.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/Atollic_Specific/startup_XMC1200.s (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/Atollic_Specific/xmc1000_flash.ld (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/CMSIS/core_cm0.h (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/CMSIS/core_cmFunc.h (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/CMSIS/core_cmInstr.h (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/FreeRTOSConfig.h (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/IAR_Specific/RegTest_IAR.s (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/IAR_Specific/startup_XMC1200.s (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/JLinkSettings.ini (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/Keil_Specific/RegTest_Keil.s (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/Keil_Specific/startup_XMC1300.s (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/Keil_Specific/system_XMC1100.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/Keil_Specific/system_XMC1200.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/Keil_Specific/system_XMC1300.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/ParTest_XMC1200.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/RTOSDemo.ewd (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/RTOSDemo.ewp (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/RTOSDemo.eww (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/RTOSDemo.plg (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/RTOSDemo.uvopt (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/RTOSDemo.uvproj (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/XMC1200.h (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/main-blinky.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/main-full.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/main.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/settings/RTOSDemo.cspy.bat (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/settings/RTOSDemo.dni (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/settings/RTOSDemo.wsdt (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/settings/RTOSDemo_Debug.jlink (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/system_XMC1200.c (100%) rename FreeRTOS/Demo/{CORTEX_M0_Infineon_Boot_Kits_IAR_Keil => CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC}/system_XMC1200.h (100%) diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/.cproject b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/.cproject similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/.cproject rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/.cproject diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/.project b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/.project similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/.project rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/.project diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/.settings/com.atollic.truestudio.debug.hardware_device.prefs b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/.settings/com.atollic.truestudio.debug.hardware_device.prefs similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/.settings/com.atollic.truestudio.debug.hardware_device.prefs rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/.settings/com.atollic.truestudio.debug.hardware_device.prefs diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/.settings/org.eclipse.cdt.managedbuilder.core.prefs similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/.settings/org.eclipse.cdt.managedbuilder.core.prefs rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/.settings/org.eclipse.cdt.managedbuilder.core.prefs diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Atollic_Specific/RegTest.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Atollic_Specific/RegTest.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Atollic_Specific/RegTest.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Atollic_Specific/RegTest.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Atollic_Specific/startup_XMC1200.s b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Atollic_Specific/startup_XMC1200.s similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Atollic_Specific/startup_XMC1200.s rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Atollic_Specific/startup_XMC1200.s diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Atollic_Specific/xmc1000_flash.ld b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Atollic_Specific/xmc1000_flash.ld similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Atollic_Specific/xmc1000_flash.ld rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Atollic_Specific/xmc1000_flash.ld diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/CMSIS/core_cm0.h b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/CMSIS/core_cm0.h similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/CMSIS/core_cm0.h rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/CMSIS/core_cm0.h diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/CMSIS/core_cmFunc.h b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/CMSIS/core_cmFunc.h similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/CMSIS/core_cmFunc.h rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/CMSIS/core_cmFunc.h diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/CMSIS/core_cmInstr.h b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/CMSIS/core_cmInstr.h similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/CMSIS/core_cmInstr.h rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/CMSIS/core_cmInstr.h diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/FreeRTOSConfig.h similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/FreeRTOSConfig.h rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/FreeRTOSConfig.h diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/IAR_Specific/RegTest_IAR.s b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/IAR_Specific/RegTest_IAR.s similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/IAR_Specific/RegTest_IAR.s rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/IAR_Specific/RegTest_IAR.s diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/IAR_Specific/startup_XMC1200.s b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/IAR_Specific/startup_XMC1200.s similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/IAR_Specific/startup_XMC1200.s rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/IAR_Specific/startup_XMC1200.s diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/JLinkSettings.ini b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/JLinkSettings.ini similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/JLinkSettings.ini rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/JLinkSettings.ini diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/RegTest_Keil.s b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/RegTest_Keil.s similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/RegTest_Keil.s rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/RegTest_Keil.s diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/startup_XMC1300.s b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/startup_XMC1300.s similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/startup_XMC1300.s rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/startup_XMC1300.s diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/system_XMC1100.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/system_XMC1100.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/system_XMC1100.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/system_XMC1100.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/system_XMC1200.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/system_XMC1200.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/system_XMC1200.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/system_XMC1200.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/system_XMC1300.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/system_XMC1300.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/Keil_Specific/system_XMC1300.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/Keil_Specific/system_XMC1300.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/ParTest_XMC1200.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/ParTest_XMC1200.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/ParTest_XMC1200.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/ParTest_XMC1200.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.ewd similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.ewd rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.ewd diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.ewp similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.ewp rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.ewp diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.eww b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.eww similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.eww rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.eww diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.plg b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.plg similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.plg rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.plg diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.uvopt b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.uvopt similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.uvopt rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.uvopt diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.uvproj b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.uvproj similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/RTOSDemo.uvproj rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/RTOSDemo.uvproj diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/XMC1200.h b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/XMC1200.h similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/XMC1200.h rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/XMC1200.h diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/main-blinky.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main-blinky.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/main-blinky.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main-blinky.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/main-full.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main-full.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/main-full.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main-full.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/main.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/main.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/main.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/settings/RTOSDemo.cspy.bat b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/settings/RTOSDemo.cspy.bat similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/settings/RTOSDemo.cspy.bat rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/settings/RTOSDemo.cspy.bat diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/settings/RTOSDemo.dni b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/settings/RTOSDemo.dni similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/settings/RTOSDemo.dni rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/settings/RTOSDemo.dni diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/settings/RTOSDemo.wsdt similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/settings/RTOSDemo.wsdt rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/settings/RTOSDemo.wsdt diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/settings/RTOSDemo_Debug.jlink b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/settings/RTOSDemo_Debug.jlink similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/settings/RTOSDemo_Debug.jlink rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/settings/RTOSDemo_Debug.jlink diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/system_XMC1200.c b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/system_XMC1200.c similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/system_XMC1200.c rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/system_XMC1200.c diff --git a/FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/system_XMC1200.h b/FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/system_XMC1200.h similarity index 100% rename from FreeRTOS/Demo/CORTEX_M0_Infineon_Boot_Kits_IAR_Keil/system_XMC1200.h rename to FreeRTOS/Demo/CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC/system_XMC1200.h diff --git a/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/FreeRTOSConfig.h index 917c3d486..bedf9458d 100644 --- a/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/FreeRTOSConfig.h @@ -115,20 +115,6 @@ We use --gc-sections when linking, so there is no harm is setting all of these t #define BLOCKQ_1 1 - - -/* A task is created to test the behaviour of the interrupt controller during -context switches. This macro is just used to set a variable to true each time -the test task is switched out - the task itself needs to know when this happens -in order to complete its tests. This macro will slow down the context switch -and can normally be removed (just delete the whole macro, although doing so will -cause the test task to indicate an error). */ -extern void *xICTestTask; -extern volatile unsigned long ulTaskSwitchedOut; -#define traceTASK_SWITCHED_OUT() if( pxCurrentTCB == xICTestTask ) ulTaskSwitchedOut = pdTRUE - - - #endif /* FREERTOS_CONFIG_H */ diff --git a/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c b/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c index 5deee05d3..7c08850a1 100644 --- a/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c +++ b/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/RegTest.c @@ -77,33 +77,15 @@ static void vRegTest1( void *pvParameters ); static void vRegTest2( void *pvParameters ); -/* - * A task that tests the management of the Interrupt Controller (IC) during a - * context switch. The state of the IC current mask level must be maintained - * across context switches. Also, yields must be able to be performed when the - * interrupt controller mask is not zero. This task tests both these - * requirements. - */ -static void prvICCheck1Task( void *pvParameters ); - /* Counters used to ensure the tasks are still running. */ -static volatile unsigned long ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL, ulICTestCounter = 0UL; +static volatile unsigned long ulRegTest1Counter = 0UL, ulRegTest2Counter = 0UL; -/* Handle to the task that checks the interrupt controller behaviour. This is -used by the traceTASK_SWITCHED_OUT() macro, which is defined in -FreeRTOSConfig.h and can be removed - it is just for the purpose of this test. */ -xTaskHandle xICTestTask = NULL; - -/* Variable that gets set to pdTRUE by traceTASK_SWITCHED_OUT each time -is switched out. */ -volatile unsigned long ulTaskSwitchedOut; /*-----------------------------------------------------------*/ void vStartRegTestTasks( void ) { xTaskCreate( vRegTest1, ( signed char * ) "RTest1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL ); xTaskCreate( vRegTest2, ( signed char * ) "RTest1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL ); - xTaskCreate( prvICCheck1Task, ( signed char * ) "ICCheck", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, &xICTestTask ); } /*-----------------------------------------------------------*/ @@ -232,61 +214,9 @@ static void vRegTest2( void *pvParameters ) } /*-----------------------------------------------------------*/ -static void prvICCheck1Task( void *pvParameters ) -{ -long lICCheckStatus = pdPASS; - - for( ;; ) - { - /* At this point the interrupt mask should be zero. */ - if( ic->cpl != 0 ) - { - lICCheckStatus = pdFAIL; - } - - /* If we yield here, it should still be 0 when the task next runs. - ulTaskSwitchedOut is just used to check that a switch does actually - happen. */ - ulTaskSwitchedOut = pdFALSE; - taskYIELD(); - if( ( ulTaskSwitchedOut != pdTRUE ) || ( ic->cpl != 0 ) ) - { - lICCheckStatus = pdFAIL; - } - - /* Set the interrupt mask to portSYSTEM_INTERRUPT_PRIORITY_LEVEL + 1, - before checking it is as expected. */ - taskENTER_CRITICAL(); - if( ic->cpl != ( portSYSTEM_INTERRUPT_PRIORITY_LEVEL + 1 ) ) - { - lICCheckStatus = pdFAIL; - } - - /* If we yield here, it should still be - portSYSTEM_INTERRUPT_PRIORITY_LEVEL + 10 when the task next runs. */ - ulTaskSwitchedOut = pdFALSE; - taskYIELD(); - if( ( ulTaskSwitchedOut != pdTRUE ) || ( ic->cpl != ( portSYSTEM_INTERRUPT_PRIORITY_LEVEL + 1 ) ) ) - { - lICCheckStatus = pdFAIL; - } - - /* Return the interrupt mask to its default state. */ - taskEXIT_CRITICAL(); - - /* Just increment a loop counter so the check task knows if this task - is still running or not. */ - if( lICCheckStatus == pdPASS ) - { - ulICTestCounter++; - } - } -} -/*-----------------------------------------------------------*/ - portBASE_TYPE xAreRegTestTasksStillRunning( void ) { -static unsigned long ulLastCounter1 = 0UL, ulLastCounter2 = 0UL, ulLastICTestCounter = 0UL; +static unsigned long ulLastCounter1 = 0UL, ulLastCounter2 = 0UL; long lReturn; /* Check that both loop counters are still incrementing, indicating that @@ -299,10 +229,6 @@ long lReturn; { lReturn = pdFAIL; } - else if( ulLastICTestCounter == ulICTestCounter ) - { - lReturn = pdFAIL; - } else { lReturn = pdPASS; @@ -310,21 +236,6 @@ long lReturn; ulLastCounter1 = ulRegTest1Counter; ulLastCounter2 = ulRegTest2Counter; - ulLastICTestCounter = ulICTestCounter; return lReturn; } - - - - - - - - - - - - - - diff --git a/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/serial.c b/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/serial.c index 88b469397..a29f99578 100644 --- a/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/serial.c +++ b/FreeRTOS/Demo/CORTUS_APS3_GCC/Demo/serial.c @@ -96,7 +96,6 @@ static void prvRxHandler( void ) __attribute__((noinline)); transmitted. */ static xQueueHandle xRxedChars; static xQueueHandle xCharsForTx; -extern unsigned portBASE_TYPE *pxVectorTable; /*-----------------------------------------------------------*/ xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength ) @@ -112,9 +111,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned port uart1->tx_mask = 0; uart1->rx_mask = 1; irq[IRQ_UART1_TX].ien = 1; - irq[IRQ_UART1_TX].ipl = portSYSTEM_INTERRUPT_PRIORITY_LEVEL; irq[IRQ_UART1_RX].ien = 1; - irq[IRQ_UART1_RX].ipl = portSYSTEM_INTERRUPT_PRIORITY_LEVEL; } return ( xComPortHandle ) 0; -- 2.39.5