X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Flib%2Fcommand.c;h=415171b732d9bc011f1c559acc8d6b1409d7a2ef;hp=44a853d5ede5641d85ba1c1cd84c0aa236e43e87;hb=8203dc42156b3745f4f79ba7da4845da365902ff;hpb=0652c424f95ebdb6c9be17edc0a4d1057432142f

diff --git a/firmware/lib/command.c b/firmware/lib/command.c
index 44a853d..415171b 100644
--- a/firmware/lib/command.c
+++ b/firmware/lib/command.c
@@ -1,23 +1,142 @@
-//! Different command handling functions.
+/*! \file command.c
+  \author Travis Goodspeed
+  \brief These functions manage command interpretation.
+*/
 
-unsigned char cmddata[256];
+#include "command.h"
+#include "platform.h"
+#include <string.h>
+
+unsigned char cmddata[CMDDATALEN];
+unsigned char silent=0;
+
+//! Transmit a string.
+void txstring(unsigned char app,
+	      unsigned char verb,
+	      const char *str){
+  unsigned long len=strlen(str);
+  txhead(app,verb,len);
+  while(len--)
+    serial_tx(*(str++));
+}
+
+/*! \brief Transmit a debug string.
+  
+  Transmits a debugging string that is to be printed
+  out of line by the client.  This is just for record-keeping;
+  it is not considered a proper reply to a query.
+ */
+void debugstr(const char *str){
+  txstring(0xFF,0xFF,str);
+}
+
+//! brief Debug a hex word string.
+void debughex(u16 v) {
+  unsigned char a[7];
+  a[0]='0'; a[1]='x';
+    
+  a[2]=0xf&(v>>12);
+  a[2]+=(a[2]>9)?('a'-10):'0';
+
+  a[3]=0xf&(v>>8);
+  a[3]+=(a[3]>9)?('a'-10):'0';
+
+  a[4]=0xf&(v>>4);
+  a[4]+=(a[4]>9)?('a'-10):'0';
+
+  a[5]=0xf&(v>>0);
+  a[5]+=(a[5]>9)?('a'-10):'0';
+
+  a[6]=0;
+
+  txstring(0xFF,0xFF,a);
+}
+
+/*! \brief Transmit debug bytes.
+  
+  Transmits bytes for debugging.
+*/
+void debugbytes(const char *bytes, unsigned int len){
+  u16 i;
+  txhead(0xFF,0xFE,len);
+  for(i=0;i<len;i++)
+    serial_tx(bytes[i]);
+}
+
+
+//! Transmit a header.
+void txhead(unsigned char app,
+	    unsigned char verb,
+	    unsigned long len){
+  serial_tx(app);
+  serial_tx(verb);
+  //serial_tx(len); //old protocol
+  txword(len);
+}
 
 //! Transmit data.
 void txdata(unsigned char app,
 	    unsigned char verb,
-	    unsigned char len){
+	    unsigned long len){
   unsigned int i=0;
-  serial_tx(app);
-  serial_tx(verb);
-  serial_tx(len);
+  if(silent)
+    return;
+  txhead(app,verb,len);
   for(i=0;i<len;i++){
     serial_tx(cmddata[i]);
   }
 }
 
+//! Receive a long.
+unsigned long rxlong(){
+  unsigned long toret=0;
+  toret=serial_rx();
+  toret|=(((long)serial_rx())<<8);
+  toret|=(((long)serial_rx())<<16);
+  toret|=(((long)serial_rx())<<24);
+  return toret;
+}
+//! Receive a word.
+unsigned int rxword(){
+  unsigned long toret=0;
+  toret=serial_rx();
+  toret|=(((long)serial_rx())<<8);
+  return toret;
+}
+//! Transmit a long.
+void txlong(unsigned long l){
+  serial_tx(l&0xFF);
+  l>>=8;
+  serial_tx(l&0xFF);
+  l>>=8;
+  serial_tx(l&0xFF);
+  l>>=8;
+  serial_tx(l&0xFF);
+  l>>=8;
+}
+//! Transmit a word.
+void txword(unsigned int l){
+  serial_tx(l&0xFF);
+  l>>=8;
+  serial_tx(l&0xFF);
+  l>>=8;
+}
+
+//Be very careful changing delay().
+//It was chosen poorly by trial and error.
 
 //! Delay for a count.
 void delay(unsigned int count){
   volatile unsigned int i=count;
-  while(i--);
+  while(i--) asm("nop");
+}
+//! MSDelay
+void msdelay(unsigned int ms){
+  volatile unsigned int i,j;
+  i=100;
+  while(i--){
+    j=ms;
+    while(j--) asm("nop");
+  }
+  //Using TimerA might be cleaner.
 }