[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1063-g9b660bbd1

[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  9b660bbd1957ffc1fd86485ceef5200f8968aeb6 (commit)
      from  df525290cb11ab40968253b7d4c5588b1aab7d82 (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 9b660bbd1957ffc1fd86485ceef5200f8968aeb6
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Jun 14 15:07:50 2025 +0200

    rtos: sort the rtos by alphabetic order
    
    Add comments to require the list of rtos to be kept sorted.
    
    Change-Id: Iecf9250a14f6593d0a24a9f9b8930c0ec8d74bd2
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8953
    Tested-by: jenkins

diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index 216129b97..2ccccf1b0 100644
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -17,20 +17,22 @@
 #include "server/gdb_server.h"
 
 static const struct rtos_type *rtos_types[] = {
-	&threadx_rtos,
-	&freertos_rtos,
-	&ecos_rtos,
-	&linux_rtos,
+	// Keep in alphabetic order this list of rtos, except hwthread
 	&chibios_rtos,
 	&chromium_ec_rtos,
+	&ecos_rtos,
 	&embkernel_rtos,
+	&freertos_rtos,
+	&linux_rtos,
 	&mqx_rtos,
-	&ucos_iii_rtos,
 	&nuttx_rtos,
 	&riot_rtos,
-	&zephyr_rtos,
 	&rtkernel_rtos,
-	/* keep this as last, as it always matches with rtos auto */
+	&threadx_rtos,
+	&ucos_iii_rtos,
+	&zephyr_rtos,
+
+	// keep this as last, as it always matches with rtos auto
 	&hwthread_rtos,
 };
 
diff --git a/src/rtos/rtos.h b/src/rtos/rtos.h
index 05beab145..dbaa7e8ce 100644
--- a/src/rtos/rtos.h
+++ b/src/rtos/rtos.h
@@ -136,6 +136,7 @@ int rtos_read_buffer(struct target *target, target_addr_t address,
 int rtos_write_buffer(struct target *target, target_addr_t address,
 		uint32_t size, const uint8_t *buffer);
 
+// Keep in alphabetic order this list of rtos
 extern const struct rtos_type chibios_rtos;
 extern const struct rtos_type chromium_ec_rtos;
 extern const struct rtos_type ecos_rtos;

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

Summary of changes:
 src/rtos/rtos.c | 16 +++++++++-------
 src/rtos/rtos.h |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository