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
SETRST;
delay(0xFFFF);
+
#ifndef SBWREWRITE
//Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
CLRRST;
jtag430_haltcpu();
}
-//! Start normally, not JTAG.
+//! Stop JTAG.
void jtag430_stop(){
debugstr("Exiting JTAG.");
jtagsetup();
jtag430mode=MSP430X2MODE;
drwidth=20;
}else{
+ debugstr("JTAG version unknown.");
txdata(app,NOK,1);
return;
}
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);
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);