[PATCH]: ac00519961 target: riscv: remove non-trivial 'unsigned' cast

[gerrit]

This is an automated email from Gerrit.

"Antonio Borneo <borneo.anto...@gmail.com>" just uploaded a new patch set to 
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/8484

-- gerrit

commit ac0051996148b21bfc0d2029a783871e397cf77e
Author: Antonio Borneo <borneo.anto...@gmail.com>
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 <borneo.anto...@gmail.com>

diff --git a/src/target/riscv/batch.c b/src/target/riscv/batch.c
index 859e2275e5..e3f8ff3d4b 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 e5b94cc219..537fa59233 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 16eced2d89..6c9ed317b0 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;
 }
 

--