From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Thu, 16 Feb 2012 19:21:09 +0000 (+0000)
Subject: Firmware compiles in Ubuntu 11.10.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=19c84b41b9fbde102aee56bc137a8a2885194ebf

Firmware compiles in Ubuntu 11.10.
Break was caused by msp430.h being no longer asm-clean.

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

diff --git a/firmware/apps/jtag/jtag430asm.S b/firmware/apps/jtag/jtag430asm.S
index 397cf38..e74ceb6 100644
--- a/firmware/apps/jtag/jtag430asm.S
+++ b/firmware/apps/jtag/jtag430asm.S
@@ -4,6 +4,10 @@
 #define _GNU_ASSEMBLER_
 #include "config.h"
 
+//We need to include port definitions,
+//but msp430.h is no long asm clean.
+#include <msp430f1612.h>
+
 //This detects model, chooses appropriate timing.
 jtag430_tclk_flashpulses:
 	mov &0x0ff0, r14
diff --git a/firmware/apps/radios/ccspi.c b/firmware/apps/radios/ccspi.c
index 6c84171..6df0458 100644
--- a/firmware/apps/radios/ccspi.c
+++ b/firmware/apps/radios/ccspi.c
@@ -148,7 +148,7 @@ void ccspireflexjam(u16 delay){
   }
 #else
   debugstr("Can't reflexively jam without SFD, FIFO, FIFOP, and P2LEDx definitions - try using telosb platform.");
-  txdata(app,NOK,0);
+  txdata(CCSPI,NOK,0);
 #endif
 }
 
diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h
index 46e0ecb..14f9df8 100644
--- a/firmware/platforms/goodfet.h
+++ b/firmware/platforms/goodfet.h
@@ -3,12 +3,16 @@
   \brief Port descriptions for the GoodFET platform.
 */
 
-#ifdef __MSPGCC__
-#include <msp430.h>
-#else
-#include <signal.h>
+/* #ifdef __MSPGCC__ */
+/* #include <msp430.h> */
+/* #else */
+/* #include <signal.h> */
+/* #include <msp430.h> */
+/* #include <iomacros.h> */
+/* #endif */
+
+#ifndef _GNU_ASSEMBLER_
 #include <msp430.h>
-#include <iomacros.h>
 #endif
 
 //LED on P1.0