projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
still chugging away. place-holder. once again to the breach!
[goodfet]
/
firmware
/
apps
/
chipcon
/
chipcon.c
diff --git
a/firmware/apps/chipcon/chipcon.c
b/firmware/apps/chipcon/chipcon.c
index
ce0a9ff
..
4b0e0df
100644
(file)
--- a/
firmware/apps/chipcon/chipcon.c
+++ b/
firmware/apps/chipcon/chipcon.c
@@
-71,7
+71,7
@@
void ccsetup(){
30: 30 41 ret
*/
30: 30 41 ret
*/
-/*
+
//! Initialize the debugger
void ccdebuginit(){
//Port output BUT NOT DIRECTION is set at start.
//! Initialize the debugger
void ccdebuginit(){
//Port output BUT NOT DIRECTION is set at start.
@@
-94,10
+94,6
@@
void ccdebuginit(){
//Raise !RST.
P5OUT|=RST;
}
//Raise !RST.
P5OUT|=RST;
}
-*/
-
-//! Initialize the debugger.
-void ccdebuginit();
//! Read and write a CC bit.
unsigned char cctrans8(unsigned char byte){
//! Read and write a CC bit.
unsigned char cctrans8(unsigned char byte){
@@
-350,11
+346,13
@@
unsigned short cc_get_chip_id(){
case 0x01://CC1110
case 0x81://CC2510
case 0x91://CC2511
case 0x01://CC1110
case 0x81://CC2510
case 0x91://CC2511
- flash_word_size=0x02;
//debugstr("2 bytes/flash word");
//debugstr("2 bytes/flash word");
+ flash_word_size=0x02;
break;
default:
break;
default:
- debugstr("Warning: Guessing flash word size.");
+ //debugstr("Warning: Guessing flash word size.");
+ //flash_word_size=0;
+ break;
case 0x85://CC2430
case 0x89://CC2431
//debugstr("4 bytes/flash word");
case 0x85://CC2430
case 0x89://CC2431
//debugstr("4 bytes/flash word");
@@
-459,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);
}
@@
-479,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;
@@
-495,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