From 476b69eb75e5eca105bb4b3474df19e6cfdbed68 Mon Sep 17 00:00:00 2001
From: arighi <arighi@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 14 Apr 2010 10:47:27 +0000
Subject: [PATCH] CM3: generic timer (Systick) driver implementation.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3435 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/cpu/cortex-m3/drv/{timer_lm3s.c => timer_cm3.c} | 5 ++---
 bertos/cpu/cortex-m3/drv/timer_cm3.h                   | 4 ++--
 bertos/cpu/cortex-m3/drv/timer_lm3s.h                  | 2 +-
 examples/lm3s1968/lm3s1968.mk                          | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename bertos/cpu/cortex-m3/drv/{timer_lm3s.c => timer_cm3.c} (95%)

diff --git a/bertos/cpu/cortex-m3/drv/timer_lm3s.c b/bertos/cpu/cortex-m3/drv/timer_cm3.c
similarity index 95%
rename from bertos/cpu/cortex-m3/drv/timer_lm3s.c
rename to bertos/cpu/cortex-m3/drv/timer_cm3.c
index 49b9fa8e..a4d96689 100644
--- a/bertos/cpu/cortex-m3/drv/timer_lm3s.c
+++ b/bertos/cpu/cortex-m3/drv/timer_cm3.c
@@ -30,16 +30,15 @@
  *
  * -->
  *
- * \brief Low-level timer driver for LM3S1968.
+ * \brief Low-level timer driver (SysTick) for LM3S1968.
  *
  * \author Andrea Righi <arighi@develer.com>
  */
 
 #include <cfg/debug.h>
 #include <cpu/irq.h>
-#include <io/lm3s.h>
 #include <drv/irq_cm3.h>
-#include "timer_lm3s.h"
+#include "timer_cm3.h"
 
 INLINE void timer_hw_setPeriod(unsigned long period)
 {
diff --git a/bertos/cpu/cortex-m3/drv/timer_cm3.h b/bertos/cpu/cortex-m3/drv/timer_cm3.h
index 0418a45b..6cfaf8cf 100644
--- a/bertos/cpu/cortex-m3/drv/timer_cm3.h
+++ b/bertos/cpu/cortex-m3/drv/timer_cm3.h
@@ -30,9 +30,9 @@
  *
  * -->
  *
- * \author Francesco Sacchi <batt@develer.com>
+ * \author Andrea Righi <arighi@develer.com>
  *
- * \brief Low-level timer module for Cortex-M3 (interface).
+ * \brief Low-level timer driver (SysTick) for Cortex-M3.
  */
 
 #include <cpu/detect.h>
diff --git a/bertos/cpu/cortex-m3/drv/timer_lm3s.h b/bertos/cpu/cortex-m3/drv/timer_lm3s.h
index 3d7c979f..00c532f2 100644
--- a/bertos/cpu/cortex-m3/drv/timer_lm3s.h
+++ b/bertos/cpu/cortex-m3/drv/timer_lm3s.h
@@ -30,7 +30,7 @@
  *
  * -->
  *
- * \brief Low-level timer driver for LM3S1968.
+ * \brief Low-level timer driver (SysTick) for LM3S1968.
  *
  * \author Andrea Righi <arighi@develer.com>
  */
diff --git a/examples/lm3s1968/lm3s1968.mk b/examples/lm3s1968/lm3s1968.mk
index 475bdb47..4d71d0da 100644
--- a/examples/lm3s1968/lm3s1968.mk
+++ b/examples/lm3s1968/lm3s1968.mk
@@ -43,11 +43,11 @@ lm3s1968_CSRC = \
 	bertos/kern/preempt.c \
 	bertos/kern/signal.c \
 	bertos/cpu/cortex-m3/drv/gpio_lm3s.c \
-	bertos/cpu/cortex-m3/drv/timer_lm3s.c \
 	bertos/cpu/cortex-m3/drv/clock_lm3s.c \
 	bertos/cpu/cortex-m3/drv/ser_lm3s.c \
 	bertos/cpu/cortex-m3/drv/kdebug_lm3s.c \
 	bertos/cpu/cortex-m3/drv/ssi_lm3s.c \
+	bertos/cpu/cortex-m3/drv/timer_cm3.c \
 	bertos/cpu/cortex-m3/drv/irq_cm3.c \
 	bertos/cpu/cortex-m3/hw/switch_ctx_cm3.c \
 	bertos/cpu/cortex-m3/hw/init_lm3s.c
@@ -70,7 +70,7 @@ lm3s1968_PROGRAMMER_CPU = lm3s1968
 lm3s1968_PROGRAMMER_TYPE = lm3s1968
 lm3s1968_FLASH_SCRIPT = bertos/prg_scripts/arm/flash-cortex.sh
 lm3s1968_STOPFLASH_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
-lm3s1968_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug.sh
+lm3s1968_DEBUG_SCRIPT = bertos/prg_scripts/arm/debug-cortex.sh
 lm3s1968_STOPDEBUG_SCRIPT = bertos/prg_scripts/arm/stopopenocd.sh
 
 ifeq ($(lm3s1968_DEBUG),0)
-- 
2.25.1