[PATCH]: bc900af0c4 bcm2835gpio.c: change adapter init order

[gerrit]

This is an automated email from Gerrit.

"R. Diez <rdiez-2...@rd10.de>" just uploaded a new patch set to Gerrit, which 
you can find at https://review.openocd.org/c/openocd/+/8536

-- gerrit

commit bc900af0c4ab0811a83425b09a7eb0b1e00d47f1
Author: R. Diez <rdiezmail-open...@yahoo.de>
Date:   Sun Nov 3 12:24:20 2024 +0100

    bcm2835gpio.c: change adapter init order
    
    Change-Id: I954014f062d6d9185db45f5fbd2ad0b0955aab82
    Signed-off-by: R. Diez <rdiezmail-open...@yahoo.de>

diff --git a/src/jtag/drivers/bcm2835gpio.c b/src/jtag/drivers/bcm2835gpio.c
index 2c2061daec..e41fe02f15 100644
--- a/src/jtag/drivers/bcm2835gpio.c
+++ b/src/jtag/drivers/bcm2835gpio.c
@@ -432,7 +432,7 @@ static struct bitbang_interface bcm2835gpio_bitbang = {
        .write = bcm2835gpio_write,
        .swdio_read = bcm2835_swdio_read,
        .swdio_drive = bcm2835_swdio_drive,
-       .swd_write = bcm2835gpio_swd_write_generic,
+       .swd_write = NULL,  // Set during initialisation if using SWD.
        .blink = bcm2835gpio_blink,
 };
 
@@ -440,7 +440,6 @@ 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()) {
@@ -539,6 +538,9 @@ LOG_INFO("pads conf set to %08x", 
pads_base[BCM2835_PADS_GPIO_0_27_OFFSET]);
        initialize_gpio(ADAPTER_GPIO_IDX_SRST);
        initialize_gpio(ADAPTER_GPIO_IDX_LED);
 
+       // Set bitbang_interface after field swd_write has been initialised.
+       bitbang_interface = &bcm2835gpio_bitbang;
+
        return ERROR_OK;
 }
 

--