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

phone.c: Bug fix: USB err format string interchanged

Browse Source
This commit is contained in:
Christina Quast
2015-04-11 08:44:40 +02:00
parent a0ca2d34ec
commit 87ddfa8c23
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/src_simtrace/phone.c
View File

@@ -282,7 +282,7 @@ void send_ATR(uint8_t *ATR, uint8_t status, uint32_t transferred, uint32_t remai
uint32_t i; uint32_t i;
if (status != USBD_STATUS_SUCCESS) { if (status != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USB err status: %d (%s)", __FUNCTION__, status); TRACE_ERROR("USB err status: %d (%s)\n", __FUNCTION__, status);
return; return;
} }
PR("Send %x %x .. %x (tr: %d, st: %x)", ATR[0], ATR[1], ATR[transferred-1], transferred, status); PR("Send %x %x .. %x (tr: %d, st: %x)", ATR[0], ATR[1], ATR[transferred-1], transferred, status);
@@ -298,7 +298,7 @@ void sendResponse( uint8_t *pArg, uint8_t status, uint32_t transferred, uint32_t
uint32_t i; uint32_t i;
if (status != USBD_STATUS_SUCCESS) { if (status != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USB err status: %d (%s)", __FUNCTION__, status); TRACE_ERROR("USB err status: %d (%s)\n", __FUNCTION__, status);
return; return;
} }
PR("sendResp, stat: %X, trnsf: %x, rem: %x\n\r", status, transferred, remaining); PR("sendResp, stat: %X, trnsf: %x, rem: %x\n\r", status, transferred, remaining);
@@ -327,7 +327,7 @@ void wait_for_response(uint8_t pBuffer[]) {
/* DATA_IN for host side is data_out for simtrace side */ /* DATA_IN for host side is data_out for simtrace side */
ret = USBD_Write( PHONE_DATAIN, (void *)buf.buf, BUFLEN, 0, 0 ); ret = USBD_Write( PHONE_DATAIN, (void *)buf.buf, BUFLEN, 0, 0 );
if (ret != USBD_STATUS_SUCCESS) { if (ret != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USB err status: %d (%s)", __FUNCTION__, ret); TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__);
return; return;
} }
PR("b:%x %x %x %x %x.\n\r", buf.buf[0], buf.buf[1],buf.buf[2], buf.buf[3], buf.buf[4]); PR("b:%x %x %x %x %x.\n\r", buf.buf[0], buf.buf[1],buf.buf[2], buf.buf[3], buf.buf[4]);
@@ -338,7 +338,7 @@ void wait_for_response(uint8_t pBuffer[]) {
ret = USBD_Write( PHONE_DATAIN, (void *) buf.buf, buf.idx, 0, 0 ); ret = USBD_Write( PHONE_DATAIN, (void *) buf.buf, buf.idx, 0, 0 );
if (ret != USBD_STATUS_SUCCESS) { if (ret != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USB err status: %d (%s)", __FUNCTION__, ret); TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__);
return; return;
} }
@@ -385,7 +385,7 @@ void Phone_run( void )
switch (state) { switch (state) {
case RST_RCVD: case RST_RCVD:
if ((ret = USBD_Write( PHONE_INT, &msg, 1, 0, 0 )) != USBD_STATUS_SUCCESS) { if ((ret = USBD_Write( PHONE_INT, &msg, 1, 0, 0 )) != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USB err status: %d (%s)", __FUNCTION__, ret); TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__);
return; return;
} }
//buf.idx = 0; //buf.idx = 0;
@@ -396,7 +396,7 @@ void Phone_run( void )
PR("Reading started sucessfully (ATR)"); PR("Reading started sucessfully (ATR)");
state = WAIT_ATR; state = WAIT_ATR;
} else { } else {
TRACE_ERROR("USB err status: %d (%s)", __FUNCTION__, ret); TRACE_ERROR("USB err status: %d (%s)\n", ret, __FUNCTION__);
return; return;
} }
break; break;