X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=90e4d0fd7eb5479bab725939f0c4a3324fb2fa97;hp=0352b778624f0ab3a1186db71b75d8a70be431fb;hb=8c97f896b9cf1b9b6ddf25420c9d9f04516ddd11;hpb=17f77cc72da5218464618d42bfa230c3d6b60295

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 0352b77..90e4d0f 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -78,109 +78,86 @@ void handle(uint8_t const app,
 
 
 //! Main loop.
-int main(void)
-{
-	volatile unsigned int i;
-	unsigned char app, verb;
-	unsigned long len;
-	// MSP reboot count for reset input & reboot function located at 0xFFFE
-	volatile unsigned int reset_count = 0;
+int main(void){
+  volatile unsigned int i;
+  unsigned char app, verb;
+  unsigned long len;
+  // MSP reboot count for reset input & reboot function located at 0xFFFE
+  volatile unsigned int reset_count = 0;
 #if (platform == tilaunchpad)
-	int ret=0;
-
-	//ret = setjmp(warmstart);// needs to be here since context from init() would be gone
+  int ret=0;
+  
+  //ret = setjmp(warmstart);// needs to be here since context from init() would be gone
  warmstart:
-	if (ret == 0) {	
-		coldstart();	// basic hardware setup, clock to TUSB3410, and enable
-	} else if (ret == 2) {
-		dputs("\nalmost BSL only one RTS change\n");
-	} else if (ret > 2) {	// reset released after more than two tst transisitions
-		// We could write a BSL, a nice exercise for a Sunday afternoon.
-		dputs("\nBSL\n");
-		//call_BSL();	// once you are done uncomment ;-)
-	} else {		// we come here after DTR high (release reset)
-		dputs("\nWarmstart\n");
-	}
-#elif (platform == donbfet)
-	extern void donbfet_reboot(void);
-	void (*reboot_function)(void) = donbfet_reboot;
+  if (ret == 0) {	
+    coldstart();	// basic hardware setup, clock to TUSB3410, and enable
+  } else if (ret == 2) {
+    dputs("\nalmost BSL only one RTS change\n");
+  } else if (ret > 2) {	// reset released after more than two tst transisitions
+    // We could write a BSL, a nice exercise for a Sunday afternoon.
+    dputs("\nBSL\n");
+    //call_BSL();	// once you are done uncomment ;-)
+  } else {		// we come here after DTR high (release reset)
+    dputs("\nWarmstart\n");
+  }
+#endif
+
+#if (platform == donbfet)
+  extern void donbfet_reboot(void);
+  void (*reboot_function)(void) = donbfet_reboot;
 #else
-	void (*reboot_function)(void) = (void *) 0xFFFE;
+  void (*reboot_function)(void) = (void *) 0xFFFE;
 #endif
-	init();
-	
-	txstring(MONITOR,OK,"http://goodfet.sf.net/");
-	//txstring(0xab,0xcd,"http://goodfet.sf.net/");
-	
-	
-	//Command loop.  There's no end!
-	while(1)
+  init();
+  
+  txstring(MONITOR,OK,"http://goodfet.sf.net/");
+  //txstring(0xab,0xcd,"http://goodfet.sf.net/");
+  
+  
+  //Command loop.  There's no end!
+  while(1){
+    //Magic 3
+    app = serial_rx();
+    
+    // If the app is the reset byte (0x80) increment and loop
+    if (app == RESET){
+      reset_count++;
+	    
+      if (reset_count > 4){
+	// We could trigger the WDT with either:
+	// WDTCTL = 0;
+	// or
+	// WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;
+	// but instead we'll jump to our reboot function pointer
+	(*reboot_function)();
+	debugstr("Rebooting not supported on this platform.");
+      }
+	    
+      continue;
+    }else {
+      reset_count = 0;
+    }
+	  
+    verb = serial_rx();
+    len = rxword();
+	  
+    //Read data, looking for buffer overflow.
+    if(len <= CMDDATALEN){
+      for(i = 0; i < len; i++)
 	{
-		//Magic 3
-		app = serial_rx();
-
-		// If the app is the reset byte (0x80) increment and loop
-		if (app == RESET)
-		{
-			reset_count++;
-
-			if (reset_count > 4) 
-			{
-				// We could trigger the WDT with either:
-				// WDTCTL = 0;
-				// or
-				// WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;
-				// but instead we'll jump to our reboot function pointer
-#ifdef MSP430
-# if (platform == tilaunchpad)
-				// do we really need this, we do not want to reset the TUSB3410 
-				dputs("reset_count>4\n");
-				
-				//longjmp(warmstart,111);
-				goto warmstart;
-				
-# else
-				(*reboot_function)();
-# endif
-#else /* !MSP430 */
-# if (platform == donbfet)
-				(*reboot_function)();
-# else
-				debugstr("Rebooting not supported on this platform.");
-# endif
-#endif
-			}
-
-			continue;
-		} 
-		else 
-		{
-			reset_count = 0;
-		}
-		
-		verb = serial_rx();
-		len = rxword();
-
-		//Read data, looking for buffer overflow.
-		if(len <= CMDDATALEN)
-		{
-			for(i = 0; i < len; i++)
-			{
-				cmddata[i] = serial_rx();
-			}
-
-			handle(app,verb,len);
-		}
-		else
-		{
-			//Listen to the blaberring.
-			for(i = 0; i < len; i++)
-				serial_rx();
-
-			//Reply with an error.
-			debugstr("Buffer length exceeded.");
-			txdata(MONITOR,NOK,0);
-		}
+	  cmddata[i] = serial_rx();
 	}
+	    
+      handle(app,verb,len);
+    }else {
+      //Listen to the blaberring.
+      for(i = 0; i < len; i++)
+	serial_rx();
+	    
+      //Reply with an error.
+      debugstr("Buffer length exceeded.");
+      txdata(MONITOR,NOK,0);
+    }
+  }
 }