X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.h;h=bb92abb84ba33d1faa4a49823eb0a7c8038418a1;hp=13b701fc31ea478a3305436f5634f056b1cd6cb4;hb=9f021c2bc129f8f7c659c64ad19531bd8073264a;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 13b701fc31..bb92abb84b 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -16,13 +16,11 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef ARM_JTAG
-#define ARM_JTAG
+#ifndef OPENOCD_TARGET_ARM_JTAG_H
+#define OPENOCD_TARGET_ARM_JTAG_H
 
 #include <jtag/jtag.h>
 
@@ -36,20 +34,16 @@ struct arm_jtag {
 	uint32_t intest_instr;
 };
 
-int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,
+int arm_jtag_set_instr_inner(struct jtag_tap *tap, uint32_t new_instr,
 		void *no_verify_capture,
 		tap_state_t end_state);
 
-static inline int arm_jtag_set_instr(struct arm_jtag *jtag_info,
+static inline int arm_jtag_set_instr(struct jtag_tap *tap,
 		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
 	/* inline most common code path */
-	struct jtag_tap *tap;
-	tap = jtag_info->tap;
-	assert(tap != NULL);
-
 	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
-		return arm_jtag_set_instr_inner(jtag_info, new_instr, no_verify_capture, end_state);
+		return arm_jtag_set_instr_inner(tap, new_instr, no_verify_capture, end_state);
 
 	return ERROR_OK;
 
@@ -81,4 +75,4 @@ static inline void arm_le_to_h_u32(jtag_callback_data_t arg)
 	*((uint32_t *)arg) = le_to_h_u32(in);
 }
 
-#endif /* ARM_JTAG */
+#endif /* OPENOCD_TARGET_ARM_JTAG_H */