summaryrefslogtreecommitdiff
path: root/src/jtag
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-23 22:50:08 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-23 22:50:08 +0000
commitc97caebccd07be7e5bae61d6d40921e01786ba06 (patch)
treeac6b27c4e75a0b30f2676c8ed7ca70a1048be2c4 /src/jtag
parent2e779198535580515dfa9c8bfe1f3fe08abdb84b (diff)
downloadopenocd+libswd-c97caebccd07be7e5bae61d6d40921e01786ba06.tar.gz
openocd+libswd-c97caebccd07be7e5bae61d6d40921e01786ba06.tar.bz2
openocd+libswd-c97caebccd07be7e5bae61d6d40921e01786ba06.tar.xz
openocd+libswd-c97caebccd07be7e5bae61d6d40921e01786ba06.zip
Remove whitespace at end of lines, step 2.
- Replace '\s*$' with ''. git-svn-id: svn://svn.berlios.de/openocd/trunk@2380 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
-rw-r--r--src/jtag/arm-jtag-ew.c6
-rw-r--r--src/jtag/core.c8
-rw-r--r--src/jtag/ft2232.c22
-rw-r--r--src/jtag/minidriver.h2
-rw-r--r--src/jtag/presto.c4
5 files changed, 21 insertions, 21 deletions
diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index cd13cff0..fa18ef0f 100644
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -470,13 +470,13 @@ static int armjtagew_get_status(void)
if (result == 0)
{
unsigned int u_tg = buf_get_u32(usb_in_buffer, 0, 16);
- LOG_INFO("U_tg = %d mV, U_aux = %d mV, U_tgpwr = %d mV, I_tgpwr = %d mA, D1 = %d, Target power %s %s\n",
+ LOG_INFO("U_tg = %d mV, U_aux = %d mV, U_tgpwr = %d mV, I_tgpwr = %d mA, D1 = %d, Target power %s %s\n",
(int)(buf_get_u32(usb_in_buffer + 0, 0, 16)),
(int)(buf_get_u32(usb_in_buffer + 2, 0, 16)),
(int)(buf_get_u32(usb_in_buffer + 4, 0, 16)),
(int)(buf_get_u32(usb_in_buffer + 6, 0, 16)),
- usb_in_buffer[9],
- usb_in_buffer[11] ? "OVERCURRENT" : "OK",
+ usb_in_buffer[9],
+ usb_in_buffer[11] ? "OVERCURRENT" : "OK",
usb_in_buffer[10] ? "enabled" : "disabled");
if (u_tg < 1500)
diff --git a/src/jtag/core.c b/src/jtag/core.c
index b13b4880..651e6545 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -864,10 +864,10 @@ static void jtag_examine_chain_display(enum log_levels level, const char *msg,
log_printf_lf(level, __FILE__, __LINE__, __FUNCTION__,
"JTAG tap: %s %16.16s: 0x%08x "
"(mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
- name, msg,
+ name, msg,
(unsigned int)idcode,
- (unsigned int)EXTRACT_MFG(idcode),
- (unsigned int)EXTRACT_PART(idcode),
+ (unsigned int)EXTRACT_MFG(idcode),
+ (unsigned int)EXTRACT_PART(idcode),
(unsigned int)EXTRACT_VER(idcode));
}
@@ -1111,7 +1111,7 @@ void jtag_tap_free(jtag_tap_t *tap)
{
jtag_unregister_event_callback(&jtag_reset_callback, tap);
- /// @todo is anything missing? no memory leaks please
+ /// @todo is anything missing? no memory leaks please
free((void *)tap->expected_ids);
free((void *)tap->chip);
free((void *)tap->tapname);
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index a84670bf..c870262e 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -411,8 +411,8 @@ static int ft2232_read(uint8_t* buf, uint32_t size, uint32_t* bytes_read)
if (*bytes_read < size)
{
- LOG_ERROR("couldn't read the requested number of bytes from FT2232 device (%i < %i)",
- (unsigned int)(*bytes_read),
+ LOG_ERROR("couldn't read the requested number of bytes from FT2232 device (%i < %i)",
+ (unsigned int)(*bytes_read),
(unsigned int)size);
return ERROR_JTAG_DEVICE_ERROR;
}
@@ -965,7 +965,7 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
LOG_ERROR("couldn't write MPSSE commands to FT2232");
exit(-1);
}
- LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
+ LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
ft2232_buffer_size, (int)bytes_written);
ft2232_buffer_size = 0;
@@ -1019,8 +1019,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
LOG_ERROR("couldn't write MPSSE commands to FT2232");
exit(-1);
}
- LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
- ft2232_buffer_size,
+ LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
+ ft2232_buffer_size,
(int)bytes_written);
ft2232_buffer_size = 0;
@@ -1031,8 +1031,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
LOG_ERROR("couldn't read from FT2232");
exit(-1);
}
- LOG_DEBUG("thisrun_read: %i, bytes_read: %i",
- thisrun_read,
+ LOG_DEBUG("thisrun_read: %i, bytes_read: %i",
+ thisrun_read,
(int)bytes_read);
receive_pointer += bytes_read;
}
@@ -1129,8 +1129,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
LOG_ERROR("couldn't write MPSSE commands to FT2232");
exit(-1);
}
- LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
- ft2232_buffer_size,
+ LOG_DEBUG("ft2232_buffer_size: %i, bytes_written: %i",
+ ft2232_buffer_size,
(int)bytes_written);
ft2232_buffer_size = 0;
@@ -1141,8 +1141,8 @@ static int ft2232_large_scan(scan_command_t* cmd, enum scan_type type, uint8_t*
LOG_ERROR("couldn't read from FT2232");
exit(-1);
}
- LOG_DEBUG("thisrun_read: %i, bytes_read: %i",
- thisrun_read,
+ LOG_DEBUG("thisrun_read: %i, bytes_read: %i",
+ thisrun_read,
(int)bytes_read);
receive_pointer += bytes_read;
}
diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h
index 46bd0028..07fed018 100644
--- a/src/jtag/minidriver.h
+++ b/src/jtag/minidriver.h
@@ -38,7 +38,7 @@
* - jtag_add_callback
* - jtag_add_callback4
* - interface_jtag_add_dr_out
- *
+ *
* The following core functions are declared in this file for use by
* the minidriver and do @b not need to be defined by an implementation:
* - default_interface_jtag_execute_queue()
diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 9aca9097..67b89988 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -150,7 +150,7 @@ static int presto_write(uint8_t *buf, uint32_t size)
if (ftbytes != size)
{
- LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)",
+ LOG_ERROR("couldn't write the requested number of bytes to PRESTO (%u < %u)",
(unsigned)ftbytes, (unsigned)size);
return ERROR_JTAG_DEVICE_ERROR;
}
@@ -193,7 +193,7 @@ static int presto_read(uint8_t* buf, uint32_t size)
if (ftbytes != size)
{
/* this is just a warning, there might have been timeout when detecting PRESTO, which is not fatal */
- LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)",
+ LOG_WARNING("couldn't read the requested number of bytes from PRESTO (%u < %u)",
(unsigned)ftbytes, (unsigned)size);
return ERROR_JTAG_DEVICE_ERROR;
}