X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fchipcon%2Fchipcon.c;h=e2fbcb4c2f0f0e679638fe0cb31d2fbbcc98d00f;hp=2748a58e9ba27370d55e482aaad6bcbd313d1ec8;hb=3bf98a899ca8003835b69d949d299369a5d7a4f7;hpb=1f226af77a28d66cbe8eff845e4fee3370798ab8

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index 2748a58..e2fbcb4 100644
--- 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.
@@ -255,7 +254,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;
 }