X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm11_dbgtap.h;h=a2944b6927083bf6accea12a500d40c4ac94ac52;hp=7f87e3a07a9ae5a68b3c68f13bfad49175ee05bc;hb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;hpb=b3e64566ab88dde3f664d7ae59116e7644533ea3

diff --git a/src/target/arm11_dbgtap.h b/src/target/arm11_dbgtap.h
index 7f87e3a07a..a2944b6927 100644
--- a/src/target/arm11_dbgtap.h
+++ b/src/target/arm11_dbgtap.h
@@ -1,7 +1,27 @@
+/***************************************************************************
+ *   Copyright (C) 2008 digenius technology GmbH.                          *
+ *   Michael Bruck                                                         *
+ *                                                                         *
+ *   Copyright (C) 2008,2009 Oyvind Harboe oyvind.harboe@zylin.com         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   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, see <http://www.gnu.org/licenses/>. *
+ ***************************************************************************/
+
 #ifndef ARM11_DBGTAP_H
 #define ARM11_DBGTAP_H
 
-#include <target/arm11.h>
+#include "arm11.h"
 
 /* ARM11 internals */
 
@@ -30,17 +50,16 @@ int arm11_run_instr_data_from_core_via_r0(struct arm11_common *arm11,
 int arm11_run_instr_data_to_core_via_r0(struct arm11_common *arm11,
 		uint32_t opcode, uint32_t data);
 
-void arm11_add_dr_scan_vc(int num_fields, struct scan_field *fields,
+void arm11_add_dr_scan_vc(struct jtag_tap *tap, int num_fields, struct scan_field *fields,
 		tap_state_t state);
 
 /**
  * Used with arm11_sc7_run to make a list of read/write commands for
  * scan chain 7
  */
-struct arm11_sc7_action
-{
-	bool write; /**< Access mode: true for write, false for read. */
-	uint8_t	address; /**< Register address mode. Use enum #arm11_sc7 */
+struct arm11_sc7_action {
+	bool write;	/**< Access mode: true for write, false for read. */
+	uint8_t address;/**< Register address mode. Use enum #arm11_sc7 */
 	/**
 	 * If write then set this to value to be written.  In read mode
 	 * this receives the read value when the function returns.
@@ -52,8 +71,8 @@ int arm11_sc7_run(struct arm11_common *arm11,
 		struct arm11_sc7_action *actions, size_t count);
 
 /* Mid-level helper functions */
-void arm11_sc7_clear_vbw(struct arm11_common *arm11);
-void arm11_sc7_set_vcr(struct arm11_common *arm11, uint32_t value);
+int arm11_sc7_clear_vbw(struct arm11_common *arm11);
+int arm11_sc7_set_vcr(struct arm11_common *arm11, uint32_t value);
 
 int arm11_read_memory_word(struct arm11_common *arm11,
 		uint32_t address, uint32_t *result);
@@ -61,4 +80,4 @@ int arm11_read_memory_word(struct arm11_common *arm11,
 int arm11_dpm_init(struct arm11_common *arm11, uint32_t didr);
 int arm11_bpwp_flush(struct arm11_common *arm11);
 
-#endif // ARM11_DBGTAP_H
+#endif	/* ARM11_DBGTAP_H */