X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Finclude%2Fcommand.h;h=417a8554eac6bb1eace32f7e9b4385b161cbe412;hp=ad0ad15dda90ca308e23d3f4ffe18f150a7a12ca;hb=9e8395fdcb27a6696fdcb37dd2a66a9678aecc64;hpb=ae09939eb8c62c83f244527e7916cee5f9145e6c

diff --git a/firmware/include/command.h b/firmware/include/command.h
index ad0ad15..417a855 100644
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -3,8 +3,30 @@
   \brief Command codes and buffers.
 */
 
+
+//Types
+#define u8 unsigned char
+#define u16 unsigned int
+#define u32 unsigned long
+
+
+#ifdef msp430x2274
+//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
+//4k
+//#define CMDDATALEN 0x1004
+#endif
+
 //! Global data buffer.
-extern unsigned char cmddata[256];
+extern unsigned char cmddata[CMDDATALEN];
+extern unsigned char silent;
 
 #define cmddataword ((unsigned int*) cmddata)
 #define cmddatalong ((unsigned long*) cmddata)
@@ -19,6 +41,8 @@ extern unsigned char cmddata[256];
 #define SETUP 0x10
 #define START 0x20
 #define STOP  0x21
+#define CALL  0x30
+#define EXEC  0x31
 #define NOK   0x7E
 #define OK    0x7F
 
@@ -33,34 +57,14 @@ extern unsigned char cmddata[256];
 #define MONITOR_OUT 0xA1
 #define MONITOR_IN  0xA2
 
-//CHIPCON commands
-#define CC_CHIP_ERASE 0x80
-#define CC_WR_CONFIG 0x81
-#define CC_RD_CONFIG 0x82
-#define CC_GET_PC 0x83
-#define CC_READ_STATUS 0x84
-#define CC_SET_HW_BRKPNT 0x85
-#define CC_HALT 0x86
-#define CC_RESUME 0x87
-#define CC_DEBUG_INSTR 0x88
-#define CC_STEP_INSTR 0x89
-#define CC_STEP_REPLACE 0x8a
-#define CC_GET_CHIP_ID 0x8b
-//CHIPCON macros
-#define CC_READ_CODE_MEMORY 0x90
-#define CC_READ_XDATA_MEMORY 0x91
-#define CC_WRITE_XDATA_MEMORY 0x92
-#define CC_SET_PC 0x93
-#define CC_CLOCK_INIT 0x94
-#define CC_WRITE_FLASH_PAGE 0x95
-#define CC_READ_FLASH_PAGE 0x96
-#define CC_MASS_ERASE_FLASH 0x97
-#define CC_PROGRAM_FLASH 0x98
-
-//JTAG commands
-#define JTAG_IR_SHIFT 0x80
-#define JTAG_DR_SHIFT 0x81
-#define JTAG_DR_SHIFT20 0x91
+#define MONITOR_SILENT 0xB0
+
+#define MONITOR_READBUF 0xC0
+#define MONITOR_WRITEBUF 0xC1
+#define MONITOR_SIZEBUF 0xC2
+
+
+
 
 //SPI commands
 #define SPI_JEDEC 0x80
@@ -70,50 +74,64 @@ extern unsigned char cmddata[256];
 #define OCT_CMP 0x90
 #define OCT_RES 0x91
 
-//JTAG430 commands
-#define JTAG430_HALTCPU 0xA0
-#define JTAG430_RELEASECPU 0xA1
-#define JTAG430_SETINSTRFETCH 0xC1
-#define JTAG430_SETPC 0xC2
-#define JTAG430_WRITEMEM 0xE0
-#define JTAG430_WRITEFLASH 0xE1
-#define JTAG430_READMEM 0xE2
-#define JTAG430_ERASEFLASH 0xE3
-#define JTAG430_ERASECHECK 0xE4
-#define JTAG430_VERIFYMEM 0xE5
-#define JTAG430_BLOWFUSE 0xE6
-#define JTAG430_ISFUSEBLOWN 0xE7
-#define JTAG430_COREIP_ID 0xF0
-#define JTAG430_DEVICE_ID 0xF1
+#define WEAKDEF __attribute__ ((weak))
+
+//! Handle a plugin, weak-linked to error.
+extern int pluginhandle(unsigned char app,
+			unsigned char verb,
+			unsigned int len)
+  WEAKDEF;
+
 
 //! Handle a command.  Defined in goodfet.c
 void handle(unsigned char app,
 	    unsigned char verb,
-	    unsigned  char len);
-
+	    unsigned long len);
+//! Transmit a header.
+void txhead(unsigned char app,
+	    unsigned char verb,
+	    unsigned long len);
 //! Transmit data.
 void txdata(unsigned char app,
 	    unsigned char verb,
-	    unsigned char len);
+	    unsigned long len);
 //! Transmit a string.
 void txstring(unsigned char app,
 	      unsigned char verb,
 	      const char *str);
+
+//! Receive a long.
+unsigned long rxlong();
+//! Receive a word.
+unsigned int rxword();
+
+//! Transmit a long.
+void txlong(unsigned long l);
+//! Transmit a word.
+void txword(unsigned int l);
+
 //! Transmit a debug string.
 void debugstr(const char *str);
+//! brief Debug a hex word string.
+void debughex(u16 v);
 
 //! Delay for a count.
 void delay(unsigned int count);
 //! MSDelay
 void msdelay(unsigned int ms);
 
+void jtag430_setr(u8 reg, u16 val);
+void monitorhandle(unsigned char, unsigned char, unsigned long);
+void spihandle(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 ejtaghandle(unsigned char, unsigned char, unsigned long);
 
-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);
 void jtag430x2handle(unsigned char app, unsigned char verb,
-		     unsigned char len);
-  
+		     unsigned long len);
+
+void avrhandle(unsigned char app,
+	       unsigned char verb,
+	       unsigned long len);