catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-16 21:28:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add missing CR to achieve CRLF at end of log lines

Browse Source 
Change-Id: Ic4afb2981f68811fddb272e64dbddd3397a12642
This commit is contained in:
Harald Welte
2019-12-14 11:53:46 +01:00
committed by laforge
parent 3c003cc2fa
commit 342a7fe039
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/libcommon/source/cciddriver.c
View File

@@ -428,7 +428,7 @@ static void PCtoRDRXfrBlock( void )
uint16_t msglen = 0; uint16_t msglen = 0;
uint32_t ret; uint32_t ret;
TRACE_DEBUG("PCtoRDRXfrBlock\n"); TRACE_DEBUG("PCtoRDRXfrBlock\n\r");
// Check the block length // Check the block length
if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) { if ( ccidDriver.sCcidCommand.wLength > (configurationDescriptorsFS->ccid.dwMaxCCIDMessageLength-10) ) {
@@ -921,7 +921,7 @@ void USBDCallbacks_RequestReceived(const USBGenericRequest *request)
void CCID_SmartCardRequest( void ) void CCID_SmartCardRequest( void )
{ {
unsigned char bStatus; unsigned char bStatus;
TRACE_DEBUG("CCID_req\n"); TRACE_DEBUG("CCID_req\n\r");
do { do {

12
firmware/libcommon/source/host_communication.c
View File

@@ -40,10 +40,10 @@ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
local_irq_save(x); local_irq_save(x);
bep->in_progress--; bep->in_progress--;
local_irq_restore(x); 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) 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); 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), rc = USBD_Write(ep, msgb_data(msg), msgb_length(msg),
(TransferCallback) &usb_write_cb, msg); (TransferCallback) &usb_write_cb, msg);
if (rc != USBD_STATUS_SUCCESS) { 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 */ /* re-insert to head of queue */
llist_add_irqsafe(&msg->list, &bep->queue); llist_add_irqsafe(&msg->list, &bep->queue);
local_irq_save(x); local_irq_save(x);
bep->in_progress--; bep->in_progress--;
local_irq_restore(x); 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; return 0;
} }
@@ -112,7 +112,7 @@ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
bep->in_progress = 0; bep->in_progress = 0;
if (status != USBD_STATUS_SUCCESS) { 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); usb_buf_free(msg);
return; return;
} }
@@ -150,7 +150,7 @@ int usb_refill_from_host(uint8_t ep)
rc = USBD_Read(ep, msg->head, msgb_tailroom(msg), rc = USBD_Read(ep, msg->head, msgb_tailroom(msg),
(TransferCallback) &usb_read_cb, msg); (TransferCallback) &usb_read_cb, msg);
if (rc != USBD_STATUS_SUCCESS) { 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); usb_buf_free(msg);
bep->in_progress = 0; bep->in_progress = 0;
} }

4
firmware/libcommon/source/simtrace_iso7816.c
View File

@@ -71,7 +71,7 @@ void ISR_PhoneRST(const Pin * pPin)
USBD_Write(SIMTRACE_USB_EP_PHONE_INT, "R", 1, USBD_Write(SIMTRACE_USB_EP_PHONE_INT, "R", 1,
(TransferCallback) & Callback_PhoneRST_ISR, (TransferCallback) & Callback_PhoneRST_ISR,
0)) != USBD_STATUS_SUCCESS) { 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; return;
} }
@@ -109,7 +109,7 @@ void mode_trace_usart1_irq(void)
/* Fill char into buffer */ /* Fill char into buffer */
rbuf_write(&sim_rcv_buf, c); rbuf_write(&sim_rcv_buf, c);
} else { } else {
TRACE_DEBUG("e %x st: %lx\n", c, stat); TRACE_DEBUG("e %x st: %lx\r\n", c, stat);
} /* else: error occurred */ } /* else: error occurred */
char_stat = stat; char_stat = stat;