[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openocd-development
Subject:    [OpenOCD-devel] [PATCH]: 55776c8 coding style: avoid unnecessary line continuations
From:       gerrit () openocd ! org (gerrit)
Date:       2020-04-27 15:59:21
Message-ID: 20200427155921.CB09C4A0AD0 () mail ! openocd ! org
[Download RAW message or body]

This is an automated email from Gerrit.

Antonio Borneo (borneo.antonio@gmail.com) just uploaded a new patch set to Gerrit, \
which you can find at http://openocd.zylin.com/5619

-- gerrit

commit 55776c8b1549d885927c7f1cf82b3cff5f886257
Author: Antonio Borneo <borneo.antonio@gmail.com>
Date:   Mon May 6 01:03:52 2019 +0200

    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>

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 73884b7..50ab207 100644
--- 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 5d8f810..90242b1 100644
--- 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 27b6d3a..cfc0492 100644
--- 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 19d754b..04ac3bb 100644
--- 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 803e84a..7a06b3d 100644
--- 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 00bfeb1..fb2053b 100644
--- 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 c81f804..d35e151 100644
--- 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 3dcadc8..80202ed 100644
--- 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 6812ef6..bb223f4 100644
--- 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 14bac2a..03d3da7 100644
--- 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 b406c03..e2556ce 100644
--- 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 fcb594f..d30483b 100644
--- 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 6517ce4..7b27eaf 100644
--- 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 497b6b9..8372970 100644
--- 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 eb43702..5fb9bcd 100644
--- 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 1fce317..7d5e6a9 100644
--- 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 9e59c41..0f18d17 100644
--- 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 6f326fe..4b2e4f5 100644
--- 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 54fc7d1..fd27417 100644
--- 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 a8c3bb4..fad8ca9 100644
--- 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 1accf6f..8e6f743 100644
--- 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 f27aba2..0cfd197 100644
--- 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 e302941..4a323e4 100644
--- 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);
 

-- 


_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic