Early support for 2254 on the GoodFET30.

More modules are optional.

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

diff --git a/firmware/Makefile b/firmware/Makefile
index e4b021f..f9f6f7d 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -16,12 +16,12 @@ mcu?=msp430x1612
 GCCINC=-T ldscripts/$(mcu).x
 
 CCEXTRA?=
 GCCINC=-T ldscripts/$(mcu).x
 
 CCEXTRA?=

-CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
+CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)

 
 #Define extra modules here.
 
 #Define extra modules here.

-moreapps?=
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o

 
 

-apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o apps/i2c/i2c.o apps/chipcon/chipcon.o apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o
+apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o

 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
 app= goodfet
 
 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
 app= goodfet
 

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 467ebae..b9485aa 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -30,8 +30,6 @@ void init(){
   \r
   //Enable Interrupts.\r
   //eint();\r
   \r
   //Enable Interrupts.\r
   //eint();\r

-\r
-\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/firmware/include/command.h b/firmware/include/command.h
index 569dab2..be52d17 100644 (file)
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -9,6 +9,14 @@
 #define u16 unsigned int
 #define u32 unsigned long
 
 #define u16 unsigned int
 #define u32 unsigned long
 

+
+#ifdef msp430x2254
+//256 bytes, plus overhead
+//For chips with very little RAM.
+#define CMDDATALEN 0x104
+#warning Very little RAM.
+#endif
+

 #ifndef CMDDATALEN
 //512 bytes
 #define CMDDATALEN 0x204
 #ifndef CMDDATALEN
 //512 bytes
 #define CMDDATALEN 0x204


@@ -64,12 +72,13 @@ extern unsigned char silent;
 #define OCT_CMP 0x90
 #define OCT_RES 0x91
 
 #define OCT_CMP 0x90
 #define OCT_RES 0x91
 

+#define WEAKDEF __attribute__ ((weak))

 
 //! Handle a plugin, weak-linked to error.
 extern int pluginhandle(unsigned char app,
                        unsigned char verb,
                        unsigned int len)
 
 //! Handle a plugin, weak-linked to error.
 extern int pluginhandle(unsigned char app,
                        unsigned char verb,
                        unsigned int len)

-  __attribute__ ((weak));
+  WEAKDEF;

 
 
 //! Handle a command.  Defined in goodfet.c
 
 
 //! Handle a command.  Defined in goodfet.c


@@ -110,8 +119,8 @@ void msdelay(unsigned int ms);
 
 void monitorhandle(unsigned char, unsigned char, unsigned long);
 void spihandle(unsigned char, unsigned char, unsigned long);
 
 void monitorhandle(unsigned char, unsigned char, unsigned long);
 void spihandle(unsigned char, unsigned char, unsigned long);

-void i2chandle(unsigned char, unsigned char, unsigned long);
-void cchandle(unsigned char, unsigned char, unsigned long);
+void i2chandle(unsigned char, unsigned char, unsigned long) WEAKDEF;
+void cchandle(unsigned char, unsigned char, unsigned long) WEAKDEF;

 void jtaghandle(unsigned char, unsigned char, unsigned long);
 void jtag430handle(unsigned char, unsigned char, unsigned long);
 void jtag430x2handle(unsigned char app, unsigned char verb,
 void jtaghandle(unsigned char, unsigned char, unsigned long);
 void jtag430handle(unsigned char, unsigned char, unsigned long);
 void jtag430x2handle(unsigned char app, unsigned char verb,

diff --git a/firmware/lib/msp430x2254.c b/firmware/lib/msp430x2254.c
new file mode 100644 (file)
index 0000000..566174c
--- /dev/null
+++ b/firmware/lib/msp430x2254.c
@@ -0,0 +1,5 @@
+
+//platform.h will handle patching Port 5 to be Port 3.
+
+
+#include "msp430x2618.c"