X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Finclude%2Fcommand.h;h=3abffad32306030f0c51ee73b5ee622270b2106b;hp=1938b40d7db05aa9d82a7f43c936b08db0226792;hb=f3480afd0970eb232b17070d8596e5d09aef2c7e;hpb=02599143bb0a0921134fc35c41013aee90126702

diff --git a/firmware/include/command.h b/firmware/include/command.h
index 1938b40..3abffad 100644
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -4,13 +4,18 @@
 */
 
 
+#ifndef COMMAND_H
+#define COMMAND_H
+
+#include <stdint.h>
+
 //Types
 #define u8 unsigned char
 #define u16 unsigned int
 #define u32 unsigned long
 
 
-#ifdef msp430x2274
+#ifdef msp430f2274
 //256 bytes, plus overhead
 //For chips with very little RAM.
 #define CMDDATALEN 0x104
@@ -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
@@ -43,32 +48,20 @@ extern unsigned char silent;
 #define STOP  0x21
 #define CALL  0x30
 #define EXEC  0x31
+#define LIMIT 0x7B /* limit reached */
+#define EXIST 0x7C /* already or doesnt exist */
+#define NMEM  0x7D /* OOM */
 #define NOK   0x7E
 #define OK    0x7F
 
 #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
@@ -81,17 +74,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,
@@ -130,7 +116,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)
@@ -142,25 +128,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