git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6262 35acf78f-673a-0410-8e92-d51de3d6d3f4

24 files changed, 71 insertions, 58 deletions

diff --git a/testhal/STM32F30x/ADC/.cproject b/testhal/STM32F30x/ADC/.cproject
index 18ecf6a9c..7a8791dfc 100644
--- a/testhal/STM32F30x/ADC/.cproject
+++ b/testhal/STM32F30x/ADC/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.1093754934." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1759793652" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1759793652.1073835528" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.414217340" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.414217340" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1008021590" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.562952538" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.270557492" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,6 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="refreshScope"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/STM32F30x/ADC/Makefile b/testhal/STM32F30x/ADC/Makefile
index 41c3e23a8..e5f7de13b 100644
--- a/testhal/STM32F30x/ADC/Makefile
+++ b/testhal/STM32F30x/ADC/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 #include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/ADC/main.c b/testhal/STM32F30x/ADC/main.c
index 8489f1bef..9306b14d1 100644
--- a/testhal/STM32F30x/ADC/main.c
+++ b/testhal/STM32F30x/ADC/main.c
@@ -104,7 +104,7 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F30x/ADC_DUAL/.cproject b/testhal/STM32F30x/ADC_DUAL/.cproject
index 151e30397..980f2e991 100644
--- a/testhal/STM32F30x/ADC_DUAL/.cproject
+++ b/testhal/STM32F30x/ADC_DUAL/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.269849277." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.689247287" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.689247287.2040844148" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.250518604" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.250518604" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1289173301" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.1429619453" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.448763111" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,6 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="refreshScope"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/STM32F30x/ADC_DUAL/Makefile b/testhal/STM32F30x/ADC_DUAL/Makefile
index 41c3e23a8..e5f7de13b 100644
--- a/testhal/STM32F30x/ADC_DUAL/Makefile
+++ b/testhal/STM32F30x/ADC_DUAL/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 #include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/ADC_DUAL/main.c b/testhal/STM32F30x/ADC_DUAL/main.c
index c4fa35c5c..849207de0 100644
--- a/testhal/STM32F30x/ADC_DUAL/main.c
+++ b/testhal/STM32F30x/ADC_DUAL/main.c
@@ -128,7 +128,7 @@ static const ADCConversionGroup adcgrpcfg2 = {
 /*

  * Red LEDs blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F30x/CAN/.cproject b/testhal/STM32F30x/CAN/.cproject
index 7cdad62bb..e18f952ce 100644
--- a/testhal/STM32F30x/CAN/.cproject
+++ b/testhal/STM32F30x/CAN/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/CAN/Makefile b/testhal/STM32F30x/CAN/Makefile
index 41c3e23a8..e5f7de13b 100644
--- a/testhal/STM32F30x/CAN/Makefile
+++ b/testhal/STM32F30x/CAN/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 #include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/CAN/main.c b/testhal/STM32F30x/CAN/main.c
index 52e3ad1b6..27ba16bf7 100644
--- a/testhal/STM32F30x/CAN/main.c
+++ b/testhal/STM32F30x/CAN/main.c
@@ -30,7 +30,7 @@ static const CANConfig cancfg = {
 /*

  * Receiver thread.

  */

-static WORKING_AREA(can_rx_wa, 256);

+static THD_WORKING_AREA(can_rx_wa, 256);

 static msg_t can_rx(void *p) {

   event_listener_t el;

   CANRxFrame rxmsg;

@@ -53,7 +53,7 @@ static msg_t can_rx(void *p) {
 /*

  * Transmitter thread.

  */

-static WORKING_AREA(can_tx_wa, 256);

+static THD_WORKING_AREA(can_tx_wa, 256);

 static msg_t can_tx(void * p) {

   CANTxFrame txmsg;

 

diff --git a/testhal/STM32F30x/EXT/.cproject b/testhal/STM32F30x/EXT/.cproject
index 81789e942..c9c383d84 100644
--- a/testhal/STM32F30x/EXT/.cproject
+++ b/testhal/STM32F30x/EXT/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.779783487." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.504160665" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.504160665.1873829009" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1953095184" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1953095184" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1380710080" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.1057984653" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1281924276" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,6 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="refreshScope"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/STM32F30x/EXT/Makefile b/testhal/STM32F30x/EXT/Makefile
index 41c3e23a8..e5f7de13b 100644
--- a/testhal/STM32F30x/EXT/Makefile
+++ b/testhal/STM32F30x/EXT/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 #include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/IRQ_STORM/.cproject b/testhal/STM32F30x/IRQ_STORM/.cproject
index ed2858c43..e59cf38b3 100644
--- a/testhal/STM32F30x/IRQ_STORM/.cproject
+++ b/testhal/STM32F30x/IRQ_STORM/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/IRQ_STORM/Makefile b/testhal/STM32F30x/IRQ_STORM/Makefile
index 41c3e23a8..e5f7de13b 100644
--- a/testhal/STM32F30x/IRQ_STORM/Makefile
+++ b/testhal/STM32F30x/IRQ_STORM/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 #include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/IRQ_STORM/main.c b/testhal/STM32F30x/IRQ_STORM/main.c
index 21684a868..539ea7c06 100644
--- a/testhal/STM32F30x/IRQ_STORM/main.c
+++ b/testhal/STM32F30x/IRQ_STORM/main.c
@@ -57,7 +57,7 @@ static msg_t b[NUM_THREADS][MAILBOX_SIZE];
 /*

  * Test worker threads.

  */

-static WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

+static THD_WORKING_AREA(waWorkerThread[NUM_THREADS], 128);

 static msg_t WorkerThread(void *arg) {

   static volatile unsigned x = 0;

   static unsigned cnt = 0;

@@ -243,19 +243,19 @@ int main(void) {
   println(CH_KERNEL_VERSION);

   print("*** Compiled:     ");

   println(__DATE__ " - " __TIME__);

-#ifdef CH_COMPILER_NAME

+#ifdef PORT_COMPILER_NAME

   print("*** Compiler:     ");

-  println(CH_COMPILER_NAME);

+  println(PORT_COMPILER_NAME);

 #endif

   print("*** Architecture: ");

-  println(CH_ARCHITECTURE_NAME);

-#ifdef CH_CORE_VARIANT_NAME

+  println(PORT_ARCHITECTURE_NAME);

+#ifdef PORT_CORE_VARIANT_NAME

   print("*** Core Variant: ");

-  println(CH_CORE_VARIANT_NAME);

+  println(PORT_CORE_VARIANT_NAME);

 #endif

-#ifdef CH_PORT_INFO

+#ifdef PORT_INFO

   print("*** Port Info:    ");

-  println(CH_PORT_INFO);

+  println(PORT_INFO);

 #endif

 #ifdef PLATFORM_NAME

   print("*** Platform:     ");

diff --git a/testhal/STM32F30x/PWM-ICU/.cproject b/testhal/STM32F30x/PWM-ICU/.cproject
index 0bb5b2f00..94e436ca4 100644
--- a/testhal/STM32F30x/PWM-ICU/.cproject
+++ b/testhal/STM32F30x/PWM-ICU/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/PWM-ICU/Makefile b/testhal/STM32F30x/PWM-ICU/Makefile
index 41c3e23a8..e5f7de13b 100644
--- a/testhal/STM32F30x/PWM-ICU/Makefile
+++ b/testhal/STM32F30x/PWM-ICU/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 #include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/SPI/.cproject b/testhal/STM32F30x/SPI/.cproject
index 104d73e64..697309c7f 100644
--- a/testhal/STM32F30x/SPI/.cproject
+++ b/testhal/STM32F30x/SPI/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/SPI/Makefile b/testhal/STM32F30x/SPI/Makefile
index 41c3e23a8..e5f7de13b 100644
--- a/testhal/STM32F30x/SPI/Makefile
+++ b/testhal/STM32F30x/SPI/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 #include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/SPI/main.c b/testhal/STM32F30x/SPI/main.c
index aedae794a..84c870354 100644
--- a/testhal/STM32F30x/SPI/main.c
+++ b/testhal/STM32F30x/SPI/main.c
@@ -48,7 +48,7 @@ static uint8_t rxbuf[512];
 /*

  * SPI bus contender 1.

  */

-static WORKING_AREA(spi_thread_1_wa, 256);

+static THD_WORKING_AREA(spi_thread_1_wa, 256);

 static msg_t spi_thread_1(void *p) {

 

   (void)p;

@@ -69,7 +69,7 @@ static msg_t spi_thread_1(void *p) {
 /*

  * SPI bus contender 2.

  */

-static WORKING_AREA(spi_thread_2_wa, 256);

+static THD_WORKING_AREA(spi_thread_2_wa, 256);

 static msg_t spi_thread_2(void *p) {

 

   (void)p;

@@ -90,7 +90,7 @@ static msg_t spi_thread_2(void *p) {
  * This is a periodic thread that does absolutely nothing except flashing

  * a LED.

  */

-static WORKING_AREA(blinker_wa, 128);

+static THD_WORKING_AREA(blinker_wa, 128);

 static msg_t blinker(void *arg) {

 

   (void)arg;

diff --git a/testhal/STM32F30x/UART/.cproject b/testhal/STM32F30x/UART/.cproject
index 661d548d0..813ef9678 100644
--- a/testhal/STM32F30x/UART/.cproject
+++ b/testhal/STM32F30x/UART/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.2073938137." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1743372457" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1743372457.434488400" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1298110239" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1298110239" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.546527516" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.1727550430" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1626540872" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,6 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="refreshScope"/>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/testhal/STM32F30x/UART/Makefile b/testhal/STM32F30x/UART/Makefile
index 41c3e23a8..e5f7de13b 100644
--- a/testhal/STM32F30x/UART/Makefile
+++ b/testhal/STM32F30x/UART/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 #include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -222,4 +222,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/USB_CDC/.cproject b/testhal/STM32F30x/USB_CDC/.cproject
index 839c40d30..49ee0dcf1 100644
--- a/testhal/STM32F30x/USB_CDC/.cproject
+++ b/testhal/STM32F30x/USB_CDC/.cproject
@@ -48,4 +48,5 @@
 		</scannerConfigBuildInfo>

 	</storageModule>

 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

+	<storageModule moduleId="refreshScope"/>

 </cproject>

diff --git a/testhal/STM32F30x/USB_CDC/Makefile b/testhal/STM32F30x/USB_CDC/Makefile
index f4d7da196..ba4f533d5 100644
--- a/testhal/STM32F30x/USB_CDC/Makefile
+++ b/testhal/STM32F30x/USB_CDC/Makefile
@@ -66,11 +66,11 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../..

 include $(CHIBIOS)/os/hal/hal.mk

-include $(CHIBIOS)/os/hal/osal/chibios/osal.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F3_DISCOVERY/board.mk

-include $(CHIBIOS)/os/hal/platforms/STM32F30x/platform.mk

+include $(CHIBIOS)/os/hal/ports/STM32F30x/platform.mk

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.mk

+include $(CHIBIOS)/os/rt/osal/osal.mk

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f30x.mk

 include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -224,4 +224,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER

 endif

 

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/rules.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/rules.mk

diff --git a/testhal/STM32F30x/USB_CDC/main.c b/testhal/STM32F30x/USB_CDC/main.c
index 7ace5c306..31122bcbd 100644
--- a/testhal/STM32F30x/USB_CDC/main.c
+++ b/testhal/STM32F30x/USB_CDC/main.c
@@ -339,8 +339,8 @@ static const SerialUSBConfig serusbcfg = {
 /* Command line related.                                                     */

 /*===========================================================================*/

 

-#define SHELL_WA_SIZE   THD_WA_SIZE(2048)

-#define TEST_WA_SIZE    THD_WA_SIZE(256)

+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)

+#define TEST_WA_SIZE    THD_WORKING_AREA_SIZE(256)

 

 static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {

   size_t n, size;

@@ -444,7 +444,7 @@ static const ShellConfig shell_cfg1 = {
 /*

  * Red LED blinker thread, times are in milliseconds.

  */

-static WORKING_AREA(waThread1, 128);

+static THD_WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

 

   (void)arg;