From d92ebb5ab43f6c6a900c6beb0bc426573058c359 Mon Sep 17 00:00:00 2001 From: Antonio Borneo Date: Fri, 6 Jan 2023 12:40:01 +0100 Subject: [PATCH] jtag: esp_usb_jtag: remove macro __packed In FreeBSB 13.0 the build fails due to redefined macro __packed. src/jtag/drivers/esp_usb_jtag.c:19:9: error: '__packed' macro redefined [-Werror,-Wmacro-redefined] #define __packed __attribute__((packed)) ^ /usr/include/sys/cdefs.h:223:9: note: previous definition is here #define __packed __attribute__((__packed__)) ^ 1 error generated. Drop the macro and align the code with the other files in OpenOCD project, where the attribute is directly applied without using a macro. Change-Id: I89ae943e77036206d40d4d54172cd4a73e76e5c5 Signed-off-by: Antonio Borneo Reported-by: Wojciech Puchar Reviewed-on: https://review.openocd.org/c/openocd/+/7435 Tested-by: jenkins Reviewed-by: Erhan Kurubas --- src/jtag/drivers/esp_usb_jtag.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/jtag/drivers/esp_usb_jtag.c b/src/jtag/drivers/esp_usb_jtag.c index 65293ee37..dd96f4b39 100644 --- a/src/jtag/drivers/esp_usb_jtag.c +++ b/src/jtag/drivers/esp_usb_jtag.c @@ -16,8 +16,6 @@ #include "bitq.h" #include "libusb_helper.h" -#define __packed __attribute__((packed)) - /* Holy Crap, it's protocol documentation, and it's even vendor-provided! @@ -110,7 +108,7 @@ descriptor. struct jtag_proto_caps_hdr { uint8_t proto_ver; /* Protocol version. Expects JTAG_PROTO_CAPS_VER for now. */ uint8_t length; /* of this plus any following descriptors */ -} __packed; +} __attribute__((packed)); /* start of the descriptor headers */ #define JTAG_BUILTIN_DESCR_START_OFF 0 /* Devices with builtin usb jtag */ @@ -133,7 +131,7 @@ of caps header to assume this. If no such caps exist, assume a minimum (in) buff struct jtag_gen_hdr { uint8_t type; uint8_t length; -} __packed; +} __attribute__((packed)); struct jtag_proto_caps_speed_apb { uint8_t type; /* Type, always JTAG_PROTO_CAPS_SPEED_APB_TYPE */ @@ -141,7 +139,7 @@ struct jtag_proto_caps_speed_apb { uint8_t apb_speed_10khz[2]; /* ABP bus speed, in 10KHz increments. Base speed is half this. */ uint8_t div_min[2]; /* minimum divisor (to base speed), inclusive */ uint8_t div_max[2]; /* maximum divisor (to base speed), inclusive */ -} __packed; +} __attribute__((packed)); #define JTAG_PROTO_CAPS_DATA_LEN 255 #define JTAG_PROTO_CAPS_SPEED_APB_TYPE 1