X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Flib%2Fcommand.c;h=571d0c0052c71827cfe529dcdd18063cf5071827;hp=a8265714137218a416f9b6b040dde5f7113046df;hb=a2de4ca441a02031e56fc8d14f8a476c644049e0;hpb=4d264916c0263052ba7316d7127de6b4cfe8145c

diff --git a/firmware/lib/command.c b/firmware/lib/command.c
index a826571..571d0c0 100644
--- a/firmware/lib/command.c
+++ b/firmware/lib/command.c
@@ -30,6 +30,16 @@ void debugstr(const char *str){
   txstring(0xFF,0xFF,str);
 }
 
+//! brief Debug a hex word string.
+void debughex(u16 v) {
+  debugbytes((void *)&v, 2);
+}
+
+//! brief Debug a hex word string.
+void debughex32(u32 v) {
+  debugbytes((void *)&v, 4);
+}
+
 /*! \brief Transmit debug bytes.
   
   Transmits bytes for debugging.
@@ -118,3 +128,57 @@ void msdelay(unsigned int ms){
   }
   //Using TimerA might be cleaner.
 }
+
+
+/* To better satisfy the somewhat odd timing requirements for
+   dsPIC33F/PIC24H ICSP programming, and for better control of GoodFET
+   timing more generally, here are a few delay routines that use Timer A.
+
+   Note that I wrote these referring only to the MSP430x2xx family
+   manual. Beware on MSP430x1xx chips. Further note that, assuming
+   some minor errors will be made, I try to err on the side of
+   delaying slightly longer than requested. */
+void prep_timer()
+{
+	BCSCTL2 = 0x00; /* In particular, use DCOCLK as SMCLK source with
+					   divider 1. Hence, Timer A ticks with system
+					   clock at 16 MHz. */
+
+	TACTL = 0x0204; /* Driven by SMCLK; disable Timer A interrupts;
+					   reset timer in case it was previously in use */
+}
+
+//! Delay for specified number of milliseconds (given 16 MHz clock)
+void delay_ms( unsigned int ms )
+{
+	// 16000 ticks = 1 ms
+	TACTL |= 0x20; // Start timer!
+	while (ms--) {
+		while (TAR < 16000)
+			asm( "nop" );
+		TACTL = 0x0224;
+	}
+	TACTL = 0x0204; // Reset Timer A, till next time
+}
+
+//! Delay for specified number of microseconds (given 16 MHz clock)
+void delay_us( unsigned int us )
+{
+	// 16 ticks = 1 us
+	TACTL |= 0x20; // Start timer!
+	while (us--) {
+		while (TAR < 16)
+			asm( "nop" );
+		TACTL = 0x0224;
+	}
+	TACTL = 0x0204; // Reset Timer A, till next time
+}
+
+//! Delay for specified number of clock ticks (16 MHz clock implies 62.5 ns per tick).
+void delay_ticks( unsigned int num_ticks )
+{
+	TACTL |= 0x20; // Start timer
+	while (TAR < num_ticks)
+		asm( "nop" );
+	TACTL = 0x0204; // Reset Timer A, till next time
+}