projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A major refactor of the GoodFET firmware build system and apps to give better
[goodfet]
/
firmware
/
apps
/
chipcon
/
chipcon.c
diff --git
a/firmware/apps/chipcon/chipcon.c
b/firmware/apps/chipcon/chipcon.c
index
dcaf8a2
..
89f12b9
100644
(file)
--- a/
firmware/apps/chipcon/chipcon.c
+++ b/
firmware/apps/chipcon/chipcon.c
@@
-19,6
+19,27
@@
#include <io.h>
#include <iomacros.h>
#include <io.h>
#include <iomacros.h>
+//! Handles a chipcon command.
+void cc_handle_fn( uint8_t const app,
+ uint8_t const verb,
+ uint32_t const len);
+
+// define the jtag app's app_t
+app_t const chipcon_app = {
+
+ /* app number */
+ CHIPCON,
+
+ /* handle fn */
+ cc_handle_fn,
+
+ /* name */
+ "CHIPCON",
+
+ /* desc */
+ "\tThe CHIPCON app adds support for debugging the chipcon\n"
+ "\t8051 processor.\n"
+};
/* Concerning clock rates, the maximimum clock rates are defined on
page 4 of the spec. They vary, but are roughly 30MHz. Raising
/* Concerning clock rates, the maximimum clock rates are defined on
page 4 of the spec. They vary, but are roughly 30MHz. Raising
@@
-34,11
+55,12
@@
#define MISO BIT2
#define SCK BIT3
#define MISO BIT2
#define SCK BIT3
+
//This could be more accurate.
//Does it ever need to be?
#define CCSPEED 3
//This could be more accurate.
//Does it ever need to be?
#define CCSPEED 3
-
//
#define CCDELAY(x) delay(x)
-#define CCDELAY(x)
+#define CCDELAY(x) delay(x)
+
//
#define CCDELAY(x)
#define SETMOSI P5OUT|=MOSI
#define CLRMOSI P5OUT&=~MOSI
#define SETMOSI P5OUT|=MOSI
#define CLRMOSI P5OUT&=~MOSI
@@
-82,14
+104,21
@@
void ccdebuginit(){
//Two positive debug clock pulses while !RST is low.
//Take RST low, pulse twice, then high.
P5OUT&=~SCK;
//Two positive debug clock pulses while !RST is low.
//Take RST low, pulse twice, then high.
P5OUT&=~SCK;
+ delay(10);
P5OUT&=~RST;
P5OUT&=~RST;
+ delay(10);
+
//Two rising edges.
P5OUT^=SCK; //up
//Two rising edges.
P5OUT^=SCK; //up
+ delay(1);
P5OUT^=SCK; //down
P5OUT^=SCK; //down
+ delay(1);
P5OUT^=SCK; //up
P5OUT^=SCK; //up
+ delay(1);
P5OUT^=SCK; //Unnecessary.
P5OUT^=SCK; //Unnecessary.
-
+ delay(1);
+ //delay(0);
//Raise !RST.
P5OUT|=RST;
//Raise !RST.
P5OUT|=RST;
@@
-140,14
+169,16
@@
void ccread(unsigned char len){
cmddata[i]=cctrans8(0);
}
cmddata[i]=cctrans8(0);
}
-//! Handles a monitor command.
-void cchandle(unsigned char app,
- unsigned char verb,
- unsigned long len){
+//! Handles a chipcon command.
+void cc_handle_fn( uint8_t const app,
+ uint8_t const verb,
+ uint32_t const len)
+{
//Always init. Might help with buggy lines.
//Might hurt too.
//ccdebuginit();
long i;
//Always init. Might help with buggy lines.
//Might hurt too.
//ccdebuginit();
long i;
+ int blocklen, blockadr;
switch(verb){
//CC_PEEK and CC_POKE will come later.
switch(verb){
//CC_PEEK and CC_POKE will come later.
@@
-187,6
+218,7
@@
void cchandle(unsigned char app,
//Micro commands!
case CC_CHIP_ERASE:
//Micro commands!
case CC_CHIP_ERASE:
+ case CC_MASS_ERASE_FLASH:
cc_chip_erase();
txdata(app,verb,1);
break;
cc_chip_erase();
txdata(app,verb,1);
break;
@@
-244,9
+276,18
@@
void cchandle(unsigned char app,
txdata(app,verb,1);
break;
case CC_READ_XDATA_MEMORY:
txdata(app,verb,1);
break;
case CC_READ_XDATA_MEMORY:
- cmddata[0]=cc_peekdatabyte(cmddataword[0]);
- txdata(app,verb,1);
+ //Read the length.
+ blocklen=1;
+ if(len>2)
+ blocklen=cmddataword[1];
+ blockadr=cmddataword[0];
+
+ //Return that many bytes.
+ for(i=0;i<blocklen;i++)
+ cmddata[i]=cc_peekdatabyte(blockadr+i);
+ txdata(app,verb,blocklen);
break;
break;
+
case CC_WRITE_XDATA_MEMORY:
cmddata[0]=cc_pokedatabyte(cmddataword[0], cmddata[2]);
txdata(app,verb,1);
case CC_WRITE_XDATA_MEMORY:
cmddata[0]=cc_pokedatabyte(cmddataword[0], cmddata[2]);
txdata(app,verb,1);
@@
-264,9
+305,10
@@
void cchandle(unsigned char app,
cc_pokedatabyte(i,0xFF);
txdata(app,verb,0);
break;
cc_pokedatabyte(i,0xFF);
txdata(app,verb,0);
break;
- case CC_MASS_ERASE_FLASH:
+
case CC_CLOCK_INIT:
case CC_PROGRAM_FLASH:
case CC_CLOCK_INIT:
case CC_PROGRAM_FLASH:
+ default:
debugstr("This Chipcon command is not yet implemented.");
txdata(app,NOK,0);//TODO implement me.
break;
debugstr("This Chipcon command is not yet implemented.");
txdata(app,NOK,0);//TODO implement me.
break;
@@
-344,6
+386,7
@@
unsigned short cc_get_chip_id(){
//Find the flash word size.
switch(cmddata[0]){
case 0x01://CC1110
//Find the flash word size.
switch(cmddata[0]){
case 0x01://CC1110
+ case 0x11://CC1111
case 0x81://CC2510
case 0x91://CC2511
//debugstr("2 bytes/flash word");
case 0x81://CC2510
case 0x91://CC2511
//debugstr("2 bytes/flash word");
@@
-351,7
+394,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
+500,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
+521,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,7
+536,7
@@
void cc_write_flash_page(u32 adr){
while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
- PLEDOUT^=PLEDPIN;//blink LED while flashing
+ PLEDOUT^=PLEDPIN;//blink LED while flashing
}
}