catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-18 06:08:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix newline \n\r with \r\n

Browse Source
This commit is contained in:
Alexander Couzens
2022-01-24 11:44:35 +01:00
parent 7674b08519
commit 87f8de15b4
38 changed files with 378 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
View File

@@ -767,7 +767,7 @@ static void UDP_EndpointHandler(uint8_t bEndpoint)
}
else {
// Acknowledge interrupt
TRACE_ERROR("Error Wr%d, %x\n\r", bEndpoint, pEndpoint->state);
TRACE_ERROR("Error Wr%d, %x\r\n", bEndpoint, pEndpoint->state);
CLEAR_CSR(bEndpoint, UDP_CSR_TXCOMP);
}
}
@@ -914,11 +914,11 @@ static inline uint8_t UDP_Write(uint8_t bEndpoint,
/* int i;
for (i = 0; i < dLength; i++) {
if (!(i%16)) {
printf("\n\r");
printf("\r\n");
}
printf("0x%x ", ((uint8_t*)pData)[i]);
}
printf("\n\r");
printf("\r\n");
*/
/* Setup the transfer descriptor */
@@ -1053,11 +1053,11 @@ static inline uint8_t UDP_Read(uint8_t bEndpoint,
/* int i;
for (i = 0; i < dLength; i++) {
if (!(i%16)) {
printf("\n\r");
printf("\r\n");
}
printf("0x%x ", ((uint8_t*)pData)[i]);
}
printf("\n\r");
printf("\r\n");
*/
/* Set the transfer descriptor */
@@ -1114,7 +1114,7 @@ void USBD_IrqHandler(void)
/* Return immediately if there is no interrupt to service */
if (status == 0) {
TRACE_DEBUG_WP(".\n\r");
TRACE_DEBUG_WP(".\r\n");
return;
}
@@ -1212,7 +1212,7 @@ void USBD_IrqHandler(void)
if (status != 0) {
TRACE_DEBUG_WP("\n\r - ");
TRACE_DEBUG_WP("\r\n - ");
}
}
eptnum++;
@@ -1221,7 +1221,7 @@ void USBD_IrqHandler(void)
/* Toggle LED back to its previous state */
TRACE_DEBUG_WP("!");
TRACE_DEBUG_WP("\n\r");
TRACE_DEBUG_WP("\r\n");
if (USBD_GetState() >= USBD_STATE_POWERED) {
//LED_Clear(USBD_LEDUSB);
@@ -1581,7 +1581,7 @@ void USBD_HAL_SetConfiguration(uint8_t cfgnum)
*/
void USBD_HAL_Init(void)
{
TRACE_DEBUG("%s\n\r", "USBD_HAL_Init");
TRACE_DEBUG("%s\r\n", "USBD_HAL_Init");
/* Must before USB & TXVC access! */
UDP_EnablePeripheralClock();
@@ -1610,7 +1610,7 @@ uint8_t USBD_HAL_Stall(uint8_t bEP)
/* Check that endpoint is in Idle state */
if (pEndpoint->state != UDP_ENDPOINT_IDLE) {
TRACE_WARNING("UDP_Stall: EP%d locked\n\r", bEP);
TRACE_WARNING("UDP_Stall: EP%d locked\r\n", bEP);
return USBD_STATUS_LOCKED;
}
/* STALL endpoint */

2
firmware/atmel_softpack_libraries/libchip_sam3s/source/efc.c
View File

@@ -163,7 +163,7 @@ extern void EFC_TranslateAddress( Efc** ppEfc, uint32_t dwAddress, uint16_t* pwP
wPage = (dwAddress - IFLASH_ADDR) / IFLASH_PAGE_SIZE;
wOffset = (dwAddress - IFLASH_ADDR) % IFLASH_PAGE_SIZE;
TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\n\r", dwAddress, wPage, wOffset ) ;
TRACE_DEBUG( "Translated 0x%08lX to page=%d and offset=%d\r\n", dwAddress, wPage, wOffset ) ;
/* Store values */
if ( pEfc )
{

2
firmware/atmel_softpack_libraries/libchip_sam3s/source/flashd.c
View File

@@ -134,7 +134,7 @@ static void ComputeLockRange( uint32_t dwStart, uint32_t dwEnd, uint32_t *pdwAct
// Store actual page numbers
EFC_ComputeAddress( pStartEfc, wActualStartPage, 0, pdwActualStart ) ;
EFC_ComputeAddress( pEndEfc, wActualEndPage, 0, pdwActualEnd ) ;
TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\n\r", *pdwActualStart, *pdwActualEnd ) ;
TRACE_DEBUG( "Actual lock range is 0x%06lX - 0x%06lX\r\n", *pdwActualStart, *pdwActualEnd ) ;
}

20
firmware/atmel_softpack_libraries/libchip_sam3s/source/pio_it.c
View File

@@ -104,7 +104,7 @@ extern void PioInterruptHandler( uint32_t id, Pio *pPio )
/* Check pending events */
if ( status != 0 )
{
TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\n\r", id ) ;
TRACE_DEBUG( "PIO interrupt on PIO controller #%" PRIu32 "\r\n", id ) ;
/* Find triggering source */
i = 0;
@@ -119,7 +119,7 @@ extern void PioInterruptHandler( uint32_t id, Pio *pPio )
/* Source has PIOs whose statuses have changed */
if ( (status & _aIntSources[i].pPin->mask) != 0 )
{
TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\n\r", i ) ;
TRACE_DEBUG( "Interrupt source #%" PRIu32 " triggered\r\n", i ) ;
_aIntSources[i].handler(_aIntSources[i].pPin);
status &= ~(_aIntSources[i].pPin->mask);
@@ -177,13 +177,13 @@ extern void PIOC_IrqHandler( void )
*/
extern void PIO_InitializeInterrupts( uint32_t dwPriority )
{
TRACE_DEBUG( "PIO_Initialize()\n\r" ) ;
TRACE_DEBUG( "PIO_Initialize()\r\n" ) ;
/* Reset sources */
_dwNumSources = 0 ;
/* Configure PIO interrupt sources */
TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\n\r" ) ;
TRACE_DEBUG( "PIO_Initialize: Configuring PIOA\r\n" ) ;
PMC_EnablePeripheral( ID_PIOA ) ;
PIOA->PIO_ISR ;
PIOA->PIO_IDR = 0xFFFFFFFF ;
@@ -192,7 +192,7 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
NVIC_SetPriority( PIOA_IRQn, dwPriority ) ;
NVIC_EnableIRQ( PIOA_IRQn ) ;
TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\n\r" ) ;
TRACE_DEBUG( "PIO_Initialize: Configuring PIOB\r\n" ) ;
PMC_EnablePeripheral( ID_PIOB ) ;
PIOB->PIO_ISR ;
PIOB->PIO_IDR = 0xFFFFFFFF ;
@@ -201,7 +201,7 @@ extern void PIO_InitializeInterrupts( uint32_t dwPriority )
NVIC_SetPriority( PIOB_IRQn, dwPriority ) ;
NVIC_EnableIRQ( PIOB_IRQn ) ;
TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\n\r" ) ;
TRACE_DEBUG( "PIO_Initialize: Configuring PIOC\r\n" ) ;
PMC_EnablePeripheral( ID_PIOC ) ;
PIOC->PIO_ISR ;
PIOC->PIO_IDR = 0xFFFFFFFF ;
@@ -234,7 +234,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
Pio* pio ;
InterruptSource* pSource ;
TRACE_DEBUG( "PIO_ConfigureIt()\n\r" ) ;
TRACE_DEBUG( "PIO_ConfigureIt()\r\n" ) ;
assert( pPin ) ;
pio = pPin->pio ;
@@ -242,7 +242,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
pSource = find_intsource4pin(pPin);
if (!pSource) {
/* Define new source */
TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\n\r", _dwNumSources ) ;
TRACE_DEBUG( "PIO_ConfigureIt: Defining new source #%" PRIu32 ".\r\n", _dwNumSources ) ;
assert( _dwNumSources < MAX_INTERRUPT_SOURCES ) ;
pSource = &(_aIntSources[_dwNumSources]) ;
pSource->pPin = pPin ;
@@ -288,7 +288,7 @@ extern void PIO_ConfigureIt( const Pin *pPin, void (*handler)( const Pin* ) )
*/
extern void PIO_EnableIt( const Pin *pPin )
{
TRACE_DEBUG( "PIO_EnableIt()\n\r" ) ;
TRACE_DEBUG( "PIO_EnableIt()\r\n" ) ;
assert( pPin != NULL ) ;
@@ -320,7 +320,7 @@ extern void PIO_DisableIt( const Pin *pPin )
{
assert( pPin != NULL ) ;
TRACE_DEBUG( "PIO_DisableIt()\n\r" ) ;
TRACE_DEBUG( "PIO_DisableIt()\r\n" ) ;
pPin->pio->PIO_IDR = pPin->mask;
}

12
firmware/atmel_softpack_libraries/libchip_sam3s/source/pmc.c
View File

@@ -63,7 +63,7 @@ extern void PMC_EnablePeripheral( uint32_t dwId )
{
if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId) )
{
TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral" " %" PRIu32 " is already enabled\n\r", dwId ) ;
TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral" " %" PRIu32 " is already enabled\r\n", dwId ) ;
}
else
{
@@ -75,7 +75,7 @@ extern void PMC_EnablePeripheral( uint32_t dwId )
dwId -= 32;
if ((PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) == ((uint32_t)1 << dwId))
{
TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral" " %" PRIu32 " is already enabled\n\r", dwId + 32 ) ;
TRACE_DEBUG( "PMC_EnablePeripheral: clock of peripheral" " %" PRIu32 " is already enabled\r\n", dwId + 32 ) ;
}
else
{
@@ -100,7 +100,7 @@ extern void PMC_DisablePeripheral( uint32_t dwId )
{
if ( (PMC->PMC_PCSR0 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
{
TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId ) ;
TRACE_DEBUG("PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\r\n", dwId ) ;
}
else
{
@@ -112,7 +112,7 @@ extern void PMC_DisablePeripheral( uint32_t dwId )
dwId -= 32 ;
if ( (PMC->PMC_PCSR1 & ((uint32_t)1 << dwId)) != ((uint32_t)1 << dwId) )
{
TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\n\r", dwId + 32 ) ;
TRACE_DEBUG( "PMC_DisablePeripheral: clock of peripheral" " %" PRIu32 " is not enabled\r\n", dwId + 32 ) ;
}
else
{
@@ -132,7 +132,7 @@ extern void PMC_EnableAllPeripherals( void )
PMC->PMC_PCER1 = MASK_STATUS1 ;
while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != MASK_STATUS1 ) ;
TRACE_DEBUG( "Enable all periph clocks\n\r" ) ;
TRACE_DEBUG( "Enable all periph clocks\r\n" ) ;
}
/**
@@ -146,7 +146,7 @@ extern void PMC_DisableAllPeripherals( void )
PMC->PMC_PCDR1 = MASK_STATUS1 ;
while ( (PMC->PMC_PCSR1 & MASK_STATUS1) != 0 ) ;
TRACE_DEBUG( "Disable all periph clocks\n\r" ) ;
TRACE_DEBUG( "Disable all periph clocks\r\n" ) ;
}
/**

4
firmware/atmel_softpack_libraries/libchip_sam3s/source/usart.c
View File

@@ -198,7 +198,7 @@ void USART_Write(
if (timeOut == 0) {
TRACE_ERROR("USART_Write: Timed out.\n\r");
TRACE_ERROR("USART_Write: Timed out.\r\n");
return;
}
timeOut--;
@@ -269,7 +269,7 @@ uint16_t USART_Read(
if (timeOut == 0) {
TRACE_ERROR( "USART_Read: Timed out.\n\r" ) ;
TRACE_ERROR( "USART_Read: Timed out.\r\n" ) ;
return 0;
}
timeOut--;

8
firmware/atmel_softpack_libraries/usb/device/core/USBD.c
View File

@@ -140,7 +140,7 @@ void USBD_ResetHandler()
void USBD_RequestHandler(uint8_t bEndpoint,
const USBGenericRequest* pRequest)
{
TRACE_DEBUG("%s\n\r", "USBD_RequestHandler");
TRACE_DEBUG("%s\r\n", "USBD_RequestHandler");
if (bEndpoint != 0) {
TRACE_WARNING("EP%d request not supported, default EP only",
bEndpoint);
@@ -316,7 +316,7 @@ void USBD_RemoteWakeUp(void)
/* Device is NOT suspended */
if (deviceState != USBD_STATE_SUSPENDED) {
TRACE_INFO("USBD_RemoteWakeUp: Device is not suspended\n\r");
TRACE_INFO("USBD_RemoteWakeUp: Device is not suspended\r\n");
return;
}
USBD_HAL_Activate();
@@ -356,7 +356,7 @@ void USBD_Disconnect(void)
*/
void USBD_Init(void)
{
TRACE_INFO_WP("USBD_Init\n\r");
TRACE_INFO_WP("USBD_Init\r\n");
/* HW Layer Initialize */
USBD_HAL_Init();
@@ -367,7 +367,7 @@ void USBD_Init(void)
/* Upper Layer Initialize */
USBDCallbacks_Initialized();
TRACE_DEBUG("%s\n\r", "..");
TRACE_DEBUG("%s\r\n", "..");
}
/**

12
firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c
View File

@@ -83,7 +83,7 @@ static void SetConfiguration(USBDDriver *pDriver, uint8_t cfgnum)
const USBConfigurationDescriptor *pConfiguration;
/* Use different descriptor depending on device speed */
TRACE_DEBUG("%s\n\r", "SetConfiguration");
TRACE_DEBUG("%s\r\n", "SetConfiguration");
if (USBD_IsHighSpeed()) {
@@ -361,7 +361,7 @@ static void GetDescriptor(
default:
TRACE_WARNING(
"USBDDriver_GetDescriptor: Unknown descriptor type (%d)\n\r",
"USBDDriver_GetDescriptor: Unknown descriptor type (%d)\r\n",
type);
USBD_Stall(0);
}
@@ -565,7 +565,7 @@ void USBDDriver_RequestHandler(
default:
TRACE_WARNING(
"USBDDriver_RequestHandler: Unknown recipient (%d)\n\r",
"USBDDriver_RequestHandler: Unknown recipient (%d)\r\n",
USBGenericRequest_GetRecipient(pRequest));
USBD_Stall(0);
}
@@ -595,7 +595,7 @@ void USBDDriver_RequestHandler(
default:
TRACE_WARNING(
"USBDDriver_RequestHandler: Unknown feature selector (%d)\n\r",
"USBDDriver_RequestHandler: Unknown feature selector (%d)\r\n",
USBFeatureRequest_GetFeatureSelector(pRequest));
USBD_Stall(0);
}
@@ -642,7 +642,7 @@ void USBDDriver_RequestHandler(
default:
TRACE_WARNING(
"USBDDriver_RequestHandler: Unknown feature selector (%d)\n\r",
"USBDDriver_RequestHandler: Unknown feature selector (%d)\r\n",
USBFeatureRequest_GetFeatureSelector(pRequest));
USBD_Stall(0);
}
@@ -665,7 +665,7 @@ void USBDDriver_RequestHandler(
default:
TRACE_WARNING(
"USBDDriver_RequestHandler: Unknown request code (%d)\n\r",
"USBDDriver_RequestHandler: Unknown request code (%d)\r\n",
USBGenericRequest_GetRequest(pRequest));
USBD_Stall(0);
}

26
firmware/atmel_softpack_libraries/usb/device/dfu/dfu_driver.c
View File

@@ -49,7 +49,7 @@ struct dfudata *g_dfu = &_g_dfu;
WEAK void dfu_drv_updstatus(void)
{
TRACE_INFO("DFU: updstatus()\n\r");
TRACE_INFO("DFU: updstatus()\r\n");
/* we transition immediately from MANIFEST_SYNC to MANIFEST,
* as the flash-writing is not asynchronous in this
@@ -72,7 +72,7 @@ static __dfufunc void handle_getstatus(void)
dstat.iString = 0;
memcpy(&dstat.bwPollTimeout, poll_timeout_10ms, sizeof(dstat.bwPollTimeout));
TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
TRACE_DEBUG("handle_getstatus(%u, %u)\r\n", dstat.bStatus, dstat.bState);
USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
}
@@ -81,7 +81,7 @@ static void __dfufunc handle_getstate(void)
{
uint8_t u8 = g_dfu->state;
TRACE_DEBUG("handle_getstate(%ld)\n\r", g_dfu->state);
TRACE_DEBUG("handle_getstate(%ld)\r\n", g_dfu->state);
USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
}
@@ -106,10 +106,10 @@ static void dnload_cb(void *arg, unsigned char status, unsigned long int transfe
{
int rc;
TRACE_DEBUG("COMPLETE\n\r");
TRACE_DEBUG("COMPLETE\r\n");
if (status != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USBD download callback status %d\n\r", status);
TRACE_ERROR("USBD download callback status %d\r\n", status);
USBD_Stall(0);
return;
}
@@ -136,14 +136,14 @@ static int handle_dnload(uint16_t val, uint16_t len, int first)
int rc;
if (len > BOARD_DFU_PAGE_SIZE) {
TRACE_ERROR("DFU length exceeds flash page size\n\r");
TRACE_ERROR("DFU length exceeds flash page size\r\n");
g_dfu->state = DFU_STATE_dfuERROR;
g_dfu->status = DFU_STATUS_errADDRESS;
return DFU_RET_STALL;
}
if (len & 0x03) {
TRACE_ERROR("DFU length not four-byte-aligned\n\r");
TRACE_ERROR("DFU length not four-byte-aligned\r\n");
g_dfu->state = DFU_STATE_dfuERROR;
g_dfu->status = DFU_STATUS_errADDRESS;
return DFU_RET_STALL;
@@ -153,7 +153,7 @@ static int handle_dnload(uint16_t val, uint16_t len, int first)
g_dfu->total_bytes = 0;
if (len == 0) {
TRACE_DEBUG("zero-size write -> MANIFEST_SYNC\n\r");
TRACE_DEBUG("zero-size write -> MANIFEST_SYNC\r\n");
g_dfu->state = DFU_STATE_dfuMANIFEST_SYNC;
return DFU_RET_ZLP;
}
@@ -172,10 +172,10 @@ static void upload_cb(void *arg, unsigned char status, unsigned long int transfe
{
int rc;
TRACE_DEBUG("COMPLETE\n\r");
TRACE_DEBUG("COMPLETE\r\n");
if (status != USBD_STATUS_SUCCESS) {
TRACE_ERROR("USBD upload callback status %d\n\r", status);
TRACE_ERROR("USBD upload callback status %d\r\n", status);
USBD_Stall(0);
return;
}
@@ -191,7 +191,7 @@ static int handle_upload(uint16_t val, uint16_t len, int first)
g_dfu->total_bytes = 0;
if (len > BOARD_DFU_PAGE_SIZE) {
TRACE_ERROR("DFU length exceeds flash page size\n\r");
TRACE_ERROR("DFU length exceeds flash page size\r\n");
g_dfu->state = DFU_STATE_dfuERROR;
g_dfu->status = DFU_STATUS_errADDRESS;
return DFU_RET_STALL;
@@ -199,7 +199,7 @@ static int handle_upload(uint16_t val, uint16_t len, int first)
rc = USBDFU_handle_upload(if_altsettings[0], g_dfu->total_bytes, dfu_buf, len);
if (rc < 0) {
TRACE_ERROR("application handle_upload() returned %d\n\r", rc);
TRACE_ERROR("application handle_upload() returned %d\r\n", rc);
return DFU_RET_STALL;
}
@@ -217,7 +217,7 @@ void USBDFU_DFU_RequestHandler(const USBGenericRequest *request)
uint16_t val = USBGenericRequest_GetValue(request);
int rc, ret = DFU_RET_NOTHING;
TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\r\n",
USBGenericRequest_GetType(request),
USBGenericRequest_GetRecipient(request),
val, len);

8
firmware/atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c
View File

@@ -55,7 +55,7 @@ static __dfufunc void handle_getstatus(void)
dstat.iString = 0;
memcpy(&dstat.bwPollTimeout, poll_timeout_10ms, sizeof(dstat.bwPollTimeout));
TRACE_DEBUG("handle_getstatus(%u, %u)\n\r", dstat.bStatus, dstat.bState);
TRACE_DEBUG("handle_getstatus(%u, %u)\r\n", dstat.bStatus, dstat.bState);
USBD_Write(0, (char *)&dstat, sizeof(dstat), NULL, 0);
}
@@ -64,7 +64,7 @@ static void __dfufunc handle_getstate(void)
{
uint8_t u8 = g_dfu->state;
TRACE_DEBUG("handle_getstate(%lu)\n\r", g_dfu->state);
TRACE_DEBUG("handle_getstate(%lu)\r\n", g_dfu->state);
USBD_Write(0, (char *)&u8, sizeof(u8), NULL, 0);
}
@@ -110,7 +110,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
uint16_t val = USBGenericRequest_GetValue(request);
int rc, ret = DFU_RET_NOTHING;
TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\n\r",
TRACE_DEBUG("type=0x%x, recipient=0x%x val=0x%x len=%u\r\n",
USBGenericRequest_GetType(request),
USBGenericRequest_GetRecipient(request),
val, len);
@@ -159,7 +159,7 @@ void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request)
/* we switch it DETACH state, send a ZLP and
* return. The next USB reset in this state
* will then trigger DFURT_SwitchToDFU() below */
TRACE_DEBUG("\r\n====dfu_detach\n\r");
TRACE_DEBUG("\r\n====dfu_detach\r\n");
g_dfu->state = DFU_STATE_appDETACH;
USBD_Write(0, 0, 0, 0, 0);
DFURT_SwitchToDFU();