Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1062-gdf525290c
|
From: openocd-gerrit <ope...@us...> - 2025-06-29 07:32:51
|
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 df525290cb11ab40968253b7d4c5588b1aab7d82 (commit)
via cd749419caae4f083daa2e0717fb2c6747ba033a (commit)
via c92cf66c6714ebf367d1ccb1ba59010491924063 (commit)
via 5d192a9f70a706f8639721a636156547875e9fa8 (commit)
via 6ab6d3475fb3758b60ad670b1b0d2cf3b2d10768 (commit)
via fa0fa25764b4737b42fbceab9f56a467263e12b0 (commit)
from a64ae963be55a3a7e12d8f7a91c9787bf4047778 (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 df525290cb11ab40968253b7d4c5588b1aab7d82
Author: Antonio Borneo <bor...@gm...>
Date: Sat Jun 14 15:02:04 2025 +0200
target: use array size to constraint the loop
Instead of using NULL terminated arrays to determine the last
element of the array, use the size of the array.
Change-Id: I3cdc0f6aef8a5110073aeef333c439e61fc54032
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8952
Tested-by: jenkins
Reviewed-by: Brandon Martin
diff --git a/src/target/target.c b/src/target/target.c
index 8bf654a27..995adbc9d 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -110,7 +110,6 @@ static struct target_type *target_types[] = {
&testee_target,
&xscale_target,
&xtensa_chip_target,
- NULL,
};
struct target *all_targets;
@@ -5708,7 +5707,6 @@ static const struct command_registration target_instance_command_handlers[] = {
COMMAND_HANDLER(handle_target_create)
{
int retval = ERROR_OK;
- int x;
if (CMD_ARGC < 2)
return ERROR_COMMAND_SYNTAX_ERROR;
@@ -5732,15 +5730,16 @@ COMMAND_HANDLER(handle_target_create)
LOG_INFO("The selected transport took over low-level target control. The results might differ compared to plain JTAG/SWD");
}
/* now does target type exist */
- for (x = 0 ; target_types[x] ; x++) {
+ size_t x;
+ for (x = 0 ; x < ARRAY_SIZE(target_types) ; x++) {
if (strcmp(cp, target_types[x]->name) == 0) {
/* found */
break;
}
}
- if (!target_types[x]) {
+ if (x == ARRAY_SIZE(target_types)) {
char *all = NULL;
- for (x = 0 ; target_types[x] ; x++) {
+ for (x = 0 ; x < ARRAY_SIZE(target_types) ; x++) {
char *prev = all;
if (all)
all = alloc_printf("%s, %s", all, target_types[x]->name);
@@ -5942,7 +5941,7 @@ COMMAND_HANDLER(handle_target_types)
if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
- for (unsigned int x = 0; target_types[x]; x++)
+ for (size_t x = 0; x < ARRAY_SIZE(target_types); x++)
command_print(CMD, "%s", target_types[x]->name);
return ERROR_OK;
commit cd749419caae4f083daa2e0717fb2c6747ba033a
Author: Antonio Borneo <bor...@gm...>
Date: Sat Jun 14 14:51:43 2025 +0200
target: sort the targets by alphabetic order
Add comments to require the list of targets to be kept sorted.
Change-Id: Ie3d7e3f5d55a9f9214dc179c5c986b6682f59412
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8951
Tested-by: jenkins
diff --git a/src/target/target.c b/src/target/target.c
index fd0e0116b..8bf654a27 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -71,44 +71,45 @@ static int target_gdb_fileio_end_default(struct target *target, int retcode,
int fileio_errno, bool ctrl_c);
static struct target_type *target_types[] = {
+ // Keep in alphabetic order this list of targets
+ &aarch64_target,
+ &arcv2_target,
+ &arm11_target,
+ &arm720t_target,
&arm7tdmi_target,
- &arm9tdmi_target,
&arm920t_target,
- &arm720t_target,
- &arm966e_target,
- &arm946e_target,
&arm926ejs_target,
- &fa526_target,
- &feroceon_target,
- &dragonite_target,
- &xscale_target,
- &xtensa_chip_target,
- &cortexm_target,
+ &arm946e_target,
+ &arm966e_target,
+ &arm9tdmi_target,
+ &armv8r_target,
+ &avr32_ap7k_target,
+ &avr_target,
&cortexa_target,
+ &cortexm_target,
&cortexr4_target,
- &arm11_target,
- &ls1_sap_target,
- &mips_m4k_target,
- &avr_target,
+ &dragonite_target,
&dsp563xx_target,
&dsp5680xx_target,
- &testee_target,
- &avr32_ap7k_target,
- &hla_target,
- &esp32_target,
+ &esirisc_target,
&esp32s2_target,
&esp32s3_target,
+ &esp32_target,
+ &fa526_target,
+ &feroceon_target,
+ &hla_target,
+ &ls1_sap_target,
+ &mem_ap_target,
+ &mips_m4k_target,
+ &mips_mips64_target,
&or1k_target,
- &quark_x10xx_target,
&quark_d20xx_target,
- &stm8_target,
+ &quark_x10xx_target,
&riscv_target,
- &mem_ap_target,
- &esirisc_target,
- &arcv2_target,
- &aarch64_target,
- &armv8r_target,
- &mips_mips64_target,
+ &stm8_target,
+ &testee_target,
+ &xscale_target,
+ &xtensa_chip_target,
NULL,
};
diff --git a/src/target/target_type.h b/src/target/target_type.h
index 5b0dc5a6c..a146fab76 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -307,6 +307,7 @@ struct target_type {
unsigned int (*data_bits)(struct target *target);
};
+// Keep in alphabetic order this list of targets
extern struct target_type aarch64_target;
extern struct target_type arcv2_target;
extern struct target_type arm11_target;
commit c92cf66c6714ebf367d1ccb1ba59010491924063
Author: Antonio Borneo <bor...@gm...>
Date: Sat Jun 14 14:39:37 2025 +0200
jtag: interfaces: sort the drivers by alphabetic order
Add comments to require the list of drivers to be kept sorted.
While there:
- align the check on BUILD_PRESTO and BUILD_USB_BLASTER;
- fix indentation of the closing parenthesis.
Change-Id: Ic78281b1cdfb5bf72ea41427233e76516001b429
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8950
Tested-by: jenkins
diff --git a/src/jtag/interface.h b/src/jtag/interface.h
index 475dbed36..834997361 100644
--- a/src/jtag/interface.h
+++ b/src/jtag/interface.h
@@ -371,6 +371,7 @@ int adapter_config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
unsigned int traceclkin_freq, uint16_t *prescaler);
int adapter_poll_trace(uint8_t *buf, size_t *size);
+// Keep in alphabetic order this list of drivers
extern struct adapter_driver am335xgpio_adapter_driver;
extern struct adapter_driver amt_jtagaccel_adapter_driver;
extern struct adapter_driver angie_adapter_driver;
diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index e49bd9e0f..834247245 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -36,125 +36,128 @@
* drivers that were enabled by the @c configure script.
*/
struct adapter_driver *adapter_drivers[] = {
-#if BUILD_PARPORT == 1
- &parport_adapter_driver,
+ // Keep in alphabetic order this list of drivers
+
+#if BUILD_AM335XGPIO == 1
+ &am335xgpio_adapter_driver,
#endif
-#if BUILD_DUMMY == 1
- &dummy_adapter_driver,
+#if BUILD_AMTJTAGACCEL == 1
+ &amt_jtagaccel_adapter_driver,
#endif
-#if BUILD_FTDI == 1
- &ftdi_adapter_driver,
+#if BUILD_ANGIE == 1
+ &angie_adapter_driver,
#endif
-#if BUILD_USB_BLASTER || BUILD_USB_BLASTER_2 == 1
- &usb_blaster_adapter_driver,
+#if BUILD_ARMJTAGEW == 1
+ &armjtagew_adapter_driver,
#endif
-#if BUILD_ESP_USB_JTAG == 1
- &esp_usb_adapter_driver,
+#if BUILD_AT91RM9200 == 1
+ &at91rm9200_adapter_driver,
#endif
-#if BUILD_JTAG_VPI == 1
- &jtag_vpi_adapter_driver,
+#if BUILD_BCM2835GPIO == 1
+ &bcm2835gpio_adapter_driver,
#endif
-#if BUILD_VDEBUG == 1
- &vdebug_adapter_driver,
+#if BUILD_BUS_PIRATE == 1
+ &buspirate_adapter_driver,
#endif
-#if BUILD_JTAG_DPI == 1
- &jtag_dpi_adapter_driver,
+#if BUILD_CMSIS_DAP_USB == 1 || BUILD_CMSIS_DAP_HID == 1
+ &cmsis_dap_adapter_driver,
#endif
-#if BUILD_FT232R == 1
- &ft232r_adapter_driver,
+#if BUILD_DMEM == 1
+ &dmem_dap_adapter_driver,
#endif
-#if BUILD_AMTJTAGACCEL == 1
- &amt_jtagaccel_adapter_driver,
+#if BUILD_DUMMY == 1
+ &dummy_adapter_driver,
#endif
#if BUILD_EP93XX == 1
&ep93xx_adapter_driver,
#endif
-#if BUILD_AT91RM9200 == 1
- &at91rm9200_adapter_driver,
+#if BUILD_ESP_USB_JTAG == 1
+ &esp_usb_adapter_driver,
+#endif
+#if BUILD_FT232R == 1
+ &ft232r_adapter_driver,
+#endif
+#if BUILD_FTDI == 1
+ &ftdi_adapter_driver,
#endif
#if BUILD_GW16012 == 1
&gw16012_adapter_driver,
#endif
-#if BUILD_PRESTO
- &presto_adapter_driver,
-#endif
-#if BUILD_USBPROG == 1
- &usbprog_adapter_driver,
+#if BUILD_HLADAPTER == 1
+ &hl_adapter_driver,
#endif
-#if BUILD_OPENJTAG == 1
- &openjtag_adapter_driver,
+#if BUILD_IMX_GPIO == 1
+ &imx_gpio_adapter_driver,
#endif
#if BUILD_JLINK == 1
&jlink_adapter_driver,
#endif
-#if BUILD_VSLLINK == 1
- &vsllink_adapter_driver,
-#endif
-#if BUILD_RLINK == 1
- &rlink_adapter_driver,
+#if BUILD_JTAG_DPI == 1
+ &jtag_dpi_adapter_driver,
#endif
-#if BUILD_ULINK == 1
- &ulink_adapter_driver,
+#if BUILD_JTAG_VPI == 1
+ &jtag_vpi_adapter_driver,
#endif
-#if BUILD_ANGIE == 1
- &angie_adapter_driver,
+#if BUILD_KITPROG == 1
+ &kitprog_adapter_driver,
#endif
-#if BUILD_ARMJTAGEW == 1
- &armjtagew_adapter_driver,
+#if BUILD_LINUXGPIOD == 1
+ &linuxgpiod_adapter_driver,
#endif
-#if BUILD_BUS_PIRATE == 1
- &buspirate_adapter_driver,
+#if BUILD_LINUXSPIDEV == 1
+ &linuxspidev_adapter_driver,
#endif
-#if BUILD_REMOTE_BITBANG == 1
- &remote_bitbang_adapter_driver,
+#if BUILD_OPENDOUS == 1
+ &opendous_adapter_driver,
#endif
-#if BUILD_HLADAPTER == 1
- &hl_adapter_driver,
+#if BUILD_OPENJTAG == 1
+ &openjtag_adapter_driver,
#endif
#if BUILD_OSBDM == 1
&osbdm_adapter_driver,
#endif
-#if BUILD_OPENDOUS == 1
- &opendous_adapter_driver,
+#if BUILD_PARPORT == 1
+ &parport_adapter_driver,
#endif
-#if BUILD_SYSFSGPIO == 1
- &sysfsgpio_adapter_driver,
+#if BUILD_PRESTO == 1
+ &presto_adapter_driver,
#endif
-#if BUILD_LINUXGPIOD == 1
- &linuxgpiod_adapter_driver,
+#if BUILD_REMOTE_BITBANG == 1
+ &remote_bitbang_adapter_driver,
#endif
-#if BUILD_LINUXSPIDEV == 1
- &linuxspidev_adapter_driver,
+#if BUILD_RLINK == 1
+ &rlink_adapter_driver,
#endif
-#if BUILD_XLNX_PCIE_XVC == 1
- &xlnx_pcie_xvc_adapter_driver,
+#if BUILD_RSHIM == 1
+ &rshim_dap_adapter_driver,
#endif
-#if BUILD_BCM2835GPIO == 1
- &bcm2835gpio_adapter_driver,
+#if BUILD_HLADAPTER_STLINK == 1
+ &stlink_dap_adapter_driver,
#endif
-#if BUILD_CMSIS_DAP_USB == 1 || BUILD_CMSIS_DAP_HID == 1
- &cmsis_dap_adapter_driver,
+#if BUILD_SYSFSGPIO == 1
+ &sysfsgpio_adapter_driver,
#endif
-#if BUILD_KITPROG == 1
- &kitprog_adapter_driver,
+#if BUILD_ULINK == 1
+ &ulink_adapter_driver,
#endif
-#if BUILD_IMX_GPIO == 1
- &imx_gpio_adapter_driver,
+#if BUILD_USB_BLASTER == 1 || BUILD_USB_BLASTER_2 == 1
+ &usb_blaster_adapter_driver,
#endif
-#if BUILD_XDS110 == 1
- &xds110_adapter_driver,
+#if BUILD_USBPROG == 1
+ &usbprog_adapter_driver,
#endif
-#if BUILD_HLADAPTER_STLINK == 1
- &stlink_dap_adapter_driver,
+#if BUILD_VDEBUG == 1
+ &vdebug_adapter_driver,
#endif
-#if BUILD_RSHIM == 1
- &rshim_dap_adapter_driver,
+#if BUILD_VSLLINK == 1
+ &vsllink_adapter_driver,
#endif
-#if BUILD_DMEM == 1
- &dmem_dap_adapter_driver,
+#if BUILD_XDS110 == 1
+ &xds110_adapter_driver,
#endif
-#if BUILD_AM335XGPIO == 1
- &am335xgpio_adapter_driver,
+#if BUILD_XLNX_PCIE_XVC == 1
+ &xlnx_pcie_xvc_adapter_driver,
#endif
+
NULL,
- };
+};
commit 5d192a9f70a706f8639721a636156547875e9fa8
Author: Antonio Borneo <bor...@gm...>
Date: Sat Jun 14 13:58:38 2025 +0200
flash: nand: use array size to constraint the loop
Instead of using NULL terminated arrays to determine the last
element of the array, use the size of the array.
Change-Id: I532a51a223061348e57bae3bd66ee6b346c1b070
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8949
Tested-by: jenkins
Reviewed-by: Brandon Martin
diff --git a/src/flash/nand/driver.c b/src/flash/nand/driver.c
index 69b3ba961..eda033b5b 100644
--- a/src/flash/nand/driver.c
+++ b/src/flash/nand/driver.c
@@ -10,6 +10,8 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+#include <helper/types.h>
#include "core.h"
#include "driver.h"
@@ -29,12 +31,11 @@ static struct nand_flash_controller *nand_flash_controllers[] = {
&s3c2440_nand_controller,
&s3c2443_nand_controller,
&s3c6400_nand_controller,
- NULL
};
struct nand_flash_controller *nand_driver_find_by_name(const char *name)
{
- for (unsigned int i = 0; nand_flash_controllers[i]; i++) {
+ for (size_t i = 0; i < ARRAY_SIZE(nand_flash_controllers); i++) {
struct nand_flash_controller *controller = nand_flash_controllers[i];
if (strcmp(name, controller->name) == 0)
return controller;
@@ -43,7 +44,7 @@ struct nand_flash_controller *nand_driver_find_by_name(const char *name)
}
int nand_driver_walk(nand_driver_walker_t f, void *x)
{
- for (unsigned int i = 0; nand_flash_controllers[i]; i++) {
+ for (size_t i = 0; i < ARRAY_SIZE(nand_flash_controllers); i++) {
int retval = (*f)(nand_flash_controllers[i], x);
if (retval != ERROR_OK)
return retval;
commit 6ab6d3475fb3758b60ad670b1b0d2cf3b2d10768
Author: Antonio Borneo <bor...@gm...>
Date: Sat Jun 14 13:53:50 2025 +0200
flash: nand: sort the drivers by alphabetic order
Add comments to require the list of drivers to be kept sorted.
Change-Id: I21b52cc1f5e679b0ebf7797e204248507f53557b
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8948
Tested-by: jenkins
diff --git a/src/flash/nand/driver.c b/src/flash/nand/driver.c
index 5d99102c8..69b3ba961 100644
--- a/src/flash/nand/driver.c
+++ b/src/flash/nand/driver.c
@@ -14,20 +14,21 @@
#include "driver.h"
static struct nand_flash_controller *nand_flash_controllers[] = {
- &nonce_nand_controller,
+ // Keep in alphabetic order the list of drivers
+ &at91sam9_nand_controller,
&davinci_nand_controller,
+ &imx31_nand_flash_controller,
&lpc3180_nand_controller,
&lpc32xx_nand_controller,
+ &mxc_nand_flash_controller,
+ &nonce_nand_controller,
+ &nuc910_nand_controller,
&orion_nand_controller,
&s3c2410_nand_controller,
&s3c2412_nand_controller,
&s3c2440_nand_controller,
&s3c2443_nand_controller,
&s3c6400_nand_controller,
- &mxc_nand_flash_controller,
- &imx31_nand_flash_controller,
- &at91sam9_nand_controller,
- &nuc910_nand_controller,
NULL
};
diff --git a/src/flash/nand/driver.h b/src/flash/nand/driver.h
index 4e84f10fb..d26e77c75 100644
--- a/src/flash/nand/driver.h
+++ b/src/flash/nand/driver.h
@@ -89,6 +89,7 @@ typedef int (*nand_driver_walker_t)(struct nand_flash_controller *c, void *);
*/
int nand_driver_walk(nand_driver_walker_t f, void *x);
+// Keep in alphabetic order the list of drivers
extern struct nand_flash_controller at91sam9_nand_controller;
extern struct nand_flash_controller davinci_nand_controller;
extern struct nand_flash_controller imx31_nand_flash_controller;
commit fa0fa25764b4737b42fbceab9f56a467263e12b0
Author: Antonio Borneo <bor...@gm...>
Date: Sat Jun 14 14:02:25 2025 +0200
flash: nor: use array size to constraint the loop
Instead of using NULL terminated arrays to determine the last
element of the array, use the size of the array.
Change-Id: Ia3d739b0a9f201ba2e7b1d1244d60c8e5546c9c1
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8947
Reviewed-by: Brandon Martin
Tested-by: jenkins
diff --git a/src/flash/nor/drivers.c b/src/flash/nor/drivers.c
index 4f468848b..cb807ec62 100644
--- a/src/flash/nor/drivers.c
+++ b/src/flash/nor/drivers.c
@@ -7,6 +7,8 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+
+#include <helper/types.h>
#include "imp.h"
/**
@@ -89,12 +91,11 @@ static const struct flash_driver * const flash_drivers[] = {
&xcf_flash,
&xmc1xxx_flash,
&xmc4xxx_flash,
- NULL,
};
const struct flash_driver *flash_driver_find_by_name(const char *name)
{
- for (unsigned int i = 0; flash_drivers[i]; i++) {
+ for (size_t i = 0; i < ARRAY_SIZE(flash_drivers); i++) {
if (strcmp(name, flash_drivers[i]->name) == 0)
return flash_drivers[i];
}
-----------------------------------------------------------------------
Summary of changes:
src/flash/nand/driver.c | 18 +++---
src/flash/nand/driver.h | 1 +
src/flash/nor/drivers.c | 5 +-
src/jtag/interface.h | 1 +
src/jtag/interfaces.c | 153 ++++++++++++++++++++++++-----------------------
src/target/target.c | 64 ++++++++++----------
src/target/target_type.h | 1 +
7 files changed, 126 insertions(+), 117 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
