projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Firmware compiles in Ubuntu 11.10.
[goodfet]
/
firmware
/
platforms
/
goodfet.h
diff --git
a/firmware/platforms/goodfet.h
b/firmware/platforms/goodfet.h
index
8e4249c
..
14f9df8
100644
(file)
--- a/
firmware/platforms/goodfet.h
+++ b/
firmware/platforms/goodfet.h
@@
-3,12
+3,16
@@
\brief Port descriptions for the GoodFET platform.
*/
\brief Port descriptions for the GoodFET platform.
*/
-#ifdef __MSPGCC__
+/* #ifdef __MSPGCC__ */
+/* #include <msp430.h> */
+/* #else */
+/* #include <signal.h> */
+/* #include <msp430.h> */
+/* #include <iomacros.h> */
+/* #endif */
+
+#ifndef _GNU_ASSEMBLER_
#include <msp430.h>
#include <msp430.h>
-#else
-#include <signal.h>
-#include <io.h>
-#include <iomacros.h>
#endif
//LED on P1.0
#endif
//LED on P1.0
@@
-17,7
+21,7
@@
#define PLEDPIN BIT0
//Use P3 instead of P5 for target I/O on chips without P5.
#define PLEDPIN BIT0
//Use P3 instead of P5 for target I/O on chips without P5.
-#ifdef msp430
x
2274
+#ifdef msp430
f
2274
//#warning "No P5, using P3 instead. Will break 2618 and 1612 support."
#define P5OUT P3OUT
#define P5DIR P3DIR
//#warning "No P5, using P3 instead. Will break 2618 and 1612 support."
#define P5OUT P3OUT
#define P5DIR P3DIR