X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Finclude%2Fcommand.h;h=d514e49ce9aacbb5f7a10339feae8c4c4cf17ac7;hb=980462162e42727dcde1199284fa41a5a38136b0;hp=ab15feb50b945698d2f2b9a564175d18944f5861;hpb=33c548994df07e43f25464b7d3f24642e9142a99;p=goodfet

diff --git a/firmware/include/command.h b/firmware/include/command.h
index ab15feb..d514e49 100644
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -48,28 +48,12 @@ 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_CONNECTED 0xB1
-
-#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
@@ -131,7 +115,7 @@ void delay(unsigned int count);
 void msdelay(unsigned int ms);
 
 
-//! Prepare Timer A; call before using delay_ms or delay_us.
+//! Prepare Timer B; call before using delay_ms or delay_us.
 void prep_timer();
 
 //! Delay for specified number of milliseconds (given 16 MHz clock)
@@ -145,16 +129,22 @@ 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);
+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);
 
-void jtag430x2handle(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);