CHG: lowered the timout again, but re-added the spindelay since 14a requires 5ms...

CHG: fix the ticks compare xx > 1 into  xx >= 1

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 5a43e2333fc39aefec63904f12bd4c16663395f8..61c018bb290a7966b94bdb329287be192a5d51c8 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2001,6 +2001,8 @@ void iso14443a_setup(uint8_t fpga_minor_mode) {
                LED_D_ON();
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | fpga_minor_mode);
                LED_D_ON();
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | fpga_minor_mode);

+
+       SpinDelay(20);

        
        // Start the timer
        StartCountSspClk();
        
        // Start the timer
        StartCountSspClk();


@@ -2009,7 +2011,7 @@ void iso14443a_setup(uint8_t fpga_minor_mode) {
        DemodReset();
        UartReset();
        NextTransferTime = 2 * DELAY_ARM2AIR_AS_READER;
        DemodReset();
        UartReset();
        NextTransferTime = 2 * DELAY_ARM2AIR_AS_READER;

-       iso14a_set_timeout(20*106); // 20ms default     
+       iso14a_set_timeout(10*106); // 20ms default     

 }
 
 int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
 }
 
 int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {

diff --git a/armsrc/ticks.c b/armsrc/ticks.c
index 6f34fe14f67fb35249fafa376ee40166f082ef65..d183c707002987f63fe879961127f20d3745db24 100644 (file)
--- a/armsrc/ticks.c
+++ b/armsrc/ticks.c
@@ -211,5 +211,5 @@ void ResetTicks(){
 }
 void ResetTimer(AT91PS_TC timer){
        timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;
 }
 void ResetTimer(AT91PS_TC timer){
        timer->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG;

-       while(timer->TC_CV > 1) ;
+       while(timer->TC_CV >= 1) ;

 }
 }