[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-904-ga2d4b9b71

[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  a2d4b9b718552a4bbb88e0f210444b4f5047bc0c (commit)
      from  fdd0c2b1d370e48186329cf7b81b42fa60b0e4bc (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 a2d4b9b718552a4bbb88e0f210444b4f5047bc0c
Author: R. Diez <rdi...@ya...>
Date:   Sun Nov 3 12:24:20 2024 +0100

    bcm2835gpio.c: change adapter init order
    
    Make also sure that the struct bitbang_interface with callbacks
    that we pass to the bitbang driver is const.
    
    Change-Id: I954014f062d6d9185db45f5fbd2ad0b0955aab82
    Signed-off-by: R. Diez <rdi...@ya...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8536
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/bcm2835gpio.c b/src/jtag/drivers/bcm2835gpio.c
index 095601fa6..e8689aa03 100644
--- a/src/jtag/drivers/bcm2835gpio.c
+++ b/src/jtag/drivers/bcm2835gpio.c
@@ -427,7 +427,7 @@ static int bcm2835gpio_blink(bool on)
 	return ERROR_OK;
 }
 
-static struct bitbang_interface bcm2835gpio_bitbang = {
+static const struct bitbang_interface bcm2835gpio_bitbang_swd_write_generic = {
 	.read = bcm2835gpio_read,
 	.write = bcm2835gpio_write,
 	.swdio_read = bcm2835_swdio_read,
@@ -436,11 +436,19 @@ static struct bitbang_interface bcm2835gpio_bitbang = {
 	.blink = bcm2835gpio_blink,
 };
 
+static const struct bitbang_interface bcm2835gpio_bitbang_swd_write_fast = {
+	.read = bcm2835gpio_read,
+	.write = bcm2835gpio_write,
+	.swdio_read = bcm2835_swdio_read,
+	.swdio_drive = bcm2835_swdio_drive,
+	.swd_write = bcm2835gpio_swd_write_fast,
+	.blink = bcm2835gpio_blink,
+};
+
 static int bcm2835gpio_init(void)
 {
 	LOG_INFO("BCM2835 GPIO JTAG/SWD bitbang driver");
 
-	bitbang_interface = &bcm2835gpio_bitbang;
 	adapter_gpio_config = adapter_gpio_get_config();
 
 	if (transport_is_jtag() && !bcm2835gpio_jtag_mode_possible()) {
@@ -509,6 +517,8 @@ LOG_INFO("pads conf set to %08x", pads_base[BCM2835_PADS_GPIO_0_27_OFFSET]);
 		initialize_gpio(ADAPTER_GPIO_IDX_TRST);
 	}
 
+	const struct bitbang_interface *bcm2835gpio_bitbang = &bcm2835gpio_bitbang_swd_write_generic;
+
 	if (transport_is_swd()) {
 		/* swdio and its buffer should be initialized in the order that prevents
 		 * two outputs from being connected together. This will occur if the
@@ -529,16 +539,18 @@ LOG_INFO("pads conf set to %08x", pads_base[BCM2835_PADS_GPIO_0_27_OFFSET]);
 		if (adapter_gpio_config[ADAPTER_GPIO_IDX_SWCLK].drive == ADAPTER_GPIO_DRIVE_MODE_PUSH_PULL &&
 				adapter_gpio_config[ADAPTER_GPIO_IDX_SWDIO].drive == ADAPTER_GPIO_DRIVE_MODE_PUSH_PULL) {
 			LOG_DEBUG("BCM2835 GPIO using fast mode for SWD write");
-			bcm2835gpio_bitbang.swd_write = bcm2835gpio_swd_write_fast;
+			bcm2835gpio_bitbang = &bcm2835gpio_bitbang_swd_write_fast;
 		} else {
 			LOG_DEBUG("BCM2835 GPIO using generic mode for SWD write");
-			bcm2835gpio_bitbang.swd_write = bcm2835gpio_swd_write_generic;
+			assert(bcm2835gpio_bitbang == &bcm2835gpio_bitbang_swd_write_generic);
 		}
 	}
 
 	initialize_gpio(ADAPTER_GPIO_IDX_SRST);
 	initialize_gpio(ADAPTER_GPIO_IDX_LED);
 
+	bitbang_interface = bcm2835gpio_bitbang;
+
 	return ERROR_OK;
 }
 

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

Summary of changes:
 src/jtag/drivers/bcm2835gpio.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository