projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug where first byte of EM260 response would be lost.
[goodfet]
/
firmware
/
apps
/
chipcon
/
chipcon.c
diff --git
a/firmware/apps/chipcon/chipcon.c
b/firmware/apps/chipcon/chipcon.c
index
73ccd2f
..
4b0e0df
100644
(file)
--- a/
firmware/apps/chipcon/chipcon.c
+++ b/
firmware/apps/chipcon/chipcon.c
@@
-351,7
+351,7
@@
unsigned short cc_get_chip_id(){
break;
default:
//debugstr("Warning: Guessing flash word size.");
break;
default:
//debugstr("Warning: Guessing flash word size.");
- flash_word_size=0;
+
//
flash_word_size=0;
break;
case 0x85://CC2430
case 0x89://CC2431
break;
case 0x85://CC2430
case 0x89://CC2431
@@
-457,8
+457,9
@@
void cc_write_flash_page(u32 adr){
return;
}
return;
}
- if(flash_word_size==0){
- debugstr("Flash word size is wrong.");
+ if(flash_word_size!=2 && flash_word_size!=4){
+ debugstr("Flash word size is wrong, aborting write to");
+ debughex(adr);
while(1);
}
while(1);
}
@@
-477,8
+478,7
@@
void cc_write_flash_page(u32 adr){
flash_word_size);
//debugstr("Wrote flash routine.");
flash_word_size);
//debugstr("Wrote flash routine.");
-
-
+
//MOV MEMCTR, (bank * 16) + 1;
cmddata[0]=0x75;
cmddata[1]=0xc7;
//MOV MEMCTR, (bank * 16) + 1;
cmddata[0]=0x75;
cmddata[1]=0xc7;
@@
-493,13
+493,13
@@
void cc_write_flash_page(u32 adr){
while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
- P
1OUT^=1;//blink LED while flashing
+ P
LEDOUT^=PLEDPIN;//blink LED while flashing
}
//debugstr("Done flashing.");
}
//debugstr("Done flashing.");
- P
1OUT&=~1
;//clear LED
+ P
LEDOUT&=~PLEDPIN
;//clear LED
}
//! Read the PC
}
//! Read the PC