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

7 files changed, 20 insertions, 21 deletions

diff --git a/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile b/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
index b0afd0421..fa4567fb4 100644
--- a/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM0-STM32F051-DISCOVERY/Makefile
@@ -64,7 +64,7 @@ include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
 include $(CHIBIOS)/os/hal/boards/ST_STM32F0_DISCOVERY/board.mk

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

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

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

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

 include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -206,4 +206,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/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile b/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
index 3b9345b6e..d6676f786 100644
--- a/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM4-STM32F303-DISCOVERY/Makefile
@@ -70,7 +70,7 @@ 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/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/devices/STM32F30x/port.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/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
index 3968459dc..2e7dbeeea 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/Makefile
@@ -70,7 +70,7 @@ include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

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

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

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

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

 include $(CHIBIOS)/test/test.mk

 

 # Define linker script file here

@@ -223,4 +223,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/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/chconf.h b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/chconf.h
index 2efd81b54..2d9e90365 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/chconf.h
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/chconf.h
@@ -50,7 +50,7 @@
  *          measurements.

  */

 #if !defined(CH_CFG_RTC_FREQUENCY) || defined(__DOXYGEN__)

-#define CH_CFG_RTC_FREQUENCY                72000000

+#define CH_CFG_RTC_FREQUENCY                168000000

 #endif

 

 /**

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/halconf.h b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/halconf.h
index d63d30523..d80a549b9 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/halconf.h
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/halconf.h
@@ -97,7 +97,7 @@
  * @brief   Enables the PWM subsystem.

  */

 #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 FALSE

+#define HAL_USE_PWM                 TRUE

 #endif

 

 /**

@@ -125,14 +125,14 @@
  * @brief   Enables the SERIAL over USB subsystem.

  */

 #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          FALSE

+#define HAL_USE_SERIAL_USB          TRUE

 #endif

 

 /**

  * @brief   Enables the SPI subsystem.

  */

 #if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 FALSE

+#define HAL_USE_SPI                 TRUE

 #endif

 

 /**

@@ -146,7 +146,7 @@
  * @brief   Enables the USB subsystem.

  */

 #if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 FALSE

+#define HAL_USE_USB                 TRUE

 #endif

 

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

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
index e05505cd2..c71f2f1ee 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
@@ -50,33 +50,32 @@ static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {
 

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

   static const char *states[] = {CH_THD_STATE_NAMES};

-  Thread *tp;

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

     chprintf(chp, "Usage: threads\r\n");

     return;

   }

-  chprintf(chp, "    addr    stack prio refs     state time\r\n");

+  chprintf(chp, "    addr    stack prio refs     state\r\n");

   tp = chRegFirstThread();

   do {

-    chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s %lu\r\n",

+    chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s\r\n",

              (uint32_t)tp, (uint32_t)tp->p_ctx.r13,

-             (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),

-             states[tp->p_state], (uint32_t)tp->p_time);

+             (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1));

     tp = chRegNextThread(tp);

   } while (tp != NULL);

 }

 

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

-  Thread *tp;

+  thread_t *tp;

 

   (void)argv;

   if (argc > 0) {

     chprintf(chp, "Usage: test\r\n");

     return;

   }

-  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(),

+  tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),

                            TestThread, chp);

   if (tp == NULL) {

     chprintf(chp, "out of memory\r\n");

@@ -223,7 +222,7 @@ static msg_t Thread1(void *arg) {
  * Application entry point.

  */

 int main(void) {

-  Thread *shelltp = NULL;

+  thread_t *shelltp = NULL;

 

   /*

    * System initializations.

diff --git a/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile b/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
index 50f0a6188..6c63f1a5b 100644
--- a/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
+++ b/demos/rt/ARMCM4-STM32F407-DISCOVERY/Makefile
@@ -70,7 +70,7 @@ include $(CHIBIOS)/os/hal/osal/chibios/osal.mk
 include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

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

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

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

+include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.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