[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-758-gfec3b2242

[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  fec3b224214e3784b0c00970d2421212402da880 (commit)
      from  957eb741a0980408fe4d0682fccb99a183f90998 (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 fec3b224214e3784b0c00970d2421212402da880
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Sep 8 21:47:31 2024 +0200

    target: riscv: remove non-trivial 'unsigned' cast
    
    Change the prototype of riscv_batch_get_dmi_read_op().
    Now that 'target->smp' is unsigned, drop the cast.
    
    Change-Id: I2a54268ed1e4bf0ea884b62cceb73f5c7451da78
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8484
    Tested-by: jenkins

diff --git a/src/target/riscv/batch.c b/src/target/riscv/batch.c
index 859e2275e..e3f8ff3d4 100644
--- a/src/target/riscv/batch.c
+++ b/src/target/riscv/batch.c
@@ -156,14 +156,14 @@ size_t riscv_batch_add_dmi_read(struct riscv_batch *batch, unsigned int address)
 	return batch->read_keys_used++;
 }
 
-unsigned int riscv_batch_get_dmi_read_op(struct riscv_batch *batch, size_t key)
+uint32_t riscv_batch_get_dmi_read_op(struct riscv_batch *batch, size_t key)
 {
 	assert(key < batch->read_keys_used);
 	size_t index = batch->read_keys[key];
 	assert(index <= batch->used_scans);
 	uint8_t *base = batch->data_in + DMI_SCAN_BUF_SIZE * index;
 	/* extract "op" field from the DMI read result */
-	return (unsigned)buf_get_u32(base, DTM_DMI_OP_OFFSET, DTM_DMI_OP_LENGTH);
+	return buf_get_u32(base, DTM_DMI_OP_OFFSET, DTM_DMI_OP_LENGTH);
 }
 
 uint32_t riscv_batch_get_dmi_read_data(struct riscv_batch *batch, size_t key)
diff --git a/src/target/riscv/batch.h b/src/target/riscv/batch.h
index e5b94cc21..537fa5923 100644
--- a/src/target/riscv/batch.h
+++ b/src/target/riscv/batch.h
@@ -65,7 +65,7 @@ void riscv_batch_add_dmi_write(struct riscv_batch *batch, unsigned int address,
  * provides a key, the second one actually obtains the result of the read -
  * status (op) and the actual data. */
 size_t riscv_batch_add_dmi_read(struct riscv_batch *batch, unsigned int address);
-unsigned int riscv_batch_get_dmi_read_op(struct riscv_batch *batch, size_t key);
+uint32_t riscv_batch_get_dmi_read_op(struct riscv_batch *batch, size_t key);
 uint32_t riscv_batch_get_dmi_read_data(struct riscv_batch *batch, size_t key);
 
 /* Scans in a NOP. */
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 16eced2d8..6c9ed317b 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -1537,7 +1537,7 @@ static int set_haltgroup(struct target *target, bool *supported)
 	uint32_t read;
 	if (dmi_read(target, &read, DM_DMCS2) != ERROR_OK)
 		return ERROR_FAIL;
-	*supported = get_field(read, DM_DMCS2_GROUP) == (unsigned)target->smp;
+	*supported = get_field(read, DM_DMCS2_GROUP) == target->smp;
 	return ERROR_OK;
 }
 

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

Summary of changes:
 src/target/riscv/batch.c     | 4 ++--
 src/target/riscv/batch.h     | 2 +-
 src/target/riscv/riscv-013.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository