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

5 files changed, 16 insertions, 21 deletions

diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/Makefile b/demos/ARMCM4-STM32F303-DISCOVERY/Makefile
index 0a5b2300e..b5bec63e4 100644
--- a/demos/ARMCM4-STM32F303-DISCOVERY/Makefile
+++ b/demos/ARMCM4-STM32F303-DISCOVERY/Makefile
@@ -66,8 +66,9 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../..

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

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

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

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

+include $(CHIBIOS)/os/halnew/osal/chibios/osal.mk

+include $(CHIBIOS)/os/halnew/platforms/STM32F30x/platform.mk

 include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/port.mk

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

 include $(CHIBIOS)/test/test.mk

@@ -81,6 +82,7 @@ CSRC = $(PORTSRC) \
        $(KERNSRC) \

        $(TESTSRC) \

        $(HALSRC) \

+       $(OSALSRC) \

        $(PLATFORMSRC) \

        $(BOARDSRC) \

        main.c

@@ -113,7 +115,7 @@ TCPPSRC =
 ASMSRC = $(PORTASM)

 

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

-         $(HALINC) $(PLATFORMINC) $(BOARDINC) \

+         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHIBIOS)/os/various/devices_lib/accel \

          $(CHIBIOS)/os/various

 

diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h b/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h
index 727f9de89..8e9187455 100644
--- a/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h
+++ b/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h
@@ -281,7 +281,7 @@
  * @note    The default is @p TRUE.

  */

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

-#define CH_CFG_USE_QUEUES                   TRUE

+#define CH_CFG_USE_QUEUES                   FALSE

 #endif

 

 /**

diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/halconf.h b/demos/ARMCM4-STM32F303-DISCOVERY/halconf.h
index 3858828e6..8dcb3fba2 100644
--- a/demos/ARMCM4-STM32F303-DISCOVERY/halconf.h
+++ b/demos/ARMCM4-STM32F303-DISCOVERY/halconf.h
@@ -31,13 +31,6 @@
 #include "mcuconf.h"

 

 /**

- * @brief   Enables the TM subsystem.

- */

-#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)

-#define HAL_USE_TM                  FALSE

-#endif

-

-/**

  * @brief   Enables the PAL subsystem.

  */

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

@@ -48,14 +41,14 @@
  * @brief   Enables the ADC subsystem.

  */

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

-#define HAL_USE_ADC                 FALSE

+#define HAL_USE_ADC                 TRUE

 #endif

 

 /**

  * @brief   Enables the CAN subsystem.

  */

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

-#define HAL_USE_CAN                 FALSE

+#define HAL_USE_CAN                 TRUE

 #endif

 

 /**

diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/main.c b/demos/ARMCM4-STM32F303-DISCOVERY/main.c
index ed10165af..e12a55fda 100644
--- a/demos/ARMCM4-STM32F303-DISCOVERY/main.c
+++ b/demos/ARMCM4-STM32F303-DISCOVERY/main.c
@@ -101,9 +101,9 @@ int main(void) {
    * Activates the serial driver 1 using the driver default configuration.

    * PA9(TX) and PA10(RX) are routed to USART1.

    */

-  sdStart(&SD1, NULL);

-  palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7));

-  palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7));

+//  sdStart(&SD1, NULL);

+//  palSetPadMode(GPIOA, 9, PAL_MODE_ALTERNATE(7));

+//  palSetPadMode(GPIOA, 10, PAL_MODE_ALTERNATE(7));

 

   /*

    * Creates the example thread.

@@ -117,8 +117,8 @@ int main(void) {
    * pressed the test procedure is launched.

    */

   while (TRUE) {

-    if (palReadPad(GPIOA, GPIOA_BUTTON))

-      TestThread(&SD1);

+//    if (palReadPad(GPIOA, GPIOA_BUTTON))

+//      TestThread(&SD1);

     chThdSleepMilliseconds(500);

   }

 }

diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/mcuconf.h b/demos/ARMCM4-STM32F303-DISCOVERY/mcuconf.h
index b661ca71e..8050a5f29 100644
--- a/demos/ARMCM4-STM32F303-DISCOVERY/mcuconf.h
+++ b/demos/ARMCM4-STM32F303-DISCOVERY/mcuconf.h
@@ -66,8 +66,8 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  FALSE

-#define STM32_ADC_USE_ADC3                  FALSE

+#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_USE_ADC3                  TRUE

 #define STM32_ADC_ADC12_DMA_PRIORITY        2

 #define STM32_ADC_ADC34_DMA_PRIORITY        2

 #define STM32_ADC_ADC12_IRQ_PRIORITY        5

@@ -81,7 +81,7 @@
 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  FALSE

+#define STM32_CAN_USE_CAN1                  TRUE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*