summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-03-09 09:26:29 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-03-09 09:26:29 -0600
commitabd22ab2a1bb17ff5539d14e6d7bdb471a82a6c2 (patch)
tree814f8a62894977857cd64b936a080af44d3497b4
parentfa205132b0da1f2e604b2323b9d8c9374e49a47a (diff)
downloadnuttx-abd22ab2a1bb17ff5539d14e6d7bdb471a82a6c2.tar.gz
nuttx-abd22ab2a1bb17ff5539d14e6d7bdb471a82a6c2.tar.bz2
nuttx-abd22ab2a1bb17ff5539d14e6d7bdb471a82a6c2.zip
Oop.. everything was named TM3C instead of TM4C in the last check-in
-rw-r--r--nuttx/arch/arm/include/tiva/irq.h2
-rw-r--r--nuttx/arch/arm/include/tiva/tm4c_irq.h (renamed from nuttx/arch/arm/include/tiva/tm3c_irq.h)8
-rw-r--r--nuttx/arch/arm/src/tiva/chip/tiva_vectors.h4
-rw-r--r--nuttx/arch/arm/src/tiva/chip/tm4c_vectors.h (renamed from nuttx/arch/arm/src/tiva/chip/tm3c_vectors.h)4
4 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/arch/arm/include/tiva/irq.h b/nuttx/arch/arm/include/tiva/irq.h
index debf4a4b0..5658a593e 100644
--- a/nuttx/arch/arm/include/tiva/irq.h
+++ b/nuttx/arch/arm/include/tiva/irq.h
@@ -90,7 +90,7 @@
#elif defined(CONFIG_ARCH_CHIP_LM4F)
# include <arch/tiva/lm4f_irq.h>
#elif defined(CONFIG_ARCH_CHIP_TM4C)
-# include <arch/tiva/tm3c_irq.h>
+# include <arch/tiva/tm4c_irq.h>
#else
# error "Unsupported Stellaris IRQ file"
#endif
diff --git a/nuttx/arch/arm/include/tiva/tm3c_irq.h b/nuttx/arch/arm/include/tiva/tm4c_irq.h
index 148282067..616898ee8 100644
--- a/nuttx/arch/arm/include/tiva/tm3c_irq.h
+++ b/nuttx/arch/arm/include/tiva/tm4c_irq.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/arm/include/tiva/tm3c_irq.h
+ * arch/arm/include/tiva/tm4c_irq.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_ARM_INCLUDE_TIVA_TM3C_IRQ_H
-#define __ARCH_ARM_INCLUDE_TIVA_TM3C_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_TIVA_TM4C_IRQ_H
+#define __ARCH_ARM_INCLUDE_TIVA_TM4C_IRQ_H
/************************************************************************************
* Included Files
@@ -240,5 +240,5 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_ARM_INCLUDE_TIVA_TM3C_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_TIVA_TM4C_IRQ_H */
diff --git a/nuttx/arch/arm/src/tiva/chip/tiva_vectors.h b/nuttx/arch/arm/src/tiva/chip/tiva_vectors.h
index 036283c10..bb7f6858e 100644
--- a/nuttx/arch/arm/src/tiva/chip/tiva_vectors.h
+++ b/nuttx/arch/arm/src/tiva/chip/tiva_vectors.h
@@ -43,8 +43,8 @@
# include "chip/lm3s_vectors.h"
#elif defined(CONFIG_ARCH_CHIP_LM4F)
# include "chip/lm4f_vectors.h"
-#elif defined(CONFIG_ARCH_CHIP_TM3C)
-# include "chip/tm3c_vectors.h"
+#elif defined(CONFIG_ARCH_CHIP_TM4C)
+# include "chip/tm4c_vectors.h"
#else
# error "Unsupported Tiva/Stellaris vector file"
#endif
diff --git a/nuttx/arch/arm/src/tiva/chip/tm3c_vectors.h b/nuttx/arch/arm/src/tiva/chip/tm4c_vectors.h
index 577c87dd5..28f58eedf 100644
--- a/nuttx/arch/arm/src/tiva/chip/tm3c_vectors.h
+++ b/nuttx/arch/arm/src/tiva/chip/tm4c_vectors.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/arm/src/tiva/chip/tm2c_vectors.h
+ * arch/arm/src/tiva/chip/tm4c_vectors.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,7 +43,7 @@
/* This file is included by tiva_vectors.S. It provides the macro VECTOR that
* supplies each Tiva vector in terms of a (lower-case) ISR label and an
- * (upper-case) IRQ number as defined in arch/arm/include/tiva/tm3c_irq.h.
+ * (upper-case) IRQ number as defined in arch/arm/include/tiva/tm4c_irq.h.
* tiva_vectors.S will define the VECTOR in different ways in order to generate
* the interrupt vectors and handlers in their final form.
*/