X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Finclude%2Fcommand.h;h=fd50ccbc0e2d3ef41f9fc5d675bd34cd533a15c7;hb=0c53a410a2d82927261d39e74cd98ecc6b6eebf1;hp=c1dab4552eb9a55c26677ca3cbac1bb57645b28a;hpb=f217c730250832ae74a60b9d494111eac3763fd6;p=goodfet

diff --git a/firmware/include/command.h b/firmware/include/command.h
index c1dab45..fd50ccb 100644
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -4,6 +4,11 @@
 */
 
 
+#ifndef COMMAND_H
+#define COMMAND_H
+
+#include <stdint.h>
+
 //Types
 #define u8 unsigned char
 #define u16 unsigned int
@@ -30,8 +35,8 @@ extern unsigned char silent;
 
 #define cmddataword ((unsigned int*) cmddata)
 #define cmddatalong ((unsigned long*) cmddata)
-#define memorybyte ((unsigned char*) 0)
-#define memoryword ((unsigned int*) 0)
+#define memorybyte ((char*)  0)
+//#define memoryword ((unsigned int*)  0))
 
 // Global Commands
 #define READ  0x00
@@ -48,28 +53,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
@@ -82,17 +71,10 @@ extern unsigned char silent;
 #define WEAKDEF
 #endif
 
-//! 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 long len);
+void handle(uint8_t const app,
+			uint8_t const verb,
+			uint32_t const len);
 //! Transmit a header.
 void txhead(unsigned char app,
 	    unsigned char verb,
@@ -131,7 +113,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)
@@ -143,25 +125,4 @@ 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);
-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 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 );
+#endif // COMMAND_H