projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fpga/altera-10m50: add all device id
[fw/openocd]
/
src
/
target
/
arm926ejs.c
diff --git
a/src/target/arm926ejs.c
b/src/target/arm926ejs.c
index 95930e685d6c7c094427367dd2a8289c9c5ee304..58de778500f30caba4610200930713dfd457543b 100644
(file)
--- a/
src/target/arm926ejs.c
+++ b/
src/target/arm926ejs.c
@@
-16,9
+16,7
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* 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/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@
-67,7
+65,7
@@
static int arm926ejs_cp15_read(struct target *target, uint32_t op1, uint32_t op2
retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
- retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+ retval = arm_jtag_set_instr(jtag_info
->tap
, jtag_info->intest_instr, NULL, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
if (retval != ERROR_OK)
return retval;
@@
-89,7
+87,7
@@
static int arm926ejs_cp15_read(struct target *target, uint32_t op1, uint32_t op2
jtag_add_dr_scan(jtag_info->tap, 4, fields, TAP_IDLE);
jtag_add_dr_scan(jtag_info->tap, 4, fields, TAP_IDLE);
-
long long
then = timeval_ms();
+
int64_t
then = timeval_ms();
for (;;) {
/* rescan with NOP, to wait for the access to complete */
for (;;) {
/* rescan with NOP, to wait for the access to complete */
@@
-117,7
+115,7
@@
static int arm926ejs_cp15_read(struct target *target, uint32_t op1, uint32_t op2
LOG_DEBUG("addr: 0x%x value: %8.8x", address, *value);
#endif
LOG_DEBUG("addr: 0x%x value: %8.8x", address, *value);
#endif
- retval = arm_jtag_set_instr(jtag_info, 0xc, NULL, TAP_IDLE);
+ retval = arm_jtag_set_instr(jtag_info
->tap
, 0xc, NULL, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
if (retval != ERROR_OK)
return retval;
@@
-153,7
+151,7
@@
static int arm926ejs_cp15_write(struct target *target, uint32_t op1, uint32_t op
retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
retval = arm_jtag_scann(jtag_info, 0xf, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
- retval = arm_jtag_set_instr(jtag_info, jtag_info->intest_instr, NULL, TAP_IDLE);
+ retval = arm_jtag_set_instr(jtag_info
->tap
, jtag_info->intest_instr, NULL, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
if (retval != ERROR_OK)
return retval;
@@
-175,7
+173,7
@@
static int arm926ejs_cp15_write(struct target *target, uint32_t op1, uint32_t op
jtag_add_dr_scan(jtag_info->tap, 4, fields, TAP_IDLE);
jtag_add_dr_scan(jtag_info->tap, 4, fields, TAP_IDLE);
-
long long
then = timeval_ms();
+
int64_t
then = timeval_ms();
for (;;) {
/* rescan with NOP, to wait for the access to complete */
for (;;) {
/* rescan with NOP, to wait for the access to complete */
@@
-200,7
+198,7
@@
static int arm926ejs_cp15_write(struct target *target, uint32_t op1, uint32_t op
LOG_DEBUG("addr: 0x%x value: %8.8x", address, value);
#endif
LOG_DEBUG("addr: 0x%x value: %8.8x", address, value);
#endif
- retval = arm_jtag_set_instr(jtag_info, 0xf, NULL, TAP_IDLE);
+ retval = arm_jtag_set_instr(jtag_info
->tap
, 0xf, NULL, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
if (retval != ERROR_OK)
return retval;
@@
-548,7
+546,7
@@
int arm926ejs_soft_reset_halt(struct target *target)
if (retval != ERROR_OK)
return retval;
if (retval != ERROR_OK)
return retval;
-
long long
then = timeval_ms();
+
int64_t
then = timeval_ms();
int timeout;
while (!(timeout = ((timeval_ms()-then) > 1000))) {
if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1) == 0) {
int timeout;
while (!(timeout = ((timeval_ms()-then) > 1000))) {
if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1) == 0) {
@@
-596,7
+594,7
@@
int arm926ejs_soft_reset_halt(struct target *target)
}
/** Writes a buffer, in the specified word size, with current MMU settings. */
}
/** Writes a buffer, in the specified word size, with current MMU settings. */
-int arm926ejs_write_memory(struct target *target,
uint32
_t address,
+int arm926ejs_write_memory(struct target *target,
target_addr
_t address,
uint32_t size, uint32_t count, const uint8_t *buffer)
{
int retval;
uint32_t size, uint32_t count, const uint8_t *buffer)
{
int retval;
@@
-625,7
+623,7
@@
int arm926ejs_write_memory(struct target *target, uint32_t address,
return retval;
}
return retval;
}
-
uint32
_t pa;
+
target_addr
_t pa;
retval = target->type->virt2phys(target, address, &pa);
if (retval != ERROR_OK)
return retval;
retval = target->type->virt2phys(target, address, &pa);
if (retval != ERROR_OK)
return retval;
@@
-657,7
+655,7
@@
int arm926ejs_write_memory(struct target *target, uint32_t address,
}
static int arm926ejs_write_phys_memory(struct target *target,
}
static int arm926ejs_write_phys_memory(struct target *target,
-
uint32
_t address, uint32_t size,
+
target_addr
_t address, uint32_t size,
uint32_t count, const uint8_t *buffer)
{
struct arm926ejs_common *arm926ejs = target_to_arm926(target);
uint32_t count, const uint8_t *buffer)
{
struct arm926ejs_common *arm926ejs = target_to_arm926(target);
@@
-667,7
+665,7
@@
static int arm926ejs_write_phys_memory(struct target *target,
}
static int arm926ejs_read_phys_memory(struct target *target,
}
static int arm926ejs_read_phys_memory(struct target *target,
-
uint32
_t address, uint32_t size,
+
target_addr
_t address, uint32_t size,
uint32_t count, uint8_t *buffer)
{
struct arm926ejs_common *arm926ejs = target_to_arm926(target);
uint32_t count, uint8_t *buffer)
{
struct arm926ejs_common *arm926ejs = target_to_arm926(target);
@@
-691,6
+689,7
@@
int arm926ejs_init_arch_info(struct target *target, struct arm926ejs_common *arm
arm7_9->post_debug_entry = arm926ejs_post_debug_entry;
arm7_9->pre_restore_context = arm926ejs_pre_restore_context;
arm7_9->post_debug_entry = arm926ejs_post_debug_entry;
arm7_9->pre_restore_context = arm926ejs_pre_restore_context;
+ arm7_9->write_memory = arm926ejs_write_memory;
arm926ejs->read_cp15 = arm926ejs_cp15_read;
arm926ejs->write_cp15 = arm926ejs_cp15_write;
arm926ejs->read_cp15 = arm926ejs_cp15_read;
arm926ejs->write_cp15 = arm926ejs_cp15_write;
@@
-737,7
+736,7
@@
COMMAND_HANDLER(arm926ejs_handle_cache_info_command)
return armv4_5_handle_cache_info_command(CMD_CTX, &arm926ejs->armv4_5_mmu.armv4_5_cache);
}
return armv4_5_handle_cache_info_command(CMD_CTX, &arm926ejs->armv4_5_mmu.armv4_5_cache);
}
-static int arm926ejs_virt2phys(struct target *target,
uint32_t virtual, uint32
_t *physical)
+static int arm926ejs_virt2phys(struct target *target,
target_addr_t virtual, target_addr
_t *physical)
{
uint32_t cb;
struct arm926ejs_common *arm926ejs = target_to_arm926(target);
{
uint32_t cb;
struct arm926ejs_common *arm926ejs = target_to_arm926(target);
@@
-808,8
+807,7
@@
struct target_type arm926ejs_target = {
.get_gdb_reg_list = arm_get_gdb_reg_list,
.read_memory = arm7_9_read_memory,
.get_gdb_reg_list = arm_get_gdb_reg_list,
.read_memory = arm7_9_read_memory,
- .write_memory = arm926ejs_write_memory,
- .bulk_write_memory = arm7_9_bulk_write_memory,
+ .write_memory = arm7_9_write_memory_opt,
.checksum_memory = arm_checksum_memory,
.blank_check_memory = arm_blank_check_memory,
.checksum_memory = arm_checksum_memory,
.blank_check_memory = arm_blank_check_memory,