jtag: align adapter speed code to new structure

[fw/openocd] / src / target / arm920t.h

diff --git a/src/target/arm920t.h b/src/target/arm920t.h
index 37745130fefc555caf73b7745741cb2b01aa9708..2e3b08ca3a31940690e94f92437ec1dbd7c146df 100644 (file)
--- a/src/target/arm920t.h
+++ b/src/target/arm920t.h
@@ -13,13 +13,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 ARM920T_H
-#define ARM920T_H
+#ifndef OPENOCD_TARGET_ARM920T_H
+#define OPENOCD_TARGET_ARM920T_H
 
 #include "arm9tdmi.h"
 #include "armv4_5_mmu.h"
@@ -57,11 +55,9 @@ struct arm920t_tlb_entry {
 int arm920t_arch_state(struct target *target);
 int arm920t_soft_reset_halt(struct target *target);
 int arm920t_read_memory(struct target *target,
-       uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+       target_addr_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 int arm920t_write_memory(struct target *target,
-       uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
-int arm920t_write_memory_opt(struct target *target,
-       uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
+       target_addr_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
 int arm920t_post_debug_entry(struct target *target);
 void arm920t_pre_restore_context(struct target *target);
 int arm920t_get_ttb(struct target *target, uint32_t *result);
@@ -72,4 +68,4 @@ int arm920t_enable_mmu_caches(struct target *target,
 
 extern const struct command_registration arm920t_command_handlers[];
 
-#endif /* ARM920T_H */
+#endif /* OPENOCD_TARGET_ARM920T_H */