From 750c7626dbfebf6e043cfcbe02fcb4dd5df3aa34 Mon Sep 17 00:00:00 2001 From: travisutk Date: Sun, 4 Oct 2009 09:13:32 +0000 Subject: [PATCH] Removed deprecated MSP430 flash test. Altered 16MHz MSP430 flash timing code to be 320 kHz. 533kHz gave errors; might need to correct 3MHz code as well. git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@171 12e2690d-a6be-4b82-a7b7-67c4a43b65c8 --- client/GoodFETMSP430.py | 8 -------- client/goodfet.msp430 | 8 +++++--- firmware/apps/jtag/jtag430.c | 2 +- firmware/apps/jtag/jtag430asm.S | 8 +++++++- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py index 580534b..155ce2a 100644 --- a/client/GoodFETMSP430.py +++ b/client/GoodFETMSP430.py @@ -174,14 +174,6 @@ class GoodFETMSP430(GoodFET): print "Tests complete, erasing." self.MSP430masserase(); - def MSP430flashtest(self): - self.MSP430masserase(); - i=0x2500; - while(i<0xFFFF): - if(self.MSP430peek(i)!=0xFFFF): - print "ERROR: Unerased flash at %04x."%i; - self.MSP430writeflash(i,0xDEAD); - i+=2; def MSP430masserase(self): """Erase MSP430 flash memory.""" self.writecmd(self.MSP430APP,0xE3,0,None); diff --git a/client/goodfet.msp430 b/client/goodfet.msp430 index 3140e13..20ee81e 100755 --- a/client/goodfet.msp430 +++ b/client/goodfet.msp430 @@ -78,11 +78,13 @@ if(sys.argv[1]=="flash"): for i in h._buf.keys(): #print "%04x: %04x"%(i,h[i>>1]); if(i>=start and i>1]); + val=h[i>>1]; + val2=client.MSP430pokeflash(i,val); + if(val!=val2): + print "Write error at %04x, %04x!=%04x." %( + i, val, val2); if(i%0x100==0): print "%04x" % i; -if(sys.argv[1]=="flashtest"): - client.MSP430flashtest(); if(sys.argv[1]=="verify"): f=sys.argv[2]; start=0; diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c index 6913626..821b655 100644 --- a/firmware/apps/jtag/jtag430.c +++ b/firmware/apps/jtag/jtag430.c @@ -371,5 +371,5 @@ void jtag430handle(unsigned char app, default: jtaghandle(app,verb,len); } - jtag430_resettap(); + //jtag430_resettap(); } diff --git a/firmware/apps/jtag/jtag430asm.S b/firmware/apps/jtag/jtag430asm.S index 39dcb8f..672d0ee 100644 --- a/firmware/apps/jtag/jtag430asm.S +++ b/firmware/apps/jtag/jtag430asm.S @@ -28,7 +28,13 @@ pulseloop16: sub #1, r15 ; 1 cycle ;; 1+3+3+1+2=10, beneath limits, - ;; +3+2=5, repeat 5 times to get 10+25=35, within limits + ;; +3+2=5, repeat 8 times to get 10+40=50, within limits + push r11 ; 3 cycles + pop r11 ; 2 cycles + push r11 ; 3 cycles + pop r11 ; 2 cycles + push r11 ; 3 cycles + pop r11 ; 2 cycles push r11 ; 3 cycles pop r11 ; 2 cycles push r11 ; 3 cycles -- 2.20.1