From 692bdf1d35f20edd2ffc3d340bf52a20965f935e Mon Sep 17 00:00:00 2001
From: Dan White <dan@whiteaudio.com>
Date: Thu, 2 May 2013 15:09:06 -0500
Subject: [PATCH] msp4th: properly assign 32 interrupt vectors

---
 msp4th/Makefile       | 7 ++++---
 msp4th/ldscript_ns430 | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/msp4th/Makefile b/msp4th/Makefile
index 57c09b7..d20de5e 100644
--- a/msp4th/Makefile
+++ b/msp4th/Makefile
@@ -16,6 +16,7 @@ MCU     = msp2
 #MCU     = msp430x2013
 CPU	= 430x
 MPY     = 16se
+IVCNT   = 32
 # List all the source files here
 # eg if you have a source file foo.c then list it here
 SOURCES = main.c ns430-uart.c msp4th.c
@@ -30,13 +31,13 @@ INCLUDES = -I.
 #CFLAGS   = -mmcu=$(MCU) -Werror -Wall -Wunused -mendup-at=main $(INCLUDES)
 #CFLAGS   = -mmcu=$(MCU) -g -Os -Werror -Wall -Wunused $(INCLUDES)
 #CFLAGS   = -mmcu=$(MCU) -g -Os -Werror -Wall -Wunused $(INCLUDES)
-CFLAGS   = -mcpu=$(CPU) -mmpy=$(MPY) -g -Os -Werror -Wall -Wunused $(INCLUDES)
+CFLAGS   = -mcpu=$(CPU) -mmpy=$(MPY) -mivcnt=$(IVCNT) -g -Os -Werror -Wall -Wunused $(INCLUDES)
 #ASFLAGS  = -mmcu=$(MCU) -x assembler-with-cpp -Wa,-gstabs
 #ASFLAGS  = -mmcu=$(MCU) -Wall -Wunused -mendup-at=main $(INCLUDES)
 #ASFLAGS  = -mmcu=$(MCU) -g -Os -Wall -Wunused $(INCLUDES)
-ASFLAGS  = -mcpu=$(CPU) -mmpy=$(MPY) -g -Os -Wall -Wunused $(INCLUDES)
+ASFLAGS  = -mcpu=$(CPU) -mmpy=$(MPY) -mivcnt=$(IVCNT) -g -Os -Wall -Wunused $(INCLUDES)
 #LDFLAGS  = -mmcu=$(MCU) -Wl,-Map=$(TARGET).map -T ldscript_ns430
-LDFLAGS  = -mcpu=$(CPU) -mmpy=$(MPY) -Wl,-Map=$(TARGET).map -T ldscript_ns430
+LDFLAGS  = -mcpu=$(CPU) -mmpy=$(MPY) -mivcnt=$(IVCNT) -Wl,-Map=$(TARGET).map -T ldscript_ns430
 ########################################################################################
 CC       = msp430-gcc
 LD       = msp430-ld
diff --git a/msp4th/ldscript_ns430 b/msp4th/ldscript_ns430
index 1b21d93..26212a1 100644
--- a/msp4th/ldscript_ns430
+++ b/msp4th/ldscript_ns430
@@ -9,7 +9,7 @@ MEMORY {
   ram (wx)         : ORIGIN = 0x4000, LENGTH = 0x3fe0
   /*rom (rx)         : ORIGIN = 0xf800, LENGTH = 2048-32*/
 
-  vectors          : ORIGIN = 0xffe0, LENGTH = 64
+  vectors          : ORIGIN = 0xffc0, LENGTH = 64
 
   /* Remaining banks are absent */
   bsl              : ORIGIN = 0x0000, LENGTH = 0x0000
-- 
2.25.1