From b27329f45b8e51d9ee2149e2ea102d13ce15f886 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 26 Jul 2008 17:39:01 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@366
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 ports/ARMCM3/nvic.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'ports')

diff --git a/ports/ARMCM3/nvic.h b/ports/ARMCM3/nvic.h
index 96a70ea85..13a04fe78 100644
--- a/ports/ARMCM3/nvic.h
+++ b/ports/ARMCM3/nvic.h
@@ -31,9 +31,9 @@ typedef struct {
   IOREG32       RVR;
   IOREG32       CVR;
   IOREG32       CBVR;
-} ST;
+} CM3_ST;
 
-#define STBase                  ((ST *)0xE000E010)
+#define STBase                  ((CM3_ST *)0xE000E010)
 #define ST_CSR                  (STBase->CSR)
 #define ST_RVR                  (STBase->RVR)
 #define ST_CVR                  (STBase->CVR)
@@ -70,9 +70,9 @@ typedef struct {
   IOREG32       IABR[8];
   IOREG32       unused5[56];
   IOREG32       IPR[60];
-} NVIC;
+} CM3_NVIC;
 
-#define NVICBase                ((NVIC *)0xE000E100)
+#define NVICBase                ((CM3_NVIC *)0xE000E100)
 #define NVIC_ISER(n)            (NVICBase->ISER[n])
 #define NVIC_ICER(n)            (NVICBase->ICER[n])
 #define NVIC_ISPR(n)            (NVICBase->ISPR[n])
@@ -95,9 +95,9 @@ typedef struct {
   IOREG32       MMFAR;
   IOREG32       BFAR;
   IOREG32       AFSR;
-} SCB;
+} CM3_SCB;
 
-#define SCBBase                 ((SCB *)0xE000ED00)
+#define SCBBase                 ((CM3_SCB *)0xE000ED00)
 #define SCB_CPUID               (SCBBase->CPUID)
 #define SCB_ICSR                (SCBBase->ICSR)
 #define SCB_VTOR                (SCBBase->VTOR)
-- 
cgit v1.2.3