auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm2835gpio.c: change adapter init order

Browse Source 
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 <rdiezmail-openocd@yahoo.de>
Reviewed-on: https://review.openocd.org/c/openocd/+/8536
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
R. Diez
2024-11-03 12:24:20 +01:00
committed by Antonio Borneo
parent fdd0c2b1d3
commit a2d4b9b718
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/jtag/drivers/bcm2835gpio.c
+16 -4
View File
@@ -427,7 +427,7 @@ static int bcm2835gpio_blink(bool on)
return ERROR_OK; return ERROR_OK;
} }
static struct bitbang_interface bcm2835gpio_bitbang = { static const struct bitbang_interface bcm2835gpio_bitbang_swd_write_generic = {
.read = bcm2835gpio_read, .read = bcm2835gpio_read,
.write = bcm2835gpio_write, .write = bcm2835gpio_write,
.swdio_read = bcm2835_swdio_read, .swdio_read = bcm2835_swdio_read,
@@ -436,11 +436,19 @@ static struct bitbang_interface bcm2835gpio_bitbang = {
.blink = bcm2835gpio_blink, .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) static int bcm2835gpio_init(void)
{ {
LOG_INFO("BCM2835 GPIO JTAG/SWD bitbang driver"); LOG_INFO("BCM2835 GPIO JTAG/SWD bitbang driver");
bitbang_interface = &bcm2835gpio_bitbang;
adapter_gpio_config = adapter_gpio_get_config(); adapter_gpio_config = adapter_gpio_get_config();
if (transport_is_jtag() && !bcm2835gpio_jtag_mode_possible()) { 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); initialize_gpio(ADAPTER_GPIO_IDX_TRST);
} }
const struct bitbang_interface *bcm2835gpio_bitbang = &bcm2835gpio_bitbang_swd_write_generic;
if (transport_is_swd()) { if (transport_is_swd()) {
/* swdio and its buffer should be initialized in the order that prevents /* swdio and its buffer should be initialized in the order that prevents
* two outputs from being connected together. This will occur if the * 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 && 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) { adapter_gpio_config[ADAPTER_GPIO_IDX_SWDIO].drive == ADAPTER_GPIO_DRIVE_MODE_PUSH_PULL) {
LOG_DEBUG("BCM2835 GPIO using fast mode for SWD write"); 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 { } else {
LOG_DEBUG("BCM2835 GPIO using generic mode for SWD write"); 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_SRST);
initialize_gpio(ADAPTER_GPIO_IDX_LED); initialize_gpio(ADAPTER_GPIO_IDX_LED);
bitbang_interface = bcm2835gpio_bitbang;
return ERROR_OK; return ERROR_OK;
} }