aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2019-12-14 11:53:46 +0100
committerlaforge <laforge@osmocom.org>2019-12-14 17:26:21 +0000
commit342a7fe0398640d1e916c619d8ecdff2f7ea87b5 (patch)
tree16c542792ff5486b6dfd6414dc1b769865991941
parent3c003cc2faf56da9095f24e4f9478f73a627e2f5 (diff)
Add missing CR to achieve CRLF at end of log lines
-rw-r--r--firmware/libcommon/source/cciddriver.c4
-rw-r--r--firmware/libcommon/source/host_communication.c12
-rw-r--r--firmware/libcommon/source/simtrace_iso7816.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/firmware/libcommon/source/cciddriver.c b/firmware/libcommon/source/cciddriver.c
index 1dbdf23..dfadd6b 100644
--- a/firmware/libcommon/source/cciddriver.c
+++ b/firmware/libcommon/source/cciddriver.c
@@ -428,7 +428,7 @@ static void PCtoRDRXfrBlock( void )
uint16_t msglen = 0;
uint32_t ret;
- TRACE_DEBUG("PCtoRDRXfrBlock\n");
+ TRACE_DEBUG("PCtoRDRXfrBlock\n\r");
// Check the block length
if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) {
@@ -921,7 +921,7 @@ void USBDCallbacks_RequestReceived(const USBGenericRequest *request)
void CCID_SmartCardRequest( void )
{
unsigned char bStatus;
- TRACE_DEBUG("CCID_req\n");
+ TRACE_DEBUG("CCID_req\n\r");
do {
diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c
index c305b80..d500aed 100644
--- a/firmware/libcommon/source/host_communication.c
+++ b/firmware/libcommon/source/host_communication.c
@@ -40,10 +40,10 @@ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
local_irq_save(x);
bep->in_progress--;
local_irq_restore(x);
- TRACE_DEBUG("%u: in_progress=%lu\n", bep->ep, bep->in_progress);
+ TRACE_DEBUG("%u: in_progress=%lu\r\n", bep->ep, bep->in_progress);
if (status != USBD_STATUS_SUCCESS)
- TRACE_ERROR("%s error, status=%d\n", __func__, status);
+ TRACE_ERROR("%s error, status=%d\r\n", __func__, status);
usb_buf_free(msg);
}
@@ -86,13 +86,13 @@ int usb_refill_to_host(uint8_t ep)
rc = USBD_Write(ep, msgb_data(msg), msgb_length(msg),
(TransferCallback) &usb_write_cb, msg);
if (rc != USBD_STATUS_SUCCESS) {
- TRACE_ERROR("%s error %x\n", __func__, rc);
+ TRACE_ERROR("%s error %x\r\n", __func__, rc);
/* re-insert to head of queue */
llist_add_irqsafe(&msg->list, &bep->queue);
local_irq_save(x);
bep->in_progress--;
local_irq_restore(x);
- TRACE_DEBUG("%02x: in_progress=%lu\n", bep->ep, bep->in_progress);
+ TRACE_DEBUG("%02x: in_progress=%lu\r\n", bep->ep, bep->in_progress);
return 0;
}
@@ -112,7 +112,7 @@ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
bep->in_progress = 0;
if (status != USBD_STATUS_SUCCESS) {
- TRACE_ERROR("%s error, status=%d\n", __func__, status);
+ TRACE_ERROR("%s error, status=%d\r\n", __func__, status);
usb_buf_free(msg);
return;
}
@@ -150,7 +150,7 @@ int usb_refill_from_host(uint8_t ep)
rc = USBD_Read(ep, msg->head, msgb_tailroom(msg),
(TransferCallback) &usb_read_cb, msg);
if (rc != USBD_STATUS_SUCCESS) {
- TRACE_ERROR("%s error %d\n", __func__, rc);
+ TRACE_ERROR("%s error %d\r\n", __func__, rc);
usb_buf_free(msg);
bep->in_progress = 0;
}
diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c
index dc41c08..8742696 100644
--- a/firmware/libcommon/source/simtrace_iso7816.c
+++ b/firmware/libcommon/source/simtrace_iso7816.c
@@ -71,7 +71,7 @@ void ISR_PhoneRST(const Pin * pPin)
USBD_Write(SIMTRACE_USB_EP_PHONE_INT, "R", 1,
(TransferCallback) & Callback_PhoneRST_ISR,
0)) != USBD_STATUS_SUCCESS) {
- TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__);
+ TRACE_ERROR("USB err status: %d (%s)\r\n", ret, __FUNCTION__);
return;
}
@@ -109,7 +109,7 @@ void mode_trace_usart1_irq(void)
/* Fill char into buffer */
rbuf_write(&sim_rcv_buf, c);
} else {
- TRACE_DEBUG("e %x st: %lx\n", c, stat);
+ TRACE_DEBUG("e %x st: %lx\r\n", c, stat);
} /* else: error occurred */
char_stat = stat;