iso7816_4.c: CLK div differs for Master and Slave
Attention: Each init function has to enable and disable receiver and
transmitter on its own!
diff --git a/firmware/src_board/iso7816_4.c b/firmware/src_board/iso7816_4.c
index 0f27657..25a1385 100644
--- a/firmware/src_board/iso7816_4.c
+++ b/firmware/src_board/iso7816_4.c
@@ -649,11 +649,6 @@
Usart *us_base = usart->base;
uint32_t us_id = usart->id;
- us_base->US_CR = US_CR_RSTRX
- | US_CR_RSTTX
- | US_CR_RXDIS
- | US_CR_TXDIS;
-
if (master_clock == true) {
clk = US_MR_USCLKS_MCK;
} else {
@@ -684,16 +679,14 @@
/* SCK = FIDI x BAUD = 372 x 9600 */
/* BOARD_MCK */
/* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
- us_base->US_BRGR = US_BRGR_CD(1);
-// us_base->US_BRGR = BOARD_MCK / (372*9150);
+ if (master_clock == true) {
+ us_base->US_BRGR = BOARD_MCK / (372*9600);
+ } else {
+ us_base->US_BRGR = US_BRGR_CD(1);
+ }
/* Write the Timeguard Register */
// us_base->US_RTOR = 0;
us_base->US_TTGR = 5;
-
- USART_SetTransmitterEnabled(us_base, 1);
- USART_SetReceiverEnabled(us_base, 1);
-
- us_base->US_RHR;
}
diff --git a/firmware/src_simtrace/ccid.c b/firmware/src_simtrace/ccid.c
index c479565..2c70eea 100644
--- a/firmware/src_simtrace/ccid.c
+++ b/firmware/src_simtrace/ccid.c
@@ -128,6 +128,8 @@
void CCID_exit ( void ) {
PIO_DisableIt( &pinSmartCard ) ;
+ USART_SetTransmitterEnabled(usart_info.base, 0);
+ USART_SetReceiverEnabled(usart_info.base, 0);
}
void CCID_init( void )
@@ -150,6 +152,9 @@
// PIO_Set(&pinsPower[0]);
ISO7816_Init(&usart_info, CLK_MASTER);
+ USART_SetTransmitterEnabled(usart_info.base, 1);
+ USART_SetReceiverEnabled(usart_info.base, 1);
+
ISO7816_Set_Reset_Pin(&pinIso7816RstMC);
/* Read ATR */
ISO7816_warm_reset() ;
diff --git a/firmware/src_simtrace/simtrace_iso7816.c b/firmware/src_simtrace/simtrace_iso7816.c
index b0f3e79..ed7e23d 100644
--- a/firmware/src_simtrace/simtrace_iso7816.c
+++ b/firmware/src_simtrace/simtrace_iso7816.c
@@ -117,7 +117,6 @@
/* Fill char into buffer */
rbuf_write(&sim_rcv_buf, c);
} else {
- rbuf_write(&sim_rcv_buf, c);
PR("e %x st: %x\n", c, stat);
} /* else: error occured */