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

diff --git a/firmware/include/command.h b/firmware/include/command.h
index 417a855..d514e49 100644
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -48,33 +48,23 @@ extern unsigned char silent;
 
 #define DEBUGSTR 0xFF
 
-// Monitor Commands
-#define MONITOR_CHANGE_BAUD 0x80
-#define MONITOR_RAM_PATTERN 0x90
-#define MONITOR_RAM_DEPTH 0x91
-
-#define MONITOR_DIR 0xA0
-#define MONITOR_OUT 0xA1
-#define MONITOR_IN  0xA2
-
-#define MONITOR_SILENT 0xB0
-
-#define MONITOR_READBUF 0xC0
-#define MONITOR_WRITEBUF 0xC1
-#define MONITOR_SIZEBUF 0xC2
-
-
 
 
 //SPI commands
 #define SPI_JEDEC 0x80
 #define SPI_ERASE 0x81
+#define SPI_RW_EM260 0x82
 
 //OCT commands
 #define OCT_CMP 0x90
 #define OCT_RES 0x91
 
+#ifdef GCC
 #define WEAKDEF __attribute__ ((weak))
+#else
+//Compiler doesn't support weak linking. :(
+#define WEAKDEF
+#endif
 
 //! Handle a plugin, weak-linked to error.
 extern int pluginhandle(unsigned char app,
@@ -110,28 +100,58 @@ void txlong(unsigned long l);
 //! Transmit a word.
 void txword(unsigned int l);
 
+//! Transmit a debug sequence of bytes
+void debugbytes(const char *bytes, unsigned int len);
 //! Transmit a debug string.
 void debugstr(const char *str);
 //! brief Debug a hex word string.
 void debughex(u16 v);
+//! brief Debug a hex long string.
+void debughex32(u32 v);
 
 //! Delay for a count.
 void delay(unsigned int count);
 //! MSDelay
 void msdelay(unsigned int ms);
 
-void jtag430_setr(u8 reg, u16 val);
+
+//! Prepare Timer B; call before using delay_ms or delay_us.
+void prep_timer();
+
+//! Delay for specified number of milliseconds (given 16 MHz clock)
+void delay_ms( unsigned int ms );
+
+//! Delay for specified number of microseconds (given 16 MHz clock)
+void delay_us( unsigned int us );
+
+//! Delay for specified number of clock ticks (16 MHz clock implies 62.5 ns per tick).
+void delay_ticks( unsigned int num_ticks );
+
+
 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 jtag430x2handle(unsigned char app, unsigned char verb,
-		     unsigned long len);
-
-void avrhandle(unsigned char app,
-	       unsigned char verb,
-	       unsigned long len);  
+WEAKDEF void spihandle(unsigned char, unsigned char, unsigned long);
+WEAKDEF 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);
+WEAKDEF void jtag430handle(unsigned char, unsigned char, unsigned long);
+WEAKDEF void ejtaghandle(unsigned char, unsigned char, unsigned long);
+WEAKDEF void jtagarm7tdmihandle(unsigned char app, unsigned char verb, unsigned long len);
+
+WEAKDEF void jtag430x2handle(unsigned char app, unsigned char verb, unsigned long len);
+
+WEAKDEF void nrfhandle(unsigned char,
+		       unsigned char,
+		       unsigned long);
+WEAKDEF void ccspihandle(unsigned char,
+		       unsigned char,
+		       unsigned long);
+WEAKDEF void avrhandle(unsigned char app,
+		       unsigned char verb,
+		       unsigned long len);  
+WEAKDEF int smartcardhandle(unsigned char app,
+			    unsigned char verb,
+			    unsigned int len);
+
+WEAKDEF void pichandle( unsigned char app,
+			unsigned char verb,
+			unsigned long len );