projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GoodFET firmware on the Telos B reveals the Flash chip.
[goodfet]
/
firmware
/
apps
/
radios
/
ccspi.c
diff --git
a/firmware/apps/radios/ccspi.c
b/firmware/apps/radios/ccspi.c
index
ab1051f
..
ff46616
100644
(file)
--- a/
firmware/apps/radios/ccspi.c
+++ b/
firmware/apps/radios/ccspi.c
@@
-46,18
+46,16
@@
app_t const ccspi_app = {
"\tmust be moved into the client.\n"
};
"\tmust be moved into the client.\n"
};
-
-#define RADIOACTIVE SETCE
-#define RADIOPASSIVE CLRCE
-
//! Set up the pins for CCSPI mode.
void ccspisetup(){
//! Set up the pins for CCSPI mode.
void ccspisetup(){
- SETSS;
- P5DIR&=~MISO;
- P5DIR|=MOSI+SCK;
+ SPIDIR&=~MISO;
+ SPIDIR|=MOSI+SCK;
DIRSS;
DIRCE;
DIRSS;
DIRCE;
+ P4OUT|=BIT5; //activate CC2420 voltage regulator
+ P4OUT|=BIT6; //bring CC2420 out of reset
+
//Begin a new transaction.
CLRSS;
SETSS;
//Begin a new transaction.
CLRSS;
SETSS;
@@
-113,20
+111,14
@@
u8 ccspi_regread(u8 reg, u8 *buf, int len){
//! Handles a Chipcon SPI command.
void ccspi_handle_fn( uint8_t const app,
//! Handles a Chipcon SPI command.
void ccspi_handle_fn( uint8_t const app,
- uint8_t const verb,
- uint32_t const len)
-{
+ uint8_t const verb,
+ uint32_t const len){
unsigned long i;
unsigned long i;
- //Drop CE to passify radio.
- RADIOPASSIVE;
- //Raise !SS to end transaction, just in case we forgot.
- SETSS;
- ccspisetup();
+ //debugstr("Chipcon SPI handler.");
switch(verb){
switch(verb){
- //PEEK and POKE might come later.
- case READ:
+ case READ:
case WRITE:
CLRSS; //Drop !SS to begin transaction.
for(i=0;i<len;i++)
case WRITE:
CLRSS; //Drop !SS to begin transaction.
for(i=0;i<len;i++)
@@
-137,7
+129,7
@@
void ccspi_handle_fn( uint8_t const app,
case PEEK://Grab CCSPI Register
CLRSS; //Drop !SS to begin transaction.
case PEEK://Grab CCSPI Register
CLRSS; //Drop !SS to begin transaction.
- c
cspitrans8(CCSPI_R_REGISTER |
cmddata[0]); //000A AAAA
+ c
mddata[0]=ccspitrans8(/*CCSPI_R_REGISTER |*/
cmddata[0]); //000A AAAA
for(i=1;i<len;i++)
cmddata[i]=ccspitrans8(cmddata[i]);
SETSS; //Raise !SS to end transaction.
for(i=1;i<len;i++)
cmddata[i]=ccspitrans8(cmddata[i]);
SETSS; //Raise !SS to end transaction.
@@
-146,7
+138,7
@@
void ccspi_handle_fn( uint8_t const app,
case POKE://Poke CCSPI Register
CLRSS; //Drop !SS to begin transaction.
case POKE://Poke CCSPI Register
CLRSS; //Drop !SS to begin transaction.
- c
cspitrans8(CCSPI_W_REGISTER | cmddata[0]); //001
A AAAA
+ c
mddata[0]=ccspitrans8(/* CCSPI_W_REGISTER |*/ 0x40 | cmddata[0]); //02A
A AAAA
for(i=1;i<len;i++)
cmddata[i]=ccspitrans8(cmddata[i]);
SETSS; //Raise !SS to end transaction.
for(i=1;i<len;i++)
cmddata[i]=ccspitrans8(cmddata[i]);
SETSS; //Raise !SS to end transaction.
@@
-157,7
+149,6
@@
void ccspi_handle_fn( uint8_t const app,
txdata(app,verb,0);
break;
case CCSPI_RX:
txdata(app,verb,0);
break;
case CCSPI_RX:
- RADIOPASSIVE;
//Get the packet.
CLRSS;
ccspitrans8(CCSPI_RXFIFO);
//Get the packet.
CLRSS;
ccspitrans8(CCSPI_RXFIFO);
@@
-185,6
+176,4
@@
void ccspi_handle_fn( uint8_t const app,
}
}
- SETSS;//End session
- RADIOACTIVE;
}
}