From 0535531d2753f1b86454bb6ffad6ffbdd56c66d0 Mon Sep 17 00:00:00 2001 From: Eric Wetzel Date: Wed, 5 Jan 2011 21:54:12 -0500 Subject: nit: more LOG_* \n fixes Remove extra \n from LOG_DEBUG, LOG_INFO, and LOG_WARNING messages Remove LOG_INFO_N LOG_INFO_N was only used once and had a \n at the end Change LOG_USER_N calls that end with \n to LOG_USER --- src/jtag/drivers/arm-jtag-ew.c | 2 +- src/jtag/drivers/ep93xx.c | 4 ++-- src/jtag/drivers/ft2232.c | 2 +- src/jtag/drivers/rlink.c | 14 +++++++------- src/jtag/drivers/usb_blaster.c | 10 +++++----- src/jtag/tcl.c | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/jtag') diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c index 61b42ce5..44eaeff1 100644 --- a/src/jtag/drivers/arm-jtag-ew.c +++ b/src/jtag/drivers/arm-jtag-ew.c @@ -440,7 +440,7 @@ 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", (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)), diff --git a/src/jtag/drivers/ep93xx.c b/src/jtag/drivers/ep93xx.c index 09312c5f..7e3b4568 100644 --- a/src/jtag/drivers/ep93xx.c +++ b/src/jtag/drivers/ep93xx.c @@ -195,8 +195,8 @@ static int ep93xx_init(void) gpio_data_register = gpio_controller + 0x08; gpio_data_direction_register = gpio_controller + 0x18; - LOG_INFO("gpio_data_register = %p\n", gpio_data_register); - LOG_INFO("gpio_data_direction_reg = %p\n", gpio_data_direction_register); + LOG_INFO("gpio_data_register = %p", gpio_data_register); + LOG_INFO("gpio_data_direction_reg = %p", gpio_data_direction_register); /* * Configure bit 0 (TDO) as an input, and bits 1-5 (TDI, TCK * TMS, TRST, SRST) as outputs. Drive TDI and TCK low, and diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c index 6449550b..54f7c260 100644 --- a/src/jtag/drivers/ft2232.c +++ b/src/jtag/drivers/ft2232.c @@ -2128,7 +2128,7 @@ static int ft2232_init_ftd2xx(uint16_t vid, uint16_t pid, int more, int* try_mor } else { /* drat, give the user a meaningfull message. * telling the use we tried *BOTH* methods. */ - LOG_WARNING("Unable to open FTDI Device tried: '%s' and '%s'\n", + LOG_WARNING("Unable to open FTDI Device tried: '%s' and '%s'", ft2232_device_desc, ft2232_device_desc_A); } diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c index 27861b3f..4b3e2ae8 100644 --- a/src/jtag/drivers/rlink.c +++ b/src/jtag/drivers/rlink.c @@ -504,7 +504,7 @@ dtc_run_download( int usb_err; int i; - LOG_DEBUG(": %d/%d\n", command_buffer_size, reply_buffer_size); + LOG_DEBUG(": %d/%d", command_buffer_size, reply_buffer_size); usb_err = usb_bulk_write( pHDev_param, @@ -1592,7 +1592,7 @@ int rlink_init(void) return ERROR_FAIL; } - LOG_DEBUG("Opened device, pHDev = %p\n", pHDev); + LOG_DEBUG("Opened device, pHDev = %p", pHDev); /* usb_set_configuration required under win32 */ usb_set_configuration(pHDev, dev->config[0].bConfigurationValue); @@ -1612,7 +1612,7 @@ int rlink_init(void) } else { - LOG_DEBUG("interface claimed!\n"); + LOG_DEBUG("interface claimed!"); break; } } while (--retries); @@ -1658,10 +1658,10 @@ int rlink_init(void) LOG_ERROR("USB read error: %s", usb_strerror()); return(ERROR_FAIL); } - LOG_DEBUG(INTERFACE_NAME" firmware version: %d.%d.%d\n", reply_buffer[0], reply_buffer[1], reply_buffer[2]); + LOG_DEBUG(INTERFACE_NAME" firmware version: %d.%d.%d", reply_buffer[0], reply_buffer[1], reply_buffer[2]); if ((reply_buffer[0] != 0) || (reply_buffer[1] != 0) || (reply_buffer[2] != 3)) { - LOG_WARNING("The rlink device is not of the version that the developers have played with. It may or may not work.\n"); + LOG_WARNING("The rlink device is not of the version that the developers have played with. It may or may not work."); } /* Probe port E for adapter presence */ @@ -1692,7 +1692,7 @@ int rlink_init(void) ); if ((reply_buffer[0] & ST7_PE_ADAPTER_SENSE_IN) != 0) { - LOG_WARNING("target detection problem\n"); + LOG_WARNING("target detection problem"); } ep1_generic_commandl( @@ -1718,7 +1718,7 @@ int rlink_init(void) if ((reply_buffer[0] & ST7_PE_ADAPTER_SENSE_IN) == 0) { - LOG_WARNING("target not plugged in\n"); + LOG_WARNING("target not plugged in"); } /* float ports A and B */ diff --git a/src/jtag/drivers/usb_blaster.c b/src/jtag/drivers/usb_blaster.c index 54ad40f0..83304932 100644 --- a/src/jtag/drivers/usb_blaster.c +++ b/src/jtag/drivers/usb_blaster.c @@ -121,7 +121,7 @@ static int usb_blaster_buf_write( DWORD dw_bytes_written; #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("usb_blaster_buf_write %02X (%d)\n", buf[0], size); + LOG_DEBUG("usb_blaster_buf_write %02X (%d)", buf[0], size); #endif status = FT_Write(ftdih, buf, size, &dw_bytes_written); if (status != FT_OK) @@ -135,7 +135,7 @@ static int usb_blaster_buf_write( #elif BUILD_USB_BLASTER_LIBFTDI == 1 int retval; #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("usb_blaster_buf_write %02X (%d)\n", buf[0], size); + LOG_DEBUG("usb_blaster_buf_write %02X (%d)", buf[0], size); #endif retval = ftdi_write_data(&ftdic, buf, size); if (retval < 0) @@ -164,7 +164,7 @@ usb_blaster_buf_read(uint8_t *buf, unsigned size, uint32_t *bytes_read) return ERROR_JTAG_DEVICE_ERROR; } #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("usb_blaster_buf_read %02X (%lu)\n", buf[0], dw_bytes_read); + LOG_DEBUG("usb_blaster_buf_read %02X (%lu)", buf[0], dw_bytes_read); #endif *bytes_read = dw_bytes_read; return ERROR_OK; @@ -188,7 +188,7 @@ usb_blaster_buf_read(uint8_t *buf, unsigned size, uint32_t *bytes_read) *bytes_read += retval; } #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("usb_blaster_buf_read %02X (%d)\n", buf[0], *bytes_read); + LOG_DEBUG("usb_blaster_buf_read %02X (%d)", buf[0], *bytes_read); #endif return ERROR_OK; #endif @@ -267,7 +267,7 @@ static int usb_blaster_read_data(void) static void usb_blaster_write(int tck, int tms, int tdi) { #ifdef _DEBUG_JTAG_IO_ - LOG_DEBUG("---- usb_blaster_write(%d,%d,%d)\n", tck, tms, tdi); + LOG_DEBUG("---- usb_blaster_write(%d,%d,%d)", tck, tms, tdi); #endif out_value &= ~(TCK | TMS | TDI); if (tck) diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index a1f4435b..3e6074b8 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -655,7 +655,7 @@ static void jtag_tap_handle_event(struct jtag_tap *tap, enum jtag_event e) if (Jim_EvalObj(jteap->interp, jteap->body) != JIM_OK) { Jim_MakeErrorMessage(jteap->interp); - LOG_USER_N("%s\n", Jim_GetString(Jim_GetResult(jteap->interp), NULL)); + LOG_USER("%s", Jim_GetString(Jim_GetResult(jteap->interp), NULL)); continue; } -- cgit v1.2.3-18-g5258