openocd: remove recently added CamelCase symbols

Without the help of checkpatch, some CamelCase symbol passed
through the filter of maintainer's review.

Drop them.

Change-Id: If5fb07b2ffb89e853dd2a61f20d4134aa6e20d24
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Fixes: 48f267d4adea ("flash/stm32l4x: avoid using magic numbers for device ids")
Fixes: 5ab74bde0654 ("semihosting: User defined operation, Tcl command exec on host")
Reviewed-on: https://review.openocd.org/c/openocd/+/7154
Tested-by: jenkins

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 6cb75884e7961967c154624008a78e0208c02278..a1108b5fd2a42f4b1c0802ca4dd549521333dc57 100644 (file)
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -289,7 +289,7 @@ static const struct stm32l4_rev stm32l45_l46xx_revs[] = {
        { 0x1000, "A" }, { 0x1001, "Z" }, { 0x2001, "Y" },
 };
 
-static const struct stm32l4_rev stm32l41_L42xx_revs[] = {
+static const struct stm32l4_rev stm32l41_l42xx_revs[] = {
        { 0x1000, "A" }, { 0x1001, "Z" }, { 0x2001, "Y" },
 };
 
@@ -420,8 +420,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
        },
        {
          .id                    = DEVID_STM32L41_L42XX,
-         .revs                  = stm32l41_L42xx_revs,
-         .num_revs              = ARRAY_SIZE(stm32l41_L42xx_revs),
+         .revs                  = stm32l41_l42xx_revs,
+         .num_revs              = ARRAY_SIZE(stm32l41_l42xx_revs),
          .device_str            = "STM32L41/L42xx",
          .max_flash_size_kb     = 128,
          .flags                 = F_NONE,

diff --git a/src/target/semihosting_common.c b/src/target/semihosting_common.c
index c449b0539687c45de57566487ffe9a962bdd0590..bdf29a4247183d37535a4861e290915fbeab1933 100644 (file)
--- a/src/target/semihosting_common.c
+++ b/src/target/semihosting_common.c
@@ -1417,7 +1417,7 @@ int semihosting_common(struct target *target)
                        }
                        break;
 
-               case SEMIHOSTING_USER_CMD_0x100 ... SEMIHOSTING_USER_CMD_0x107:
+               case SEMIHOSTING_USER_CMD_0X100 ... SEMIHOSTING_USER_CMD_0X107:
                        /**
                         * This is a user defined operation (while user cmds 0x100-0x1ff
                         * are possible, only 0x100-0x107 are currently implemented).

diff --git a/src/target/semihosting_common.h b/src/target/semihosting_common.h
index 8ecf2e5263ad4f669db507b9344ad2c17ad38af2..7c5f748f4336c4cfc03dd7509748f494a871eacf 100644 (file)
--- a/src/target/semihosting_common.h
+++ b/src/target/semihosting_common.h
@@ -65,9 +65,9 @@ enum semihosting_operation_numbers {
        SEMIHOSTING_SYS_WRITE = 0x05,
        SEMIHOSTING_SYS_WRITEC = 0x03,
        SEMIHOSTING_SYS_WRITE0 = 0x04,
-       SEMIHOSTING_USER_CMD_0x100 = 0x100, /* First user cmd op code */
-       SEMIHOSTING_USER_CMD_0x107 = 0x107, /* Last supported user cmd op code */
-       SEMIHOSTING_USER_CMD_0x1FF = 0x1FF, /* Last user cmd op code */
+       SEMIHOSTING_USER_CMD_0X100 = 0x100, /* First user cmd op code */
+       SEMIHOSTING_USER_CMD_0X107 = 0x107, /* Last supported user cmd op code */
+       SEMIHOSTING_USER_CMD_0X1FF = 0x1FF, /* Last user cmd op code */
 };
 
 /** Maximum allowed Tcl command segment length in bytes*/

diff --git a/src/target/target.c b/src/target/target.c
index 9b07dbf6185fc98e2b90c6c9125cb0bc11d073dd..97ea13dc23437e93cb57501c842f2909cc8eb14e 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -236,14 +236,14 @@ static const struct jim_nvp nvp_target_event[] = {
 
        { .value = TARGET_EVENT_TRACE_CONFIG, .name = "trace-config" },
 
-       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0x100, .name = "semihosting-user-cmd-0x100" },
-       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0x101, .name = "semihosting-user-cmd-0x101" },
-       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0x102, .name = "semihosting-user-cmd-0x102" },
-       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0x103, .name = "semihosting-user-cmd-0x103" },
-       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0x104, .name = "semihosting-user-cmd-0x104" },
-       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0x105, .name = "semihosting-user-cmd-0x105" },
-       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0x106, .name = "semihosting-user-cmd-0x106" },
-       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0x107, .name = "semihosting-user-cmd-0x107" },
+       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0X100, .name = "semihosting-user-cmd-0x100" },
+       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0X101, .name = "semihosting-user-cmd-0x101" },
+       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0X102, .name = "semihosting-user-cmd-0x102" },
+       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0X103, .name = "semihosting-user-cmd-0x103" },
+       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0X104, .name = "semihosting-user-cmd-0x104" },
+       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0X105, .name = "semihosting-user-cmd-0x105" },
+       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0X106, .name = "semihosting-user-cmd-0x106" },
+       { .value = TARGET_EVENT_SEMIHOSTING_USER_CMD_0X107, .name = "semihosting-user-cmd-0x107" },
 
        { .name = NULL, .value = -1 }
 };

diff --git a/src/target/target.h b/src/target/target.h
index e221351a834c9d8e0176536ce6c03254ef557352..d445c2975123e73b5132df4f77a8a887a145d38c 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -286,14 +286,14 @@ enum target_event {
 
        TARGET_EVENT_TRACE_CONFIG,
 
-       TARGET_EVENT_SEMIHOSTING_USER_CMD_0x100 = 0x100, /* semihosting allows user cmds from 0x100 to 0x1ff */
-       TARGET_EVENT_SEMIHOSTING_USER_CMD_0x101 = 0x101,
-       TARGET_EVENT_SEMIHOSTING_USER_CMD_0x102 = 0x102,
-       TARGET_EVENT_SEMIHOSTING_USER_CMD_0x103 = 0x103,
-       TARGET_EVENT_SEMIHOSTING_USER_CMD_0x104 = 0x104,
-       TARGET_EVENT_SEMIHOSTING_USER_CMD_0x105 = 0x105,
-       TARGET_EVENT_SEMIHOSTING_USER_CMD_0x106 = 0x106,
-       TARGET_EVENT_SEMIHOSTING_USER_CMD_0x107 = 0x107,
+       TARGET_EVENT_SEMIHOSTING_USER_CMD_0X100 = 0x100, /* semihosting allows user cmds from 0x100 to 0x1ff */
+       TARGET_EVENT_SEMIHOSTING_USER_CMD_0X101 = 0x101,
+       TARGET_EVENT_SEMIHOSTING_USER_CMD_0X102 = 0x102,
+       TARGET_EVENT_SEMIHOSTING_USER_CMD_0X103 = 0x103,
+       TARGET_EVENT_SEMIHOSTING_USER_CMD_0X104 = 0x104,
+       TARGET_EVENT_SEMIHOSTING_USER_CMD_0X105 = 0x105,
+       TARGET_EVENT_SEMIHOSTING_USER_CMD_0X106 = 0x106,
+       TARGET_EVENT_SEMIHOSTING_USER_CMD_0X107 = 0x107,
 };
 
 struct target_event_action {