diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2010-07-13 19:34:04 -0400 |
|---|---|---|
| committer | David Brownell <db@helium.(none)> | 2010-07-13 19:34:04 -0400 |
| commit | 0672a6497ec1ea59905487c01a65ffad79449538 (patch) | |
| tree | b84cc510caf5d4fdc1315867a1eaa6a2cb99bc26 | |
| parent | 1619facb5ebce060c2cb35035e7801a8898a6296 (diff) | |
| download | openocd+libswd-0672a6497ec1ea59905487c01a65ffad79449538.tar.gz openocd+libswd-0672a6497ec1ea59905487c01a65ffad79449538.tar.bz2 openocd+libswd-0672a6497ec1ea59905487c01a65ffad79449538.tar.xz openocd+libswd-0672a6497ec1ea59905487c01a65ffad79449538.zip | |
ARM ADI-V5: PIDs and CIDs are 8 bits
Mask the upper bits after 32-bit reads.
Alsoo revert the ugly changes to use PRIx32; just cast to unsized
integers when printing (two chars not eight).
Signed-off-by: David Brownell <db@helium.(none)>
| -rw-r--r-- | src/target/arm_adi_v5.c | 62 |
1 files changed, 41 insertions, 21 deletions
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index b4f49e75..d6cc9381 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -1076,11 +1076,12 @@ static int dap_info_command(struct command_context *cmd_ctx, return retval; if (!is_dap_cid_ok(cid3, cid2, cid1, cid0)) - command_print(cmd_ctx, "\tCID3 0x%2.2" PRIx32 - ", CID2 0x%2.2" PRIx32 - ", CID1 0x%2.2" PRIx32 - ", CID0 0x%2.2" PRIx32, - cid3, cid2, cid1, cid0); + command_print(cmd_ctx, "\tCID3 0x%2.2x" + ", CID2 0x%2.2x" + ", CID1 0x%2.2x" + ", CID0 0x%2.2x", + (unsigned) cid3, (unsigned)cid2, + (unsigned) cid1, (unsigned) cid0); if (memtype & 0x01) command_print(cmd_ctx, "\tMEMTYPE system memory present on bus"); else @@ -1104,23 +1105,38 @@ static int dap_info_command(struct command_context *cmd_ctx, component_base = (uint32_t)((dbgbase & 0xFFFFF000) + (int)(romentry & 0xFFFFF000)); mem_ap_read_atomic_u32(dap, - (component_base & 0xFFFFF000) | 0xFE0, &c_pid0); + (component_base & 0xFFFFF000) + | 0xFE0, &c_pid0); + c_pid0 &= 0xff; mem_ap_read_atomic_u32(dap, - (component_base & 0xFFFFF000) | 0xFE4, &c_pid1); + (component_base & 0xFFFFF000) + | 0xFE4, &c_pid1); + c_pid1 &= 0xff; mem_ap_read_atomic_u32(dap, - (component_base & 0xFFFFF000) | 0xFE8, &c_pid2); + (component_base & 0xFFFFF000) + | 0xFE8, &c_pid2); + c_pid2 &= 0xff; mem_ap_read_atomic_u32(dap, - (component_base & 0xFFFFF000) | 0xFEC, &c_pid3); + (component_base & 0xFFFFF000) + | 0xFEC, &c_pid3); + c_pid3 &= 0xff; mem_ap_read_atomic_u32(dap, - (component_base & 0xFFFFF000) | 0xFD0, &c_pid4); + (component_base & 0xFFFFF000) + | 0xFD0, &c_pid4); + c_pid4 &= 0xff; + mem_ap_read_atomic_u32(dap, (component_base & 0xFFFFF000) | 0xFF0, &c_cid0); + c_cid0 &= 0xff; mem_ap_read_atomic_u32(dap, (component_base & 0xFFFFF000) | 0xFF4, &c_cid1); + c_cid1 &= 0xff; mem_ap_read_atomic_u32(dap, (component_base & 0xFFFFF000) | 0xFF8, &c_cid2); + c_cid2 &= 0xff; mem_ap_read_atomic_u32(dap, (component_base & 0xFFFFF000) | 0xFFC, &c_cid3); + c_cid3 &= 0xff; component_start = component_base - 0x1000*(c_pid4 >> 4); command_print(cmd_ctx, "\t\tComponent base address 0x%" PRIx32 @@ -1243,23 +1259,27 @@ static int dap_info_command(struct command_context *cmd_ctx, } if (!is_dap_cid_ok(cid3, cid2, cid1, cid0)) - command_print(cmd_ctx, "\t\tCID3 0x%2.2" PRIx32 - ", CID2 0x%2.2" PRIx32 - ", CID1 0x%2.2" PRIx32 - ", CID0 0x%2.2" PRIx32, - c_cid3, c_cid2, c_cid1, c_cid0); - command_print(cmd_ctx, "\t\tPeripheral ID[4..0] = hex " - "%2.2x %2.2x %2.2x %2.2x %2.2x", - (int) c_pid4, - (int) c_pid3, (int) c_pid2, - (int) c_pid1, (int) c_pid0); + command_print(cmd_ctx, + "\t\tCID3 0%2.2x" + ", CID2 0%2.2x" + ", CID1 0%2.2x" + ", CID0 0%2.2x", + (int) c_cid3, + (int) c_cid2, + (int)c_cid1, + (int)c_cid0); + command_print(cmd_ctx, + "\t\tPeripheral ID[4..0] = hex " + "%2.2x %2.2x %2.2x %2.2x %2.2x", + (int) c_pid4, (int) c_pid3, (int) c_pid2, + (int) c_pid1, (int) c_pid0); /* Part number interpretations are from Cortex * core specs, the CoreSight components TRM * (ARM DDI 0314H), and ETM specs; also from * chip observation (e.g. TI SDTI). */ - part_num = c_pid0 & 0xff; + part_num = (c_pid0 & 0xff); part_num |= (c_pid1 & 0x0f) << 8; switch (part_num) { case 0x000: |