[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-671-g4fac13827

[openocd-gerrit <ope...@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  4fac13827feaf95554a54719278fbd890df40c67 (commit)
      from  632df9e5cbf27f8c5f5d2633918af53c6b80d970 (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 4fac13827feaf95554a54719278fbd890df40c67
Author: Marc Schink <de...@za...>
Date:   Wed Jul 17 16:48:14 2024 +0200

    jtag: Use 'unsigned int' for 'abs_chain_position'
    
    Change-Id: I1ac0a6a86f820b051619aa132754a69b8f8e0ab9
    Signed-off-by: Marc Schink <de...@za...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8402
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/core.c b/src/jtag/core.c
index c8f20b73c..939199462 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -212,7 +212,7 @@ unsigned jtag_tap_count_enabled(void)
 /** Append a new TAP to the chain of all taps. */
 static void jtag_tap_add(struct jtag_tap *t)
 {
-	unsigned jtag_num_taps = 0;
+	unsigned int jtag_num_taps = 0;
 
 	struct jtag_tap **tap = &__jtag_all_taps;
 	while (*tap) {
@@ -1471,7 +1471,7 @@ void jtag_tap_init(struct jtag_tap *tap)
 	jtag_register_event_callback(&jtag_reset_callback, tap);
 	jtag_tap_add(tap);
 
-	LOG_DEBUG("Created Tap: %s @ abs position %d, "
+	LOG_DEBUG("Created Tap: %s @ abs position %u, "
 			"irlen %d, capture: 0x%x mask: 0x%x", tap->dotted_name,
 			tap->abs_chain_position, tap->ir_length,
 			(unsigned) tap->ir_capture_value,
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 470ae1833..46ab584d9 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -102,7 +102,7 @@ struct jtag_tap {
 	char *chip;
 	char *tapname;
 	char *dotted_name;
-	int abs_chain_position;
+	unsigned int abs_chain_position;
 	/** Is this TAP disabled after JTAG reset? */
 	bool disabled_after_reset;
 	/** Is this TAP currently enabled? */
@@ -150,7 +150,7 @@ struct jtag_tap *jtag_all_taps(void);
 const char *jtag_tap_name(const struct jtag_tap *tap);
 struct jtag_tap *jtag_tap_by_string(const char *dotted_name);
 struct jtag_tap *jtag_tap_by_jim_obj(Jim_Interp *interp, Jim_Obj *obj);
-struct jtag_tap *jtag_tap_by_position(unsigned abs_position);
+struct jtag_tap *jtag_tap_by_position(unsigned int abs_position);
 struct jtag_tap *jtag_tap_next_enabled(struct jtag_tap *p);
 unsigned jtag_tap_count_enabled(void);
 unsigned jtag_tap_count(void);
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index e53413427..7e4d6725a 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -814,7 +814,7 @@ COMMAND_HANDLER(handle_scan_chain_command)
 		expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length);
 
 		command_print(CMD,
-			"%2d %-18s     %c     0x%08x %s %5d 0x%02x  0x%02x",
+			"%2u %-18s     %c     0x%08x %s %5d 0x%02x  0x%02x",
 			tap->abs_chain_position,
 			tap->dotted_name,
 			tap->enabled ? 'Y' : 'n',
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 2f4a8fe2e..0aa82031c 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -132,7 +132,7 @@ typedef enum {
 
 typedef struct {
 	struct list_head list;
-	int abs_chain_position;
+	unsigned int abs_chain_position;
 
 	/* The number of harts connected to this DM. */
 	int hart_count;
@@ -236,7 +236,7 @@ static dm013_info_t *get_dm(struct target *target)
 	if (info->dm)
 		return info->dm;
 
-	int abs_chain_position = target->tap->abs_chain_position;
+	unsigned int abs_chain_position = target->tap->abs_chain_position;
 
 	dm013_info_t *entry;
 	dm013_info_t *dm = NULL;
diff --git a/src/target/xtensa/xtensa_chip.c b/src/target/xtensa/xtensa_chip.c
index ac4a49ccf..ce6d35cab 100644
--- a/src/target/xtensa/xtensa_chip.c
+++ b/src/target/xtensa/xtensa_chip.c
@@ -103,7 +103,7 @@ static int xtensa_chip_target_create(struct target *target, Jim_Interp *interp)
 		LOG_DEBUG("DAP: ap_num %" PRId64 " DAP %p\n", pc->ap_num, pc->dap);
 	} else {
 		xtensa_chip_dm_cfg.tap = target->tap;
-		LOG_DEBUG("JTAG: %s:%s pos %d", target->tap->chip, target->tap->tapname,
+		LOG_DEBUG("JTAG: %s:%s pos %u", target->tap->chip, target->tap->tapname,
 			target->tap->abs_chain_position);
 	}
 

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

Summary of changes:
 src/jtag/core.c                 | 4 ++--
 src/jtag/jtag.h                 | 4 ++--
 src/jtag/tcl.c                  | 2 +-
 src/target/riscv/riscv-013.c    | 4 ++--
 src/target/xtensa/xtensa_chip.c | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository