X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.h;h=bb92abb84ba33d1faa4a49823eb0a7c8038418a1;hb=db456e209feaecae53094051f3710fef73418a71;hp=37c228f8e12bad3947604005bcbedaf7d96589a5;hpb=c09035ea2cb24dee300476a3502919d23d90d1f5;p=openocd.git

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 37c228f8e1..bb92abb84b 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -16,17 +16,15 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, 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>
 
-struct arm_jtag
-{
+struct arm_jtag {
 	struct jtag_tap *tap;
 
 	uint32_t scann_size;
@@ -36,57 +34,45 @@ 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;
-	if (tap == NULL)
-		return ERROR_FAIL;
-
 	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;
 
 }
 
-
 int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state);
 static inline int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
 {
 	/* inline most common code path */
 	int retval = ERROR_OK;
 	if (jtag_info->cur_scan_chain != new_scan_chain)
-	{
 		return arm_jtag_scann_inner(jtag_info, new_scan_chain, end_state);
-	}
 
 	return retval;
 }
 
-
 int arm_jtag_setup_connection(struct arm_jtag *jtag_info);
 
 /* use this as a static so we can inline it in -O3 and refer to it via a pointer  */
-static __inline__ void arm7flip32(jtag_callback_data_t arg)
+static inline void arm7flip32(jtag_callback_data_t arg)
 {
-  uint8_t *in = (uint8_t *)arg;
-  *((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32);
+	uint8_t *in = (uint8_t *)arg;
+	*((uint32_t *)arg) = flip_u32(le_to_h_u32(in), 32);
 }
 
-static __inline__ void arm_le_to_h_u32(jtag_callback_data_t arg)
+static inline void arm_le_to_h_u32(jtag_callback_data_t arg)
 {
-  uint8_t *in = (uint8_t *)arg;
-  *((uint32_t *)in) = le_to_h_u32(in);
+	uint8_t *in = (uint8_t *)arg;
+	*((uint32_t *)arg) = le_to_h_u32(in);
 }
 
-
-#endif /* ARM_JTAG */
-
+#endif /* OPENOCD_TARGET_ARM_JTAG_H */