[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-415-ga4dace3

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  a4dace3122749991136d9d50ef685f5d641d3295 (commit)
      from  b05ae413314f48832dd12c994b85c9aad8632967 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a4dace3122749991136d9d50ef685f5d641d3295
Author: David Brownell <dbr...@us...>
Date:   Fri Jul 16 19:22:15 2010 -0400

    ARM ADI-V5: cleanup CID/PID addressing
    
    Use addition for offsetting, not masking.  Shorten some lines.
    Make "component_start" print-only (unused otherwise; don't save).
    
    Still doesn't resolve the issue where multiple components
    are wrongly displaying as NVICs on some Cortex-M3 parts because
    many PIDs appear to be zeroes ... maybe adapter related??
    
    Signed-off-by: David Brownell <db@helium.(none)>

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index d6cc938..dfb45b4 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1098,50 +1098,52 @@ static int dap_info_command(struct command_context *cmd_ctx,
 			{
 				uint32_t c_cid0, c_cid1, c_cid2, c_cid3;
 				uint32_t c_pid0, c_pid1, c_pid2, c_pid3, c_pid4;
-				uint32_t component_start, component_base;
+				uint32_t component_base;
 				unsigned part_num;
 				char *type, *full;
 
-				component_base = (uint32_t)((dbgbase & 0xFFFFF000)
-						+ (int)(romentry & 0xFFFFF000));
+				component_base = (dbgbase & 0xFFFFF000)
+						+ (romentry & 0xFFFFF000);
+
+				/* IDs are in last 4K section */
+
+
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000)
-							| 0xFE0, &c_pid0);
+					component_base + 0xFE0, &c_pid0);
 				c_pid0 &= 0xff;
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000)
-							| 0xFE4, &c_pid1);
+					component_base + 0xFE4, &c_pid1);
 				c_pid1 &= 0xff;
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000)
-							| 0xFE8, &c_pid2);
+					component_base + 0xFE8, &c_pid2);
 				c_pid2 &= 0xff;
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000)
-							| 0xFEC, &c_pid3);
+					component_base + 0xFEC, &c_pid3);
 				c_pid3 &= 0xff;
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000)
-							| 0xFD0, &c_pid4);
+					component_base + 0xFD0, &c_pid4);
 				c_pid4 &= 0xff;
 
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000) | 0xFF0, &c_cid0);
+					component_base + 0xFF0, &c_cid0);
 				c_cid0 &= 0xff;
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000) | 0xFF4, &c_cid1);
+					component_base + 0xFF4, &c_cid1);
 				c_cid1 &= 0xff;
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000) | 0xFF8, &c_cid2);
+					component_base + 0xFF8, &c_cid2);
 				c_cid2 &= 0xff;
 				mem_ap_read_atomic_u32(dap,
-						(component_base & 0xFFFFF000) | 0xFFC, &c_cid3);
+					component_base + 0xFFC, &c_cid3);
 				c_cid3 &= 0xff;
-				component_start = component_base - 0x1000*(c_pid4 >> 4);
 
-				command_print(cmd_ctx, "\t\tComponent base address 0x%" PRIx32
-						", start address 0x%" PRIx32,
-						component_base, component_start);
+
+				command_print(cmd_ctx,
+				"\t\tComponent base address 0x%" PRIx32
+					", start address 0x%" PRIx32,
+						component_base,
+				/* component may take multiple 4K pages */
+				component_base - 0x1000*(c_pid4 >> 4));
 				command_print(cmd_ctx, "\t\tComponent class is 0x%x, %s",
 						(int) (c_cid1 >> 4) & 0xf,
 						/* See ARM IHI 0029B Table 3-3 */

-----------------------------------------------------------------------

Summary of changes:
 src/target/arm_adi_v5.c |   44 +++++++++++++++++++++++---------------------
 1 files changed, 23 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository