From d796f5929c3b2baafae4b8bf27d2b1b71c49ee53 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Sun, 23 Jan 2022 14:44:38 +0100 Subject: [PATCH] arm_coresight: define ARM_CS_CIDR_CLASS() Right now it has a single use but it will soon be used more. Change-Id: I9a819c65df467fc859e4b5251035a17ed33daa35 Signed-off-by: Antonio Borneo Reviewed-on: https://review.openocd.org/c/openocd/+/6813 Tested-by: jenkins Reviewed-by: Daniel Goehring --- src/target/arm_adi_v5.c | 2 +- src/target/arm_coresight.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c index 8d6d6618bc..2848671db5 100644 --- a/src/target/arm_adi_v5.c +++ b/src/target/arm_adi_v5.c @@ -1434,7 +1434,7 @@ static int dap_rom_display(struct command_invocation *cmd, command_print(cmd, "\t\tPeripheral ID 0x%010" PRIx64, pid); - const unsigned int class = (cid & ARM_CS_CIDR_CLASS_MASK) >> ARM_CS_CIDR_CLASS_SHIFT; + const unsigned int class = ARM_CS_CIDR_CLASS(cid); const unsigned int part_num = ARM_CS_PIDR_PART(pid); unsigned int designer_id = ARM_CS_PIDR_DESIGNER(pid); diff --git a/src/target/arm_coresight.h b/src/target/arm_coresight.h index a08f4fb53b..71ee1719cb 100644 --- a/src/target/arm_coresight.h +++ b/src/target/arm_coresight.h @@ -44,7 +44,7 @@ #define ARM_CS_CIDR3 (0xFFC) #define ARM_CS_CIDR_CLASS_MASK (0x0000F000) -#define ARM_CS_CIDR_CLASS_SHIFT (12) +#define ARM_CS_CIDR_CLASS(cidr) (((cidr) >> 12) & 0x000F) #define ARM_CS_CLASS_0X1_ROM_TABLE (0x1) #define ARM_CS_CLASS_0X9_CS_COMPONENT (0x9) -- 2.30.2