From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Mon, 22 Jun 2009 11:03:20 +0000 (+0000)
Subject: Now compiling with -Wall, error free.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=3bf98a899ca8003835b69d949d299369a5d7a4f7;hp=1f226af77a28d66cbe8eff845e4fee3370798ab8

Now compiling with -Wall, error free.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@51 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/firmware/Makefile b/firmware/Makefile
index b3be6d4..b17708b 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -8,7 +8,7 @@ mcu=msp430x1612
 #ldscript is wonky
 GCCINC=-T ldscripts/161x.x
 
-CC=msp430-gcc -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include
+CC=msp430-gcc -Wall -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include
 
 apps= apps/monitor/monitor.o apps/spi/spi.o apps/i2c/i2c.o apps/chipcon/chipcon.o apps/jtag/jtag.o apps/jtag/jtag430.o
 libs= lib/msp430f1612.o lib/command.o apps/jtag/jtag430asm.o
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;
 }
 
diff --git a/firmware/apps/jtag/jtag.c b/firmware/apps/jtag/jtag.c
index bafd01e..2b04a81 100644
--- a/firmware/apps/jtag/jtag.c
+++ b/firmware/apps/jtag/jtag.c
@@ -11,7 +11,7 @@
 
 
 //! Set up the pins for JTAG mode.
-unsigned char jtagsetup(){
+void jtagsetup(){
   P5DIR|=MOSI+SCK+TMS;
   P5DIR&=~MISO;
   P5OUT|=0xFFFF;
diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index f805a4d..123eefa 100644
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -282,7 +282,6 @@ void jtag430_setinstrfetch(){
 void jtag430handle(unsigned char app,
 		   unsigned char verb,
 		   unsigned char len){
-  unsigned char i;
   switch(verb){
   case START:
     //Enter JTAG mode.
diff --git a/firmware/apps/monitor/monitor.c b/firmware/apps/monitor/monitor.c
index d820107..e5c320a 100644
--- a/firmware/apps/monitor/monitor.c
+++ b/firmware/apps/monitor/monitor.c
@@ -1,4 +1,5 @@
 #include "command.h"
+#include "platform.h"
 
 //! Handles a monitor command.
 void monitorhandle(unsigned char app,
diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index e6fb370..2ee2d2c 100644
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -31,7 +31,7 @@
 
 
 //! Set up the pins for SPI mode.
-unsigned char spisetup(){
+void spisetup(){
   P5DIR|=MOSI+SCK+SS;
   P5DIR&=~MISO;
   P5OUT|=SS;
diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index d993167..594d7db 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -15,7 +15,6 @@
 
 //! Initialize registers and all that jazz.
 void init(){
-  volatile unsigned int i;
   WDTCTL = WDTPW + WDTHOLD;                 // Stop watchdog timer
   
   //LED and TX OUT
diff --git a/firmware/include/command.h b/firmware/include/command.h
index c1269e6..c539175 100644
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -72,6 +72,18 @@ void handle(unsigned char app,
 void txdata(unsigned char app,
 	    unsigned char verb,
 	    unsigned char len);
+//! Transmit a string.
+void txstring(unsigned char app,
+	      unsigned char verb,
+	      const char *str);
 
 //! Delay
 void delay(unsigned int count);
+
+
+void monitorhandle(unsigned char, unsigned char, unsigned char);
+void spihandle(unsigned char, unsigned char, unsigned char);
+void i2chandle(unsigned char, unsigned char, unsigned char);
+void cchandle(unsigned char, unsigned char, unsigned char);
+void jtaghandle(unsigned char, unsigned char, unsigned char);
+void jtag430handle(unsigned char, unsigned char, unsigned char);
diff --git a/firmware/include/jtag.h b/firmware/include/jtag.h
index 17833d6..1551d79 100644
--- a/firmware/include/jtag.h
+++ b/firmware/include/jtag.h
@@ -13,6 +13,7 @@ unsigned int jtag_dr_shift16(unsigned int);
 //! Stop JTAG, release pins
 void jtag_stop();
 
+void jtagsetup();
 
 // JTAG430 Commands
 
diff --git a/firmware/include/platform.h b/firmware/include/platform.h
index abc9ef8..b315d90 100644
--- a/firmware/include/platform.h
+++ b/firmware/include/platform.h
@@ -1,6 +1,12 @@
 //! \file platform.h
 
 
+unsigned char serial_rx();
+void serial_tx(unsigned char);
+void setbaud(unsigned char);
+void msp430_init_uart();
+void msp430_init_dco();
+
 //LED on P1.0
 #define PLEDOUT P1OUT
 #define PLEDDIR P1DIR
diff --git a/firmware/lib/command.c b/firmware/lib/command.c
index c572a1d..08a5cf7 100644
--- a/firmware/lib/command.c
+++ b/firmware/lib/command.c
@@ -1,3 +1,7 @@
+#include "command.h"
+#include "platform.h"
+#include <string.h>
+
 //! Different command handling functions.
 
 unsigned char cmddata[256];