Merge branch 'new_iso_init' (sniffer not working)

Conflicts:
	firmware/src_simtrace/phone.c
	firmware/src_simtrace/simtrace.h
This commit is contained in:
Christina Quast
2015-04-12 13:31:01 +02:00
10 changed files with 123 additions and 174 deletions

View File

@@ -79,8 +79,8 @@ void _ISO7816_Init( void )
/* Configure USART */
PMC_EnablePeripheral(ID_USART_PHONE);
USART1->US_IDR = 0xffffffff;
USART_EnableIt( USART1, US_IER_RXRDY) ;
USART_PHONE->US_IDR = 0xffffffff;
USART_EnableIt( USART_PHONE, US_IER_RXRDY) ;
/* enable USART1 interrupt */
NVIC_EnableIRQ( USART1_IRQn ) ;