Chipcon debugger is working.

[goodfet] / firmware / apps / chipcon / chipcon.c

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index 2748a58..49aa7d8 100644 (file)
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -50,7 +50,7 @@
 #define CCREAD P5DIR&=~MISO
 
 //! Set up the pins for CC mode.  Does not init debugger.
-unsigned char ccsetup(){
+void ccsetup(){
   P5OUT|=MOSI+SCK+RST;
   P5DIR|=MOSI+SCK+RST;
   //P5DIR&=~MISO;  //MOSI is MISO
@@ -126,7 +126,6 @@ void ccread(unsigned char len){
 void cchandle(unsigned char app,
               unsigned char verb,
               unsigned char len){
-  unsigned char i;
   switch(verb){
     //PEEK and POKE will come later.
   case READ:  //Write a command and return 1-byte reply.
@@ -140,12 +139,14 @@ void cchandle(unsigned char app,
     break;
   case START://enter debugger
     ccdebuginit();
+    txdata(app,verb,0);
     break;
   case STOP://exit debugger
     //Take RST low, then high.
     P5OUT&=~RST;
     CCDELAY(CCSPEED);
     P5OUT|=RST;
+    txdata(app,verb,0);
     break;
   case SETUP:
     ccsetup();
@@ -255,7 +256,7 @@ unsigned short cc_get_chip_id(){
   
   //Return the word.
   toret=cmddata[1];
-  toret=toret<<8+cmddata[1];
+  toret=(toret<<8)+cmddata[1];
   return toret;
 }