<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16572">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add missing CR to achieve CRLF at end of log lines<br><br>Change-Id: Ic4afb2981f68811fddb272e64dbddd3397a12642<br>---<br>M firmware/libcommon/source/cciddriver.c<br>M firmware/libcommon/source/host_communication.c<br>M firmware/libcommon/source/simtrace_iso7816.c<br>3 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/cciddriver.c b/firmware/libcommon/source/cciddriver.c</span><br><span>index 1dbdf23..dfadd6b 100644</span><br><span>--- a/firmware/libcommon/source/cciddriver.c</span><br><span>+++ b/firmware/libcommon/source/cciddriver.c</span><br><span>@@ -428,7 +428,7 @@</span><br><span> uint16_t msglen = 0;</span><br><span> uint32_t ret;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("PCtoRDRXfrBlock\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("PCtoRDRXfrBlock\n\r");</span><br><span> </span><br><span> // Check the block length</span><br><span> if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) {</span><br><span>@@ -921,7 +921,7 @@</span><br><span> void CCID_SmartCardRequest( void )</span><br><span> {</span><br><span> unsigned char bStatus;</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("CCID_req\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("CCID_req\n\r");</span><br><span> </span><br><span> do {</span><br><span> </span><br><span>diff --git a/firmware/libcommon/source/host_communication.c b/firmware/libcommon/source/host_communication.c</span><br><span>index c305b80..d500aed 100644</span><br><span>--- a/firmware/libcommon/source/host_communication.c</span><br><span>+++ b/firmware/libcommon/source/host_communication.c</span><br><span>@@ -40,10 +40,10 @@</span><br><span> local_irq_save(x);</span><br><span> bep->in_progress--;</span><br><span> local_irq_restore(x);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%u: in_progress=%lu\n", bep->ep, bep->in_progress);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%u: in_progress=%lu\r\n", bep->ep, bep->in_progress);</span><br><span> </span><br><span> if (status != USBD_STATUS_SUCCESS)</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_ERROR("%s error, status=%d\n", __func__, status);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("%s error, status=%d\r\n", __func__, status);</span><br><span> </span><br><span> usb_buf_free(msg);</span><br><span> }</span><br><span>@@ -86,13 +86,13 @@</span><br><span> rc = USBD_Write(ep, msgb_data(msg), msgb_length(msg),</span><br><span> (TransferCallback) &usb_write_cb, msg);</span><br><span> if (rc != USBD_STATUS_SUCCESS) {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_ERROR("%s error %x\n", __func__, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("%s error %x\r\n", __func__, rc);</span><br><span> /* re-insert to head of queue */</span><br><span> llist_add_irqsafe(&msg->list, &bep->queue);</span><br><span> local_irq_save(x);</span><br><span> bep->in_progress--;</span><br><span> local_irq_restore(x);</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("%02x: in_progress=%lu\n", bep->ep, bep->in_progress);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("%02x: in_progress=%lu\r\n", bep->ep, bep->in_progress);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -112,7 +112,7 @@</span><br><span> bep->in_progress = 0;</span><br><span> </span><br><span> if (status != USBD_STATUS_SUCCESS) {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_ERROR("%s error, status=%d\n", __func__, status);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("%s error, status=%d\r\n", __func__, status);</span><br><span> usb_buf_free(msg);</span><br><span> return;</span><br><span> }</span><br><span>@@ -150,7 +150,7 @@</span><br><span> rc = USBD_Read(ep, msg->head, msgb_tailroom(msg),</span><br><span> (TransferCallback) &usb_read_cb, msg);</span><br><span> if (rc != USBD_STATUS_SUCCESS) {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_ERROR("%s error %d\n", __func__, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("%s error %d\r\n", __func__, rc);</span><br><span> usb_buf_free(msg);</span><br><span> bep->in_progress = 0;</span><br><span> }</span><br><span>diff --git a/firmware/libcommon/source/simtrace_iso7816.c b/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>index dc41c08..8742696 100644</span><br><span>--- a/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>+++ b/firmware/libcommon/source/simtrace_iso7816.c</span><br><span>@@ -71,7 +71,7 @@</span><br><span> USBD_Write(SIMTRACE_USB_EP_PHONE_INT, "R", 1,</span><br><span> (TransferCallback) & Callback_PhoneRST_ISR,</span><br><span> 0)) != USBD_STATUS_SUCCESS) {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_ERROR("USB err status: %d (%s)\r\n", ret, __FUNCTION__);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>@@ -109,7 +109,7 @@</span><br><span> /* Fill char into buffer */</span><br><span> rbuf_write(&sim_rcv_buf, c);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_DEBUG("e %x st: %lx\n", c, stat);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG("e %x st: %lx\r\n", c, stat);</span><br><span> } /* else: error occurred */</span><br><span> </span><br><span> char_stat = stat;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16572">change 16572</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/16572"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic4afb2981f68811fddb272e64dbddd3397a12642 </div>
<div style="display:none"> Gerrit-Change-Number: 16572 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>