projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor firmware changes.
[goodfet]
/
firmware
/
apps
/
chipcon
/
chipcon.c
diff --git
a/firmware/apps/chipcon/chipcon.c
b/firmware/apps/chipcon/chipcon.c
index
4b0e0df
..
7ce22b2
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,25
+55,27
@@
#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 CCSPEED 3
//#define CCDELAY(x) delay(x)
#define CCDELAY(x)
//#define CCDELAY(x) delay(x)
#define CCDELAY(x)
-#define SETMOSI
P5
OUT|=MOSI
-#define CLRMOSI
P5
OUT&=~MOSI
-#define SETCLK
P5
OUT|=SCK
-#define CLRCLK
P5
OUT&=~SCK
-#define READMISO (
P5
IN&MISO?1:0)
+#define SETMOSI
SPI
OUT|=MOSI
+#define CLRMOSI
SPI
OUT&=~MOSI
+#define SETCLK
SPI
OUT|=SCK
+#define CLRCLK
SPI
OUT&=~SCK
+#define READMISO (
SPI
IN&MISO?1:0)
-#define CCWRITE
P5
DIR|=MOSI
-#define CCREAD
P5
DIR&=~MISO
+#define CCWRITE
SPI
DIR|=MOSI
+#define CCREAD
SPI
DIR&=~MISO
//! Set up the pins for CC mode. Does not init debugger.
void ccsetup(){
//! Set up the pins for CC mode. Does not init debugger.
void ccsetup(){
-
P5
OUT|=MOSI+SCK+RST;
-
P5
DIR|=MOSI+SCK+RST;
+
SPI
OUT|=MOSI+SCK+RST;
+
SPI
DIR|=MOSI+SCK+RST;
//P5REN=0xFF;
}
//P5REN=0xFF;
}
@@
-75,24
+98,31
@@
void ccsetup(){
//! 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.
-
P5
OUT|=MOSI+SCK+RST;
+
SPI
OUT|=MOSI+SCK+RST;
-
//
delay(30); //So the beginning is ready for glitching.
+ delay(30); //So the beginning is ready for glitching.
//Two positive debug clock pulses while !RST is low.
//Take RST low, pulse twice, then high.
//Two positive debug clock pulses while !RST is low.
//Take RST low, pulse twice, then high.
- P5OUT&=~SCK;
- P5OUT&=~RST;
+ SPIOUT&=~SCK;
+ delay(10);
+ SPIOUT&=~RST;
- //Two rising edges.
- P5OUT^=SCK; //up
- P5OUT^=SCK; //down
- P5OUT^=SCK; //up
- P5OUT^=SCK; //Unnecessary.
+ delay(10);
+ //Two rising edges.
+ SPIOUT^=SCK; //up
+ delay(1);
+ SPIOUT^=SCK; //down
+ delay(1);
+ SPIOUT^=SCK; //up
+ delay(1);
+ SPIOUT^=SCK; //Unnecessary.
+ delay(1);
+ //delay(0);
//Raise !RST.
//Raise !RST.
-
P5
OUT|=RST;
+
SPI
OUT|=RST;
}
//! Read and write a CC bit.
}
//! Read and write a CC bit.
@@
-110,11
+140,11
@@
unsigned char cctrans8(unsigned char byte){
byte <<= 1;
/* half a clock cycle before leading/rising edge */
byte <<= 1;
/* half a clock cycle before leading/rising edge */
- CCDELAY(CCSPEED
/
2);
+ CCDELAY(CCSPEED
>>
2);
SETCLK;
/* half a clock cycle before trailing/falling edge */
SETCLK;
/* half a clock cycle before trailing/falling edge */
- CCDELAY(CCSPEED
/
2);
+ CCDELAY(CCSPEED
>>
2);
/* read MISO on trailing edge */
byte |= READMISO;
/* read MISO on trailing edge */
byte |= READMISO;
@@
-140,14
+170,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.
@@
-175,9
+207,9
@@
void cchandle(unsigned char app,
break;
case STOP://exit debugger
//Take RST low, then high.
break;
case STOP://exit debugger
//Take RST low, then high.
-
P5
OUT&=~RST;
+
SPI
OUT&=~RST;
CCDELAY(CCSPEED);
CCDELAY(CCSPEED);
-
P5
OUT|=RST;
+
SPI
OUT|=RST;
txdata(app,verb,0);
break;
case SETUP:
txdata(app,verb,0);
break;
case SETUP:
@@
-187,6
+219,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;
@@
-230,7
+263,7
@@
void cchandle(unsigned char app,
txdata(app,verb,1);
break;
case CC_STEP_REPLACE:
txdata(app,verb,1);
break;
case CC_STEP_REPLACE:
- txdata(app,NOK,0);//
TODO add me
+ txdata(app,NOK,0);//
Don't add this; it's non-standard.
break;
case CC_GET_CHIP_ID:
cmddataword[0]=cc_get_chip_id();
break;
case CC_GET_CHIP_ID:
cmddataword[0]=cc_get_chip_id();
@@
-244,9
+277,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
+306,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
+387,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");