projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor NRF cleanup.
[goodfet]
/
firmware
/
goodfet.c
diff --git
a/firmware/goodfet.c
b/firmware/goodfet.c
index
97b40c2
..
f12e278
100644
(file)
--- a/
firmware/goodfet.c
+++ b/
firmware/goodfet.c
@@
-15,7
+15,10
@@
//! Initialize registers and all that jazz.
void init(){
//! Initialize registers and all that jazz.
void init(){
+ #ifdef DAC12IR
int i;
int i;
+ #endif
+
WDTCTL = WDTPW + WDTHOLD; // Stop watchdog timer
//LED out and on.
WDTCTL = WDTPW + WDTHOLD; // Stop watchdog timer
//LED out and on.
@@
-72,14
+75,16
@@
void handle(unsigned char app,
case SPI:
spihandle(app,verb,len);
break;
case SPI:
spihandle(app,verb,len);
break;
+ case NRF:
+ nrfhandle(app,verb,len);
+ break;
case AVR:
avrhandle(app,verb,len);
break;
case AVR:
avrhandle(app,verb,len);
break;
-#ifdef INSTALL_PIC_APP
case PIC:
pichandle(app,verb,len);
break;
case PIC:
pichandle(app,verb,len);
break;
-#endif
+
case I2CAPP:
i2chandle(app,verb,len);
break;
case I2CAPP:
i2chandle(app,verb,len);
break;
@@
-93,7
+98,9
@@
void handle(unsigned char app,
ejtaghandle(app,verb,len);
break;
case JTAG430: //Also JTAG430X, JTAG430X2
ejtaghandle(app,verb,len);
break;
case JTAG430: //Also JTAG430X, JTAG430X2
+ //Revert this when X2 support returns.
jtag430x2handle(app,verb,len);
jtag430x2handle(app,verb,len);
+ //jtag430handle(app,verb,len);
break;
case SMARTCARD:
smartcardhandle(app,verb,len);
break;
case SMARTCARD:
smartcardhandle(app,verb,len);