coding style: avoid unnecessary line continuations

Line continuation, adding a backslash as last char of the line, is
requested in multi-line macro definition, but is not necessary in
the rest of C code.

Remove it where present.

Identified by checkpatch script from Linux kernel v5.1 using the
command

	find src/ -type f -exec ./tools/scripts/checkpatch.pl \
	-q --types LINE_CONTINUATIONS -f {} \;

Change-Id: Id0c69e93456731717a7b290b16580e9f8ae741bc
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5619
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Tested-by: jenkins

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 73884b786893b37b3e5a9899fb99a6ae4002c078..50ab207c14d689b3556030d47c61274f05401ee1 100644 (file)
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -2895,7 +2895,7 @@ int cfi_probe(struct flash_bank *bank)
                }
                if (offset != (cfi_info->dev_size * bank->bus_width / bank->chip_width)) {
                        LOG_WARNING(
-                               "CFI size is 0x%" PRIx32 ", but total sector size is 0x%" PRIx32 "", \
+                               "CFI size is 0x%" PRIx32 ", but total sector size is 0x%" PRIx32 "",
                                (cfi_info->dev_size * bank->bus_width / bank->chip_width),
                                offset);
                }

diff --git a/src/flash/nor/fespi.c b/src/flash/nor/fespi.c
index 5d8f810ad44339fa9f5809fbd4475335f1325940..90242b1ad6a034686e15483cd2c7feec76cd438c 100644 (file)
--- a/src/flash/nor/fespi.c
+++ b/src/flash/nor/fespi.c
@@ -182,7 +182,7 @@ static int fespi_read_reg(struct flash_bank *bank, uint32_t *value, target_addr_
 }
 
 static int fespi_write_reg(struct flash_bank *bank, target_addr_t address, uint32_t value)
-{                                                              \
+{
        struct target *target = bank->target;
        struct fespi_flash_bank *fespi_info = bank->driver_priv;
 

diff --git a/src/flash/nor/kinetis_ke.c b/src/flash/nor/kinetis_ke.c
index 27b6d3a83b539dbc7c307cd52ea91b4a10403c9a..cfc04928b98a840c75e70798267d8f16aa229be6 100644 (file)
--- a/src/flash/nor/kinetis_ke.c
+++ b/src/flash/nor/kinetis_ke.c
@@ -814,7 +814,7 @@ static int kinetis_ke_protect_check(struct flash_bank *bank)
 
                kinfo->protection_size = 0;
        } else {
-               LOG_WARNING("Flash protected. FPOPEN=%i FPLDIS=%i FPHDIS=%i FPLS=%i FPHS=%i", \
+               LOG_WARNING("Flash protected. FPOPEN=%i FPLDIS=%i FPHDIS=%i FPLS=%i FPHS=%i",
                                        fpopen ? 1 : 0, fpldis ? 1 : 0, fphdis ? 1 : 0, fpls, fphs);
 
                /* Retrieve which region is protected and how much */

diff --git a/src/flash/nor/lpcspifi.c b/src/flash/nor/lpcspifi.c
index 19d754b0f22d2aacb96a2cddd83ba9f08e1aa866..04ac3bb4dcf33b18cd4c525cc84feec8cee8010a 100644 (file)
--- a/src/flash/nor/lpcspifi.c
+++ b/src/flash/nor/lpcspifi.c
@@ -177,8 +177,8 @@ static int lpcspifi_set_hw_mode(struct flash_bank *bank)
        retval = target_alloc_working_area(target, sizeof(spifi_init_code)
                + SPIFI_INIT_STACK_SIZE, &spifi_init_algorithm);
        if (retval != ERROR_OK) {
-               LOG_ERROR("Insufficient working area to initialize SPIFI "\
-                       "module. You must allocate at least %zdB of working "\
+               LOG_ERROR("Insufficient working area to initialize SPIFI "
+                       "module. You must allocate at least %zdB of working "
                        "area in order to use this driver.",
                        sizeof(spifi_init_code) + SPIFI_INIT_STACK_SIZE
                );
@@ -452,7 +452,7 @@ static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
         * it, use a bulk erase instead of going sector-by-sector. */
        if (first == 0 && last == (bank->num_sectors - 1)
                && lpcspifi_info->dev->chip_erase_cmd != lpcspifi_info->dev->erase_cmd) {
-               LOG_DEBUG("Chip supports the bulk erase command."\
+               LOG_DEBUG("Chip supports the bulk erase command."
                " Will use bulk erase instead of sector-by-sector erase.");
                retval = lpcspifi_bulk_erase(bank);
 
@@ -525,7 +525,7 @@ static int lpcspifi_erase(struct flash_bank *bank, int first, int last)
        retval = target_alloc_working_area(target, sizeof(lpcspifi_flash_erase_code),
                &erase_algorithm);
        if (retval != ERROR_OK) {
-               LOG_ERROR("Insufficient working area. You must configure a working"\
+               LOG_ERROR("Insufficient working area. You must configure a working"
                        " area of at least %zdB in order to erase SPIFI flash.",
                        sizeof(lpcspifi_flash_erase_code));
                return retval;
@@ -685,7 +685,7 @@ static int lpcspifi_write(struct flash_bank *bank, const uint8_t *buffer,
 
        if (target_alloc_working_area(target, sizeof(lpcspifi_flash_write_code),
                        &write_algorithm) != ERROR_OK) {
-               LOG_ERROR("Insufficient working area. You must configure"\
+               LOG_ERROR("Insufficient working area. You must configure"
                        " a working area > %zdB in order to write to SPIFI flash.",
                        sizeof(lpcspifi_flash_write_code));
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -707,15 +707,15 @@ static int lpcspifi_write(struct flash_bank *bank, const uint8_t *buffer,
                 * space, free the algorithm */
                target_free_working_area(target, write_algorithm);
 
-               LOG_ERROR("Insufficient working area. Please allocate at least"\
+               LOG_ERROR("Insufficient working area. Please allocate at least"
                        " %zdB of working area to enable flash writes.",
                        sizeof(lpcspifi_flash_write_code) + 1
                );
 
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        } else if (fifo_size < page_size)
-               LOG_WARNING("Working area size is limited; flash writes may be"\
-                       " slow. Increase working area size to at least %zdB"\
+               LOG_WARNING("Working area size is limited; flash writes may be"
+                       " slow. Increase working area size to at least %zdB"
                        " to reduce write times.",
                        (size_t)(sizeof(lpcspifi_flash_write_code) + page_size)
                );

diff --git a/src/flash/nor/mrvlqspi.c b/src/flash/nor/mrvlqspi.c
index 803e84a91600554ddd3d6cbb572e99e6aee70b17..7a06b3d09d6755192acd312cc2e9737fb8931d44 100644 (file)
--- a/src/flash/nor/mrvlqspi.c
+++ b/src/flash/nor/mrvlqspi.c
@@ -563,7 +563,7 @@ static int mrvlqspi_flash_erase(struct flash_bank *bank, int first, int last)
        if (first == 0 && last == (bank->num_sectors - 1)
                && mrvlqspi_info->dev->chip_erase_cmd !=
                                        mrvlqspi_info->dev->erase_cmd) {
-               LOG_DEBUG("Chip supports the bulk erase command."\
+               LOG_DEBUG("Chip supports the bulk erase command."
                " Will use bulk erase instead of sector-by-sector erase.");
                retval = mrvlqspi_bulk_erase(bank);
                if (retval == ERROR_OK) {
@@ -681,7 +681,7 @@ static int mrvlqspi_flash_write(struct flash_bank *bank, const uint8_t *buffer,
 
        if (target_alloc_working_area(target, sizeof(mrvlqspi_flash_write_code),
                        &write_algorithm) != ERROR_OK) {
-               LOG_ERROR("Insufficient working area. You must configure"\
+               LOG_ERROR("Insufficient working area. You must configure"
                        " a working area > %zdB in order to write to SPIFI flash.",
                        sizeof(mrvlqspi_flash_write_code));
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -703,15 +703,15 @@ static int mrvlqspi_flash_write(struct flash_bank *bank, const uint8_t *buffer,
                 * space, free the algorithm */
                target_free_working_area(target, write_algorithm);
 
-               LOG_ERROR("Insufficient working area. Please allocate at least"\
+               LOG_ERROR("Insufficient working area. Please allocate at least"
                        " %zdB of working area to enable flash writes.",
                        sizeof(mrvlqspi_flash_write_code) + 1
                );
 
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        } else if (fifo_size < page_size)
-               LOG_WARNING("Working area size is limited; flash writes may be"\
-                       " slow. Increase working area size to at least %zdB"\
+               LOG_WARNING("Working area size is limited; flash writes may be"
+                       " slow. Increase working area size to at least %zdB"
                        " to reduce write times.",
                        (size_t)(sizeof(mrvlqspi_flash_write_code) + page_size)
                );

diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 00bfeb18ebc3b70701709782f1e0745bc976fd58..fb2053b89c61b580494f4ed504681e0f605d9bfd 100644 (file)
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -1028,7 +1028,7 @@ COMMAND_HANDLER(handle_flash_padded_value_command)
 
        COMMAND_PARSE_NUMBER(u8, CMD_ARGV[1], p->default_padded_value);
 
-       command_print(CMD, "Default padded value set to 0x%" PRIx8 " for flash bank %u", \
+       command_print(CMD, "Default padded value set to 0x%" PRIx8 " for flash bank %u",
                        p->default_padded_value, p->bank_number);
 
        return retval;

diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index c81f8043b23bb61f15990cb672d8003fdb5bba40..d35e15128df25991e39b332d0293372eee7261f7 100644 (file)
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -107,7 +107,7 @@ static int armjtagew_execute_queue(void)
                switch (cmd->type) {
                        case JTAG_RUNTEST:
                                LOG_DEBUG_IO("runtest %i cycles, end in %i",
-                                               cmd->cmd.runtest->num_cycles, \
+                                               cmd->cmd.runtest->num_cycles,
                                                cmd->cmd.runtest->end_state);
 
                                armjtagew_end_state(cmd->cmd.runtest->end_state);
@@ -122,8 +122,8 @@ static int armjtagew_execute_queue(void)
                                break;
 
                        case JTAG_PATHMOVE:
-                               LOG_DEBUG_IO("pathmove: %i states, end in %i", \
-                                               cmd->cmd.pathmove->num_states, \
+                               LOG_DEBUG_IO("pathmove: %i states, end in %i",
+                                               cmd->cmd.pathmove->num_states,
                                                cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
 
                                armjtagew_path_move(cmd->cmd.pathmove->num_states,
@@ -459,10 +459,10 @@ static int armjtagew_get_version_info(void)
        auxinfo[256] = '\0';
 
        LOG_INFO(
-               "ARM-JTAG-EW firmware version %d.%d, hardware revision %c, SN=%s, Additional info: %s", \
+               "ARM-JTAG-EW firmware version %d.%d, hardware revision %c, SN=%s, Additional info: %s",
                usb_in_buffer[1],
-               usb_in_buffer[0], \
-               isgraph(usb_in_buffer[2]) ? usb_in_buffer[2] : 'X', \
+               usb_in_buffer[0],
+               isgraph(usb_in_buffer[2]) ? usb_in_buffer[2] : 'X',
                sn,
                auxinfo);
 
@@ -750,7 +750,7 @@ static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
                return -1;
        }
 
-       result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT, \
+       result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT,
                        (char *)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT);
 
        LOG_DEBUG_IO("armjtagew_usb_write, out_length = %d, result = %d", out_length, result);
@@ -764,7 +764,7 @@ static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
 /* Read data from USB into in_buffer. */
 static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
 {
-       int result = usb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN, \
+       int result = usb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN,
                        (char *)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT);
 
        LOG_DEBUG_IO("armjtagew_usb_read, result = %d", result);

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 3dcadc81361d718d65bd34677e8a63dfbdbf7bb1..80202ed29cb0bf861148929fab7c4096e7ff9bce 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -1525,7 +1525,7 @@ COMMAND_HANDLER(jlink_handle_config_mac_address_command)
        } else if (CMD_ARGC == 1) {
                str = CMD_ARGV[0];
 
-               if ((strlen(str) != 17) || (str[2] != ':' || str[5] != ':' || \
+               if ((strlen(str) != 17) || (str[2] != ':' || str[5] != ':' ||
                                str[8] != ':' || str[11] != ':' || str[14] != ':')) {
                        command_print(CMD, "Invalid MAC address format.");
                        return ERROR_COMMAND_SYNTAX_ERROR;

diff --git a/src/jtag/drivers/opendous.c b/src/jtag/drivers/opendous.c
index 6812ef6492f43ed414276ba39d1d14ec067612ea..bb223f417ed7a82ed1b2ecdf69aa2d37862e6e4f 100644 (file)
--- a/src/jtag/drivers/opendous.c
+++ b/src/jtag/drivers/opendous.c
@@ -259,7 +259,7 @@ static int opendous_execute_queue(void)
        while (cmd != NULL) {
                switch (cmd->type) {
                        case JTAG_RUNTEST:
-                               LOG_DEBUG_IO("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles, \
+                               LOG_DEBUG_IO("runtest %i cycles, end in %i", cmd->cmd.runtest->num_cycles,
                                        cmd->cmd.runtest->end_state);
 
                                if (cmd->cmd.runtest->end_state != -1)
@@ -276,8 +276,8 @@ static int opendous_execute_queue(void)
                                break;
 
                        case JTAG_PATHMOVE:
-                               LOG_DEBUG_IO("pathmove: %i states, end in %i", \
-                                       cmd->cmd.pathmove->num_states, \
+                               LOG_DEBUG_IO("pathmove: %i states, end in %i",
+                                       cmd->cmd.pathmove->num_states,
                                        cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
 
                                opendous_path_move(cmd->cmd.pathmove->num_states, cmd->cmd.pathmove->path);
@@ -770,7 +770,7 @@ int opendous_usb_write(struct opendous_jtag *opendous_jtag, int out_length)
                        LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_OUT,
                        FUNC_WRITE_DATA, 0, 0, (char *) usb_out_buffer, out_length, OPENDOUS_USB_TIMEOUT);
        } else {
-               jtag_libusb_bulk_write(opendous_jtag->usb_handle, OPENDOUS_WRITE_ENDPOINT, \
+               jtag_libusb_bulk_write(opendous_jtag->usb_handle, OPENDOUS_WRITE_ENDPOINT,
                        (char *)usb_out_buffer, out_length, OPENDOUS_USB_TIMEOUT, &result);
        }
 #ifdef _DEBUG_USB_COMMS_

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 14bac2a2f4304924399170a113e0c2672a8e8143..03d3da7bb7ecf542648ae22b4cbbca70252eb5f6 100644 (file)
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -2319,7 +2319,7 @@ static int stlink_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
 
        while (count) {
 
-               bytes_remaining = (size != 1) ? \
+               bytes_remaining = (size != 1) ?
                                stlink_max_block_size(h->max_mem_packet, addr) : stlink_usb_block(h);
 
                if (count < bytes_remaining)
@@ -2404,7 +2404,7 @@ static int stlink_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
 
        while (count) {
 
-               bytes_remaining = (size != 1) ? \
+               bytes_remaining = (size != 1) ?
                                stlink_max_block_size(h->max_mem_packet, addr) : stlink_usb_block(h);
 
                if (count < bytes_remaining)
@@ -2528,7 +2528,7 @@ static int stlink_match_speed_map(const struct speed_map *map, unsigned int map_
                match = false;
 
        if (!match && query) {
-               LOG_INFO("Unable to match requested speed %d kHz, using %d kHz", \
+               LOG_INFO("Unable to match requested speed %d kHz, using %d kHz",
                                khz, map[speed_index].speed);
        }
 

diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
index b406c0321beee962601c94c14057f580e62cfda5..e2556cec079320b9c9076f9b0b03f430f6d8409e 100644 (file)
--- a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
+++ b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
@@ -45,7 +45,7 @@ static int ublast2_libusb_read(struct ublast_lowlevel *low, uint8_t *buf,
        int ret, tmp = 0;
 
        ret = jtag_libusb_bulk_read(low->libusb_dev,
-                                           USBBLASTER_EPIN | \
+                                           USBBLASTER_EPIN |
                                            LIBUSB_ENDPOINT_IN,
                                            (char *)buf,
                                            size,
@@ -61,7 +61,7 @@ static int ublast2_libusb_write(struct ublast_lowlevel *low, uint8_t *buf,
        int ret, tmp = 0;
 
        ret = jtag_libusb_bulk_write(low->libusb_dev,
-                                               USBBLASTER_EPOUT | \
+                                               USBBLASTER_EPOUT |
                                                LIBUSB_ENDPOINT_OUT,
                                                (char *)buf,
                                                size,
@@ -106,7 +106,7 @@ static int ublast2_write_firmware_section(struct libusb_device_handle *libusb_de
                        chunk_size = bytes_remaining;
 
                jtag_libusb_control_transfer(libusb_dev,
-                                            LIBUSB_REQUEST_TYPE_VENDOR | \
+                                            LIBUSB_REQUEST_TYPE_VENDOR |
                                             LIBUSB_ENDPOINT_OUT,
                                             USBBLASTER_CTRL_LOAD_FIRM,
                                             addr,
@@ -152,7 +152,7 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 
        char value = CPU_RESET;
        jtag_libusb_control_transfer(libusb_dev,
-                                    LIBUSB_REQUEST_TYPE_VENDOR | \
+                                    LIBUSB_REQUEST_TYPE_VENDOR |
                                     LIBUSB_ENDPOINT_OUT,
                                     USBBLASTER_CTRL_LOAD_FIRM,
                                     EZUSB_CPUCS,
@@ -173,7 +173,7 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 
        value = !CPU_RESET;
        jtag_libusb_control_transfer(libusb_dev,
-                                    LIBUSB_REQUEST_TYPE_VENDOR | \
+                                    LIBUSB_REQUEST_TYPE_VENDOR |
                                     LIBUSB_ENDPOINT_OUT,
                                     USBBLASTER_CTRL_LOAD_FIRM,
                                     EZUSB_CPUCS,
@@ -230,7 +230,7 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
 
        char buffer[5];
        jtag_libusb_control_transfer(low->libusb_dev,
-                                    LIBUSB_REQUEST_TYPE_VENDOR | \
+                                    LIBUSB_REQUEST_TYPE_VENDOR |
                                     LIBUSB_ENDPOINT_IN,
                                     USBBLASTER_CTRL_READ_REV,
                                     0,

diff --git a/src/jtag/drivers/usb_blaster/usb_blaster.c b/src/jtag/drivers/usb_blaster/usb_blaster.c
index fcb594f30b900789f2cb5210404c1067fa336257..d30483b630bd1c7f17c041c1ed33bc229bfab259 100644 (file)
--- a/src/jtag/drivers/usb_blaster/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster/usb_blaster.c
@@ -1042,8 +1042,8 @@ static const struct command_registration ublast_command_handlers[] = {
                .name = "usb_blaster_vid_pid",
                .handler = ublast_handle_vid_pid_command,
                .mode = COMMAND_CONFIG,
-               .help = "the vendor ID and product ID of the USB-Blaster and " \
-                       "vendor ID and product ID of the uninitialized device " \
+               .help = "the vendor ID and product ID of the USB-Blaster and "
+                       "vendor ID and product ID of the uninitialized device "
                        "for USB-Blaster II",
                .usage = "vid pid vid_uninit pid_uninit",
        },

diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index 6517ce4ad190c70a75781cebb7a7cf920c7d3d66..7b27eaff2e6326e24736e6c5e4368a15f6474347 100644 (file)
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -381,7 +381,7 @@ static void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag)
 static unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen)
 {
        int res = usb_bulk_write(usbprog_jtag->usb_handle, 3, msg, msglen, 100);
-       if ((msg[0] == 2) || (msg[0] == 1) || (msg[0] == 4) || (msg[0] == 0) || \
+       if ((msg[0] == 2) || (msg[0] == 1) || (msg[0] == 4) || (msg[0] == 0) ||
            (msg[0] == 6) || (msg[0] == 0x0A) || (msg[0] == 9))
                return 1;
        if (res == msglen) {

diff --git a/src/jtag/drivers/versaloon/versaloon_internal.h b/src/jtag/drivers/versaloon/versaloon_internal.h
index 497b6b9ce5b2ee08e067ebe2cb5ef3d54c0ba84c..8372970b1dda5147fb5ac5f1ab1990aa71919c9b 100644 (file)
--- a/src/jtag/drivers/versaloon/versaloon_internal.h
+++ b/src/jtag/drivers/versaloon/versaloon_internal.h
@@ -91,7 +91,7 @@ struct versaloon_pending_t {
        void *extra_data;
        versaloon_callback_t callback;
 };
-extern struct versaloon_pending_t \
+extern struct versaloon_pending_t
        versaloon_pending[VERSALOON_MAX_PENDING_NUMBER];
 extern uint16_t versaloon_pending_idx;
 void versaloon_set_pending_id(uint32_t id);

diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index eb43702339c0953f8c45ec5a344f7850b24748ed..5fb9bcdcc9e69adc3aa87d144e71f78ac452b1a2 100644 (file)
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -292,7 +292,7 @@ static int vsllink_interface_init(void)
        libusb_init(&vsllink_handle->libusb_ctx);
 
        if (ERROR_OK != vsllink_usb_open(vsllink_handle)) {
-               LOG_ERROR("Can't find USB JTAG Interface!" \
+               LOG_ERROR("Can't find USB JTAG Interface!"
                        "Please check connection and permissions.");
                return ERROR_JTAG_INIT_FAILED;
        }

diff --git a/src/jtag/minidummy/minidummy.c b/src/jtag/minidummy/minidummy.c
index 1fce317f08f14a5feff7a99ae0130e414c130c19..7d5e6a98a646a11b4000c7ec63a0cb7d0b8df3b1 100644 (file)
--- a/src/jtag/minidummy/minidummy.c
+++ b/src/jtag/minidummy/minidummy.c
@@ -170,7 +170,7 @@ void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, const uint8_t *bu
 int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap, uint32_t opcode,
                uint32_t *data, size_t count)
 {
-       int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap, \
+       int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
                        uint32_t opcode, uint32_t *data, size_t count);
        return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
 }

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index 9e59c41a52372843349ba238f83d7cdf3c2a88ad..0f18d171ce6b12ad2794c3b00acad4ba9268c3ae 100644 (file)
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -1379,8 +1379,8 @@ static int linux_thread_packet(struct connection *connection, char const *packet
                                                 target->rtos->
                                                 current_threadid)
                                && (target->rtos->current_threadid != -1))
-                                       LOG_WARNING("WARNING! current GDB thread do not match" \
-                                                       "current thread running." \
+                                       LOG_WARNING("WARNING! current GDB thread do not match"
+                                                       "current thread running."
                                                        "Switch thread in GDB to threadid %d",
                                                        (int)ct->threadid);
 

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index f9fe4c293d49aa879b9015930d20777ef86a65a5..6a9e261cd8aade3c155a4dd6a9ce40d5bee7f0c0 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1004,7 +1004,7 @@ static int gdb_new_connection(struct connection *connection)
                                continue;
                        retval = get_flash_bank_by_num(i, &p);
                        if (retval != ERROR_OK) {
-                               LOG_ERROR("Connect failed. Consider setting up a gdb-attach event for the target " \
+                               LOG_ERROR("Connect failed. Consider setting up a gdb-attach event for the target "
                                                "to prepare target for GDB connect, or use 'gdb_memory_map disable'.");
                                return retval;
                        }
@@ -2857,7 +2857,7 @@ static bool gdb_handle_vcont_packet(struct connection *connection, const char *p
                        if (gdb_connection->sync) {
                                gdb_connection->sync = false;
                                if (ct->state == TARGET_HALTED) {
-                                       LOG_DEBUG("stepi ignored. GDB will now fetch the register state " \
+                                       LOG_DEBUG("stepi ignored. GDB will now fetch the register state "
                                                                        "from the target.");
                                        gdb_sig_halted(connection);
                                        log_remove_callback(gdb_log_callback, connection);
@@ -3330,7 +3330,7 @@ static int gdb_input_inner(struct connection *connection)
                                                                "Waiting for target to halt.");
                                                already_running = true;
                                        } else if (target->state != TARGET_HALTED) {
-                                               LOG_WARNING("The target is not in the halted nor running stated, " \
+                                               LOG_WARNING("The target is not in the halted nor running stated, "
                                                                "stepi/continue ignored.");
                                                nostep = true;
                                        } else if ((packet[0] == 's') && gdb_con->sync) {
@@ -3339,7 +3339,7 @@ static int gdb_input_inner(struct connection *connection)
                                                 * make only the single stepping have the sync feature...
                                                 */
                                                nostep = true;
-                                               LOG_DEBUG("stepi ignored. GDB will now fetch the register state " \
+                                               LOG_DEBUG("stepi ignored. GDB will now fetch the register state "
                                                                "from the target.");
                                        }
                                        gdb_con->sync = false;

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 54fc7d1399cb318b2d9752ac0bdf22ffe18ca1a8..fd27417e085d3868b36d64e5b146674b931c4ba2 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -1540,8 +1540,8 @@ XXR_common:
 
        if (debug_level >= LOG_LVL_DEBUG) {
                /* for convenient debugging, execute tap if possible */
-               if ((svf_buffer_index > 0) && \
-                               (((command != STATE) && (command != RUNTEST)) || \
+               if ((svf_buffer_index > 0) &&
+                               (((command != STATE) && (command != RUNTEST)) ||
                                                ((command == STATE) && (num_of_argu == 2)))) {
                        if (ERROR_OK != svf_execute_tap())
                                return ERROR_FAIL;
@@ -1555,8 +1555,8 @@ XXR_common:
                /* for fast executing, execute tap if necessary */
                /* half of the buffer is for the next command */
                if (((svf_buffer_index >= SVF_MAX_BUFFER_SIZE_TO_COMMIT) ||
-                               (svf_check_tdo_para_index >= SVF_CHECK_TDO_PARA_SIZE / 2)) && \
-                               (((command != STATE) && (command != RUNTEST)) || \
+                               (svf_check_tdo_para_index >= SVF_CHECK_TDO_PARA_SIZE / 2)) &&
+                               (((command != STATE) && (command != RUNTEST)) ||
                                                ((command == STATE) && (num_of_argu == 2))))
                        return svf_execute_tap();
        }

diff --git a/src/target/arc_cmd.c b/src/target/arc_cmd.c
index a8c3bb43a713a5bd87c71ff6daae190ed8dd3e01..fad8ca947337a38fba600da073c9fe7d42ce21ec 100644 (file)
--- a/src/target/arc_cmd.c
+++ b/src/target/arc_cmd.c
@@ -383,7 +383,7 @@ static int jim_arc_get_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a
        /* Register number */
        JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &regnum));
        if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) {
-               Jim_SetResultFormatted(goi.interp, "Core register number %i " \
+               Jim_SetResultFormatted(goi.interp, "Core register number %i "
                        "is invalid. Must less then 64 and not 61 and 62.", regnum);
                return JIM_ERR;
        }
@@ -426,7 +426,7 @@ static int jim_arc_set_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a
        /* Register number */
        JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &regnum));
        if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) {
-               Jim_SetResultFormatted(goi.interp, "Core register number %i " \
+               Jim_SetResultFormatted(goi.interp, "Core register number %i "
                        "is invalid. Must less then 64 and not 61 and 62.", regnum);
                return JIM_ERR;
        }
@@ -447,9 +447,9 @@ static const struct command_registration arc_jtag_command_group[] = {
                .name = "get-aux-reg",
                .jim_handler = jim_arc_get_aux_reg,
                .mode = COMMAND_EXEC,
-               .help = "Get AUX register by number. This command does a " \
-                       "raw JTAG request that bypasses OpenOCD register cache "\
-                       "and thus is unsafe and can have unexpected consequences. "\
+               .help = "Get AUX register by number. This command does a "
+                       "raw JTAG request that bypasses OpenOCD register cache "
+                       "and thus is unsafe and can have unexpected consequences. "
                        "Use at your own risk.",
                .usage = "arc jtag get-aux-reg <regnum>"
        },
@@ -457,9 +457,9 @@ static const struct command_registration arc_jtag_command_group[] = {
                .name = "set-aux-reg",
                .jim_handler = jim_arc_set_aux_reg,
                .mode = COMMAND_EXEC,
-               .help = "Set AUX register by number. This command does a " \
-                       "raw JTAG request that bypasses OpenOCD register cache "\
-                       "and thus is unsafe and can have unexpected consequences. "\
+               .help = "Set AUX register by number. This command does a "
+                       "raw JTAG request that bypasses OpenOCD register cache "
+                       "and thus is unsafe and can have unexpected consequences. "
                        "Use at your own risk.",
                .usage = "arc jtag set-aux-reg <regnum> <value>"
        },
@@ -467,9 +467,9 @@ static const struct command_registration arc_jtag_command_group[] = {
                .name = "get-core-reg",
                .jim_handler = jim_arc_get_core_reg,
                .mode = COMMAND_EXEC,
-               .help = "Get/Set core register by number. This command does a " \
-                       "raw JTAG request that bypasses OpenOCD register cache "\
-                       "and thus is unsafe and can have unexpected consequences. "\
+               .help = "Get/Set core register by number. This command does a "
+                       "raw JTAG request that bypasses OpenOCD register cache "
+                       "and thus is unsafe and can have unexpected consequences. "
                        "Use at your own risk.",
                .usage = "arc jtag get-core-reg <regnum> [<value>]"
        },
@@ -477,9 +477,9 @@ static const struct command_registration arc_jtag_command_group[] = {
                .name = "set-core-reg",
                .jim_handler = jim_arc_set_core_reg,
                .mode = COMMAND_EXEC,
-               .help = "Get/Set core register by number. This command does a " \
-                       "raw JTAG request that bypasses OpenOCD register cache "\
-                       "and thus is unsafe and can have unexpected consequences. "\
+               .help = "Get/Set core register by number. This command does a "
+                       "raw JTAG request that bypasses OpenOCD register cache "
+                       "and thus is unsafe and can have unexpected consequences. "
                        "Use at your own risk.",
                .usage = "arc jtag set-core-reg <regnum> [<value>]"
        },

diff --git a/src/target/nds32_cmd.c b/src/target/nds32_cmd.c
index 88d8b45124225c5bed1037d5fe99922663e018d1..7bf7e60c760279b5241d5a676f37fc26f1b07d64 100644 (file)
--- a/src/target/nds32_cmd.c
+++ b/src/target/nds32_cmd.c
@@ -1007,7 +1007,7 @@ static const struct command_registration nds32_exec_command_handlers[] = {
                .handler = handle_nds32_global_stop_command,
                .mode = COMMAND_ANY,
                .usage = "['on'|'off']",
-               .help = "turn on/off global stop. After turning on, every load/store" \
+               .help = "turn on/off global stop. After turning on, every load/store"
                         "instructions will be stopped to check memory access.",
        },
        {
@@ -1015,7 +1015,7 @@ static const struct command_registration nds32_exec_command_handlers[] = {
                .handler = handle_nds32_soft_reset_halt_command,
                .mode = COMMAND_ANY,
                .usage = "['on'|'off']",
-               .help = "as issuing rest-halt, to use soft-reset-halt or not." \
+               .help = "as issuing rest-halt, to use soft-reset-halt or not."
                         "the feature is for backward-compatible.",
        },
        {

diff --git a/src/target/nds32_disassembler.c b/src/target/nds32_disassembler.c
index f27aba2ccaab88ab5593fcf7423b89a628872747..0cfd197d2991ce494be7356985f207c48c6f3f43 100644 (file)
--- a/src/target/nds32_disassembler.c
+++ b/src/target/nds32_disassembler.c
@@ -493,7 +493,7 @@ static int nds32_parse_mem(struct nds32 *nds32, uint32_t opcode, uint32_t addres
                        switch (sub_opcode & 0x7) {
                                case 0: /* LB */
                                        nds32_parse_type_3(opcode, &(instruction->info.rt),
-                                                       &(instruction->info.ra), \
+                                                       &(instruction->info.ra),
                                                        &(instruction->info.rb), &(instruction->info.imm));
                                        instruction->type = NDS32_INSN_LOAD_STORE;
                                        nds32_get_mapped_reg(nds32, instruction->info.ra, &val_ra);

diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index e30294114b3413035737479bf979d422c0652411..4a323e4eef766e7176c271efd9c5b1a10fd32901 100644 (file)
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -3712,13 +3712,13 @@ int riscv013_test_compliance(struct target *target)
        But at any rate, this is not legal and should cause an error. */
        COMPLIANCE_WRITE(target, DMI_COMMAND, 0xAAAAAAAA);
        COMPLIANCE_READ(target, &testvar_read, DMI_ABSTRACTCS);
-       COMPLIANCE_TEST(get_field(testvar_read, DMI_ABSTRACTCS_CMDERR) == CMDERR_NOT_SUPPORTED, \
+       COMPLIANCE_TEST(get_field(testvar_read, DMI_ABSTRACTCS_CMDERR) == CMDERR_NOT_SUPPORTED,
                        "Illegal COMMAND should result in UNSUPPORTED");
        COMPLIANCE_WRITE(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);
 
        COMPLIANCE_WRITE(target, DMI_COMMAND, 0x55555555);
        COMPLIANCE_READ(target, &testvar_read, DMI_ABSTRACTCS);
-       COMPLIANCE_TEST(get_field(testvar_read, DMI_ABSTRACTCS_CMDERR) == CMDERR_NOT_SUPPORTED, \
+       COMPLIANCE_TEST(get_field(testvar_read, DMI_ABSTRACTCS_CMDERR) == CMDERR_NOT_SUPPORTED,
                        "Illegal COMMAND should result in UNSUPPORTED");
        COMPLIANCE_WRITE(target, DMI_ABSTRACTCS, DMI_ABSTRACTCS_CMDERR);