From 33c548994df07e43f25464b7d3f24642e9142a99 Mon Sep 17 00:00:00 2001
From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Sat, 15 May 2010 06:26:36 +0000
Subject: [PATCH] WEAKDEFed ejtaghandle.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@504 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---
 firmware/Makefile              | 4 ++--
 firmware/apps/jtag/jtag430.c   | 3 ++-
 firmware/apps/jtag/jtag430x2.c | 1 +
 firmware/goodfet.c             | 4 ++--
 firmware/include/command.h     | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/firmware/Makefile b/firmware/Makefile
index 59ef648..5117f0c 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -23,12 +23,12 @@ CCEXTRA?=
 CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
 
 #Define extra modules here.
-moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o apps/glitch/glitch.o apps/jtag/sbw.o apps/smartcard/smartcard.o
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o apps/glitch/glitch.o apps/jtag/sbw.o apps/smartcard/smartcard.o apps/jtag/ejtag.o apps/jtag/jtagxscale.o
 # should include apps/jtag/jtagarm7tdmi.o to build jtag for ARM7
 # should include apps/pic/dspic33f.o to build support for PIC24H/dsPIC33F
 
 # Used to include  $(moreapps)
-apps=  apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o apps/jtag/ejtag.o apps/jtag/jtagxscale.o
+apps=  apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o 
 
 #apps/chipcon/chipconasm.o removed
 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o  lib/dco_calib.o
diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index 95e91a6..7aea264 100644
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -245,6 +245,7 @@ void jtag430_start(){
   SETRST;
   delay(0xFFFF);
 
+
   #ifndef SBWREWRITE
   //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
   CLRRST;
@@ -265,7 +266,7 @@ void jtag430_start(){
   jtag430_haltcpu();
 }
 
-//! Start normally, not JTAG.
+//! Stop JTAG.
 void jtag430_stop(){
   debugstr("Exiting JTAG.");
   jtagsetup();
diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index ad2801f..d2bb194 100644
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -224,6 +224,7 @@ void jtag430x2handle(unsigned char app,
       jtag430mode=MSP430X2MODE;
       drwidth=20;
     }else{
+      debugstr("JTAG version unknown.");
       txdata(app,NOK,1);
       return;
     }
diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index acfb7e3..9fb9ec9 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -97,8 +97,8 @@ void handle(unsigned char app,
     break;
   case JTAG430: //Also JTAG430X, JTAG430X2
     //Revert this when X2 support returns.
-    //jtag430x2handle(app,verb,len);
-    jtag430handle(app,verb,len);
+    jtag430x2handle(app,verb,len);
+    //jtag430handle(app,verb,len);
     break;
   case SMARTCARD:
     smartcardhandle(app,verb,len);
diff --git a/firmware/include/command.h b/firmware/include/command.h
index c1dab45..ab15feb 100644
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -150,7 +150,7 @@ void i2chandle(unsigned char, unsigned char, unsigned long) WEAKDEF;
 void cchandle(unsigned char, unsigned char, unsigned long) WEAKDEF;
 void jtaghandle(unsigned char, unsigned char, unsigned long);
 void jtag430handle(unsigned char, unsigned char, unsigned long);
-void ejtaghandle(unsigned char, unsigned char, unsigned long);
+WEAKDEF void ejtaghandle(unsigned char, unsigned char, unsigned long);
 WEAKDEF void jtagarm7tdmihandle(unsigned char app, unsigned char verb, unsigned long len);
 
 void jtag430x2handle(unsigned char app, unsigned char verb, unsigned long len);
-- 
2.20.1