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

4 files changed, 20 insertions, 104 deletions

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
index 58a37266f..042a82793 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/Makefile
@@ -57,6 +57,8 @@ LDSCRIPT= ch.ld
 

 # Imported source files

 CHIBIOS = ../..

+include ${CHIBIOS}/os/hal/hal.mk

+include ${CHIBIOS}/os/hal/platforms/STM32/platform.mk

 include ${CHIBIOS}/os/ports/GCC/ARMCM3/port.mk

 include ${CHIBIOS}/os/kernel/kernel.mk

 include ${CHIBIOS}/test/test.mk

@@ -67,15 +69,9 @@ include ${CHIBIOS}/ext/fatfs/fatfs.mk
 CSRC = ${PORTSRC} \

        ${KERNSRC} \

        ${TESTSRC} \

+       ${HALSRC} \

+       ${PLATFORMSRC} \

        ${FATFSSRC} \

-       ${CHIBIOS}/os/io/pal.c \

-       ${CHIBIOS}/os/io/serial.c \

-       ${CHIBIOS}/os/io/spi.c \

-       ${CHIBIOS}/os/io/mmc_spi.c \

-       ${CHIBIOS}/os/io/platforms/STM32/pal_lld.c \

-       ${CHIBIOS}/os/io/platforms/STM32/serial_lld.c \

-       ${CHIBIOS}/os/io/platforms/STM32/spi_lld.c \

-       ${CHIBIOS}/os/io/platforms/STM32/stm32_dma.c \

        ${CHIBIOS}/os/various/evtimer.c \

        ${CHIBIOS}/os/various/syscalls.c \

        board.c main.c
@@ -108,11 +104,9 @@ TCPPSRC =
 ASMSRC = $(PORTASM) \

          ${CHIBIOS}/os/ports/GCC/ARMCM3/STM32F103/vectors.s

 

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

-         ${CHIBIOS}/os/io \

-         ${CHIBIOS}/os/io/platforms/STM32 \

-         ${CHIBIOS}/os/various \

-         $(FATFSINC)

+INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \

+         $(FATFSINC) \

+         ${CHIBIOS}/os/various

 

 #

 # Project, sources and paths

@@ -159,7 +153,7 @@ CPPWARN = -Wall -Wextra
 #

 

 # List all default C defines here, like -D_DEBUG=1

-DDEFS = -DSTDOUT_SD=SD2 -DSTDIN_SD=SD2

+DDEFS =

 

 # List all default ASM defines here, like -D_DEBUG=1

 DADEFS =

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/board.c b/demos/ARMCM3-STM32F103-FATFS-GCC/board.c
index bc384a544..58be4d77f 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/board.c
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/board.c
@@ -17,35 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include <ch.h>

-#include <pal.h>

-#include <serial.h>

-#include <spi.h>

-#include <mmc_spi.h>

-#include <stm32_dma.h>

-#include <nvic.h>

-

-#include "board.h"

-

-#define AIRCR_VECTKEY           0x05FA0000

-

-/*

- * Digital I/O ports static configuration as defined in @p board.h.

- */

-static const STM32GPIOConfig pal_config =

-{

-  {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},

-  {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},

-  {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},

-  {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},

-#if !defined(STM32F10X_LD)

-  {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},

-#endif

-#if defined(STM32F10X_HD)

-  {VAL_GPIOFODR, VAL_GPIOFCRL, VAL_GPIOFCRH},

-  {VAL_GPIOGODR, VAL_GPIOGCRL, VAL_GPIOGCRH},

-#endif

-};

+#include "ch.h"

+#include "hal.h"

 

 /*

  * Early initialization code.

@@ -54,39 +27,7 @@ static const STM32GPIOConfig pal_config =
  */

 void hwinit0(void) {

 

-  /*

-   * Clocks and PLL initialization.

-   */

-  // HSI setup.

-  RCC->CR = RCC_CR_HSITRIM_RESET_BITS | RCC_CR_HSION;

-  while (!(RCC->CR & RCC_CR_HSIRDY))

-    ;                           // Waits until HSI stable, it should already be.

-  // HSE setup.

-  RCC->CR |= RCC_CR_HSEON;

-  while (!(RCC->CR & RCC_CR_HSERDY))

-    ;                           // Waits until HSE stable.

-  // PLL setup.

-  RCC->CFGR = RCC_CFGR_PLLSRC_HSE_BITS | PLLPREBITS | PLLMULBITS;

-  RCC->CR |= RCC_CR_PLLON;

-  while (!(RCC->CR & RCC_CR_PLLRDY))

-    ;                           // Waits until PLL stable.

-  // Clock sources.

-  RCC->CFGR |= RCC_CFGR_HPRE_DIV1   | RCC_CFGR_PPRE1_DIV2  |

-               RCC_CFGR_PPRE2_DIV2  | RCC_CFGR_ADCPRE_DIV8 |

-               RCC_CFGR_MCO_NOCLOCK | USBPREBITS;

-

-  /*

-   * Flash setup and final clock selection.

-   */

-  FLASH->ACR = FLASHBITS;       // Flash wait states depending on clock.

-  RCC->CFGR |= RCC_CFGR_SW_PLL; // Switches on the PLL clock.

-  while ((RCC->CFGR & RCC_CFGR_SW) != RCC_CFGR_SW_PLL)

-    ;

-

-  /*

-   * I/O ports initialization as specified in board.h.

-   */

-  palInit(&pal_config);

+  stm32_clock_init();

 }

 

 /*

@@ -98,27 +39,13 @@ void hwinit1(void) {
 

   /*

    * NVIC/SCB initialization.

-   * Note: PRIGROUP 4:0 (4:4).

-   */

-  SCB->AIRCR = AIRCR_VECTKEY | SCB_AIRCR_PRIGROUP_0 | SCB_AIRCR_PRIGROUP_1;

-  NVICSetSystemHandlerPriority(HANDLER_SVCALL, PRIORITY_SVCALL);

-  NVICSetSystemHandlerPriority(HANDLER_SYSTICK, PRIORITY_SYSTICK);

-  NVICSetSystemHandlerPriority(HANDLER_PENDSV, PRIORITY_PENDSV);

-

-  /*

-   * SysTick initialization.

    */

-  SysTick->LOAD = SYSCLK / (8000000 / CH_FREQUENCY) - 1;

-  SysTick->VAL = 0;

-  SysTick->CTRL = SysTick_CTRL_ENABLE | SysTick_CTRL_TICKINT;

+  stm32_nvic_init();

 

   /*

-   * Other subsystems initialization.

+   * HAL initialization.

    */

-  dmaInit();

-  sdInit();

-  spiInit();

-  mmcInit();

+  halInit();

 

   /*

    * ChibiOS/RT initialization.

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/main.c b/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
index d46678a3b..b2ff15bdd 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
@@ -17,20 +17,15 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include <ch.h>

-#include <pal.h>

-#include <serial.h>

-#include <spi.h>

-#include <mmc_spi.h>

-#include <evtimer.h>

-#include <test.h>

-

-#include <ff.h>

-

 #include <stdio.h>

 #include <string.h>

 

-#include "board.h"

+#include "ch.h"

+#include "hal.h"

+#include "test.h"

+#include "evtimer.h"

+

+#include "ff.h"

 

 /**

  * @brief FS object.

diff --git a/ext/ff007e-patched.zip b/ext/ff007e-patched.zip
index 0e10e0308..e6aab7a8b 100644
--- a/ext/ff007e-patched.zip
+++ b/ext/ff007e-patched.zip