Moved header transmission to txhead, about to switch to 16-bit length field.

This will break compatibility with older clients.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@175 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index f48db81..e4ee945 100644 (file)
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -318,9 +318,7 @@ void jtag430handle(unsigned char app,
     if(blocks>1)
       len=0x80;
     
     if(blocks>1)
       len=0x80;
     

-    serial_tx(app);
-    serial_tx(verb);
-    serial_tx(len);
+    txhead(app,verb,len);

     
     while(blocks--){
       for(i=0;i<len;i+=2){
     
     while(blocks--){
       for(i=0;i<len;i+=2){

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 5bc75cd..d0043ac 100644 (file)
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -235,9 +235,7 @@ void jtag430x2handle(unsigned char app,
     at=cmddatalong[0];
     
     len=0x80;
     at=cmddatalong[0];
     
     len=0x80;

-    serial_tx(app);
-    serial_tx(verb);
-    serial_tx(len);
+    txhead(app,verb,len);

     
     while(blocks--){
       for(i=0;i<len;i+=2){
     
     while(blocks--){
       for(i=0;i<len;i+=2){

diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c
index 6e503f2..d6d5256 100644 (file)
--- a/firmware/apps/spi/spi.c
+++ b/firmware/apps/spi/spi.c
@@ -165,9 +165,7 @@ void spiflash_peek(unsigned char app,
   
   //Send reply header
   len=0x80;//128 byte chunk, repeated for each block
   
   //Send reply header
   len=0x80;//128 byte chunk, repeated for each block

-  serial_tx(app);
-  serial_tx(verb);
-  serial_tx(len); //multiplied by block count.
+  txhead(app,verb,len);

   
   while(blocks--){
     for(i=0;i<len;i++)
   
   while(blocks--){
     for(i=0;i<len;i++)

diff --git a/firmware/include/command.h b/firmware/include/command.h
index e99a396..51325be 100644 (file)
--- a/firmware/include/command.h
+++ b/firmware/include/command.h
@@ -97,12 +97,15 @@ extern unsigned char silent;
 //! Handle a command.  Defined in goodfet.c
 void handle(unsigned char app,
            unsigned char verb,
 //! Handle a command.  Defined in goodfet.c
 void handle(unsigned char app,
            unsigned char verb,

-           unsigned  char len);
-
+           unsigned char len);
+//! Transmit a header.
+void txhead(unsigned char app,
+           unsigned char verb,
+           unsigned int len);

 //! Transmit data.
 void txdata(unsigned char app,
            unsigned char verb,
 //! Transmit data.
 void txdata(unsigned char app,
            unsigned char verb,

-           unsigned char len);
+           unsigned int len);

 //! Transmit a string.
 void txstring(unsigned char app,
              unsigned char verb,
 //! Transmit a string.
 void txstring(unsigned char app,
              unsigned char verb,

diff --git a/firmware/lib/command.c b/firmware/lib/command.c
index dadffbd..8d9eac1 100644 (file)
--- a/firmware/lib/command.c
+++ b/firmware/lib/command.c
@@ -32,17 +32,23 @@ void debugstr(const char *str){
   txstring(0xFF,0xFF,str);
 }
 
   txstring(0xFF,0xFF,str);
 }
 

+//! Transmit a header.
+void txhead(unsigned char app,
+           unsigned char verb,
+           unsigned int len){
+  serial_tx(app);
+  serial_tx(verb);
+  serial_tx(len);
+}

 
 //! Transmit data.
 void txdata(unsigned char app,
            unsigned char verb,
 
 //! Transmit data.
 void txdata(unsigned char app,
            unsigned char verb,

-           unsigned char len){
+           unsigned int len){

   unsigned int i=0;
   if(silent)
     return;
   unsigned int i=0;
   if(silent)
     return;

-  serial_tx(app);
-  serial_tx(verb);
-  serial_tx(len);
+  txhead(app,verb,len);

   for(i=0;i<len;i++){
     serial_tx(cmddata[i]);
   }
   for(i=0;i<len;i++){
     serial_tx(cmddata[i]);
   }