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

4 files changed, 1 insertions, 77 deletions

diff --git a/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c b/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c
deleted file mode 100644
index 9eba072c5..000000000
--- a/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*

-    Nil RTOS - Copyright (C) 2012 Giovanni Di Sirio.

-

-    This file is part of Nil RTOS.

-

-    Nil RTOS is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    Nil RTOS is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    STM32F3xx/chtimer.c

- * @brief   System timer code.

- *

- * @addtogroup STM32F3_TIMER

- */

-

-#include "ch.h"

-

-#if CH_CFG_TIMEDELTA > 0

-

-/*===========================================================================*/

-/* Module local definitions.                                                 */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module exported variables.                                                */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module local variables.                                                   */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module local functions.                                                   */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Module interrupt handlers.                                                */

-/*===========================================================================*/

-

-/**

- * @brief   TIM2 interrupt handler.

- *

- * @isr

- */

-CH_IRQ_HANDLER(VectorB0) {

-

-  CH_IRQ_PROLOGUE();

-

-  STM32F3_TIM2->SR = 0;

-

-  chSysLockFromISR();

-  chSysTimerHandlerI();

-  chSysUnlockFromISR();

-

-  CH_IRQ_EPILOGUE();

-}

-

-/*===========================================================================*/

-/* Module exported functions.                                                */

-/*===========================================================================*/

-

-#endif /* CH_CFG_TIMEDELTA > 0 */

-

-/** @} */

diff --git a/os/ports/GCC/ARMCMx/STM32F3xx/port.mk b/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
index e4da1ad11..09cc8dfd6 100644
--- a/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
+++ b/os/ports/GCC/ARMCMx/STM32F3xx/port.mk
@@ -1,7 +1,6 @@
 # List of the ChibiOS/RT Cortex-M4 STM32 port files.

 PORTSRC = $(CHIBIOS)/os/ports/GCC/ARMCMx/crt0.c \

           $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/vectors.c \

-          $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c \

           ${CHIBIOS}/os/ports/GCC/ARMCMx/chcore.c \

           ${CHIBIOS}/os/ports/GCC/ARMCMx/chcore_v7m.c \

           ${CHIBIOS}/os/ports/common/ARMCMx/nvic.c

diff --git a/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.h b/os/ports/GCC/ARMCMx/STM32F3xx/systick.h
index 4f42a1fb3..4f42a1fb3 100644
--- a/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.h
+++ b/os/ports/GCC/ARMCMx/STM32F3xx/systick.h
diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h
index b9b30dad2..e3a6c627c 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.h
@@ -405,7 +405,7 @@ extern "C" {
 #endif

 

 #if CH_CFG_TIMEDELTA > 0

-#include "chtimer.h"

+#include "systick.h"

 #endif

 

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