[PATCH]: a5b21ec611 target/esirisc_trace: rename macro conflicting with bits.h

[<ge...@op...>]

This is an automated email from Gerrit.

"Tomas Vanek <va...@fb...>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9168

-- gerrit

commit a5b21ec611d727f6b6bdc526a0c5ef392c6f652d
Author: Tomas Vanek <va...@fb...>
Date:   Mon Oct 13 18:35:37 2025 +0200

    target/esirisc_trace: rename macro conflicting with bits.h
    
    The esirisc_trace.c uses macro BIT_MASK(), same name as a macro
    from helper/bits.h
    Rename the former to allow including bits.h helper in target.h
    
    Change-Id: I0cc6a58e5aff3f48fa9a79a99bd28124f334c4e2
    Signed-off-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/esirisc_trace.c b/src/target/esirisc_trace.c
index 2dc08e5d2d..565511471f 100644
--- a/src/target/esirisc_trace.c
+++ b/src/target/esirisc_trace.c
@@ -18,7 +18,7 @@
 
 #include "esirisc.h"
 
-#define BIT_MASK(x)			((1 << (x)) - 1)
+#define BITS_MASK(x)			((1 << (x)) - 1)
 
 /* Control Fields */
 #define CONTROL_ST			(1<<0)					/* Start */
@@ -483,7 +483,7 @@ static int esirisc_trace_analyze_simple(struct command_invocation *cmd, uint8_t
 	struct target *target = get_current_target(cmd->ctx);
 	struct esirisc_common *esirisc = target_to_esirisc(target);
 	struct esirisc_trace *trace_info = &esirisc->trace_info;
-	const uint32_t end_of_trace = BIT_MASK(trace_info->pc_bits) << 1;
+	const uint32_t end_of_trace = BITS_MASK(trace_info->pc_bits) << 1;
 	const uint32_t num_bits = size * 8;
 	int retval;
 

--