From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Thu, 3 Feb 2011 21:03:20 +0000 (+0000)
Subject: Close to fixing MSP430 JTAG, which was broken during Huseby's refactoring.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=0ef9b41419da03a05305bfed28cb5ed47efec764;hp=91087efc8ddcfb800da5c0bc87d2840897e829c7;ds=sidebyside

Close to fixing MSP430 JTAG, which was broken during Huseby's refactoring.

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

diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index 9a33a72..417d803 100644
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -9,8 +9,8 @@
 
 //! Handles classic MSP430 JTAG commands.  Forwards others to JTAG.
 void jtag430_handle_fn(uint8_t const app,
-					   uint8_t const verb,
-					   uint32_t const len);
+		       uint8_t const verb,
+		       uint32_t const len);
 
 // define the jtag430 app's app_t
 app_t const jtag430_app = {
diff --git a/firmware/apps/jtag/sbw.c b/firmware/apps/jtag/sbw.c
index efbc401..9d4dbce 100644
--- a/firmware/apps/jtag/sbw.c
+++ b/firmware/apps/jtag/sbw.c
@@ -41,7 +41,6 @@ void sbwhandle(u8 app, u8 verb, u8 len){
 }
 
 
-
 //FIXME these should be prefixed with sbw
 //to prevent name pollution.
 int tms=1, tdi=1, tdo=0;
diff --git a/firmware/include/jtag430x2.h b/firmware/include/jtag430x2.h
index 86598a8..090697c 100644
--- a/firmware/include/jtag430x2.h
+++ b/firmware/include/jtag430x2.h
@@ -8,7 +8,7 @@
 
 #include "app.h"
 
-#define JTAG430X2 0x11
+#define JTAG430X2 0x16
 
 extern app_t const jtag430x2_app;