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

3 files changed, 13 insertions, 12 deletions

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:     ");