Index: yc_emv_contactless_l1.c =================================================================== --- /YC3121_SDK/fw/sdk/yc_nfc/yc_emv_contactless_l1.c (revision 718) +++ /YC3121_SDK/fw/sdk/yc_nfc/yc_emv_contactless_l1.c (working copy) @@ -58,15 +58,15 @@ uint8_t gain_i_q_table[9][3] = { - {RX_GAIN_6DB, 0,0}, - {RX_GAIN_12DB,0,0}, - {RX_GAIN_18DB,0,0}, - {RX_GAIN_24DB,0,0}, - {RX_GAIN_30DB,0,0}, - {RX_GAIN_36DB,0,0}, - {RX_GAIN_42DB,0,0}, - {RX_GAIN_48DB,0,0}, - {RX_GAIN_54DB,0,0}, + {RX_GAIN_6DB, 0, 0}, + {RX_GAIN_12DB, 0, 0}, + {RX_GAIN_18DB, 0, 0}, + {RX_GAIN_24DB, 0, 0}, + {RX_GAIN_30DB, 0, 0}, + {RX_GAIN_36DB, 0, 0}, + {RX_GAIN_42DB, 0, 0}, + {RX_GAIN_48DB, 0, 0}, + {RX_GAIN_54DB, 0, 0}, }; /* gain,i,q */ static unsigned char bit_rate = 0; @@ -192,8 +192,8 @@ { SETBITMASK(REG_TOP_CTRL, 0x10); - WRITEREG(REG_IRQ0_EN,0x00); - WRITEREG(REG_IRQ1_EN,0x00); + WRITEREG(REG_IRQ0_EN, 0x00); + WRITEREG(REG_IRQ1_EN, 0x00); WRITEREG(REG_COLL_LEVEL, 0x06); WRITEREG(REG_DEMOD_CTRL, 0x88); @@ -220,7 +220,7 @@ WRITEREG(REG_RX_CTRL5, RX_CTRL5); Set_Min_Level(RX_MINLEVEL); //设置接收门限 - Set_Receive_Parameters(RX_GAIN_18DB,RX_I_R_500); //设置接收增益及内部电阻 + Set_Receive_Parameters(RX_GAIN_18DB, RX_I_R_500); //设置接收增益及内部电阻 Set_Carrier_Strength(PA_GAIN_VAL); //设置发射功率 } @@ -232,26 +232,26 @@ */ void YC_EMV_Contactless_L1_Switch_Card_Type(unsigned char picc_type) { - Block_Num = 0; - - if(picc_type == TYPE_A) - { - WRITEREG(REG_TX_PA_MOD_GAIN, 0x00); - SETBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); + Block_Num = 0; - WRITEREG(REG_TX_CODER_CTRL, 0x00); - WRITEREG(REG_RX_CODER_CTRL, 0x00); + if (picc_type == TYPE_A) + { + WRITEREG(REG_TX_PA_MOD_GAIN, 0x00); + SETBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); + + WRITEREG(REG_TX_CODER_CTRL, 0x00); + WRITEREG(REG_RX_CODER_CTRL, 0x00); WRITEREG(REG_TX_CRC_CTRL, 0x04); WRITEREG(REG_RX_CRC_CTRL, 0x04); } - else if(picc_type == TYPE_B) + else if (picc_type == TYPE_B) { WRITEREG(REG_TX_PA_MOD_GAIN, MOD_INDEX); CLEARBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); - WRITEREG(REG_TX_CODER_CTRL, 0x04); - WRITEREG(REG_RX_CODER_CTRL, 0x0c); + WRITEREG(REG_TX_CODER_CTRL, 0x04); + WRITEREG(REG_RX_CODER_CTRL, 0x0c); WRITEREG(REG_TX_CRC_CTRL, 0x12); WRITEREG(REG_RX_CRC_CTRL, 0x12); @@ -268,18 +268,18 @@ */ void YC_EMV_Contactless_L1_Rf_Switch(unsigned char on) { - if(on) + if (on) { - SETBITMASK(REG_TOP_CTRL,0x01); - SETBITMASK(REG_TX_PA_GAIN_CTRL,0x10); - SETBITMASK(REG_TX_PA_GAIN_CTRL,0x20); + SETBITMASK(REG_TOP_CTRL, 0x01); + SETBITMASK(REG_TX_PA_GAIN_CTRL, 0x10); + SETBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); } else - { - CLEARBITMASK(REG_TX_PA_GAIN_CTRL,0x20); - CLEARBITMASK(REG_TX_PA_GAIN_CTRL,0x10); + { + CLEARBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); + CLEARBITMASK(REG_TX_PA_GAIN_CTRL, 0x10); SysTick_Delay_Ms(2); - CLEARBITMASK(REG_TOP_CTRL,0x01); + CLEARBITMASK(REG_TOP_CTRL, 0x01); } } @@ -295,46 +295,46 @@ * @retval Error code */ static unsigned char EMV_Transceive(Cmd_t cmd, - const unsigned char *request, unsigned short requestlen, unsigned char txalign, - unsigned char *response, unsigned short *responselen, unsigned char rxalign) + const unsigned char *request, unsigned short requestlen, unsigned char txalign, + unsigned char *response, unsigned short *responselen, unsigned char rxalign) { - unsigned short i=0; - unsigned char j=0; - unsigned char len=0; - unsigned int t=0,t2=0; - unsigned char err_flag=0; - - if((cmd != CMD_HLTA) && (!response || !responselen)) - { - return EMV_ERR_PARA; - } - if(!request && (requestlen != 0)) - { - return EMV_ERR_PARA; - } - - WRITEREG(REG_COMMAND, IDLE); - - SETBITMASK(REG_FIFO_CTRL, 0x01); - CLEARBITMASK(REG_FIFO_CTRL, 0x01); - - WRITEREG(REG_IRQ0_CLEAR,0xff); - WRITEREG(REG_IRQ0_CLEAR,0x00); - WRITEREG(REG_IRQ1_CLEAR,0x07); - WRITEREG(REG_IRQ1_CLEAR,0x00); + unsigned short i = 0; + unsigned char j = 0; + unsigned char len = 0; + unsigned int t = 0, t2 = 0; + unsigned char err_flag = 0; + + if ((cmd != CMD_HLTA) && (!response || !responselen)) + { + return EMV_ERR_PARA; + } + if (!request && (requestlen != 0)) + { + return EMV_ERR_PARA; + } + + WRITEREG(REG_COMMAND, IDLE); + + SETBITMASK(REG_FIFO_CTRL, 0x01); + CLEARBITMASK(REG_FIFO_CTRL, 0x01); + WRITEREG(REG_IRQ0_CLEAR, 0xff); + WRITEREG(REG_IRQ0_CLEAR, 0x00); + WRITEREG(REG_IRQ1_CLEAR, 0x07); + WRITEREG(REG_IRQ1_CLEAR, 0x00); - if(bit_rate == TX_BAUD_RATE_106) + + if (bit_rate == TX_BAUD_RATE_106) { WRITEREG(REG_MOD_WIDTH, 0x26); CLEARBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); } - else if(bit_rate == TX_BAUD_RATE_212) + else if (bit_rate == TX_BAUD_RATE_212) { WRITEREG(REG_MOD_WIDTH, 0x12); // 16.5~20 SETBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); } - else if(bit_rate == TX_BAUD_RATE_424) + else if (bit_rate == TX_BAUD_RATE_424) { WRITEREG(REG_MOD_WIDTH, 0x08); // 8~10 SETBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); @@ -345,11 +345,11 @@ SETBITMASK(REG_TX_PA_GAIN_CTRL, 0x20); } - if(txalign >= 8 || rxalign >= 8) + if (txalign >= 8 || rxalign >= 8) { return EMV_ERR_PARA; } - if(txalign != 0 || rxalign != 0) + if (txalign != 0 || rxalign != 0) { CLEARBITMASK(REG_TX_CODER_CTRL, (BIT0 | BIT1 | BIT2) << 3); CLEARBITMASK(REG_RX_BIT_CTRL, BIT0 | BIT1 | BIT2); @@ -363,8 +363,8 @@ CLEARBITMASK(REG_RX_BIT_CTRL, BIT0 | BIT1 | BIT2); } - if(cmd == CMD_ANTICOLLISION || cmd == CMD_SELECT || cmd == CMD_RATS \ - || cmd == CMD_HLTA || cmd == CMD_IBLOCK || cmd == CMD_RBLOCK ||cmd == CMD_SBLOCK) + if (cmd == CMD_ANTICOLLISION || cmd == CMD_SELECT || cmd == CMD_RATS \ + || cmd == CMD_HLTA || cmd == CMD_IBLOCK || cmd == CMD_RBLOCK || cmd == CMD_SBLOCK) { SETBITMASK(REG_FRAM_CON, BIT0); SETBITMASK(REG_FRAM_CON, BIT1); @@ -375,7 +375,7 @@ SETBITMASK(REG_FRAM_CON, BIT1); } - if(cmd == CMD_WUPA || cmd == CMD_REQA || cmd == CMD_ANTICOLLISION) + if (cmd == CMD_WUPA || cmd == CMD_REQA || cmd == CMD_ANTICOLLISION) { CLEARBITMASK(REG_TX_CRC_CTRL, BIT0); CLEARBITMASK(REG_RX_CRC_CTRL, BIT0); @@ -386,52 +386,52 @@ SETBITMASK(REG_RX_CRC_CTRL, BIT0); } - if(cmd == CMD_ANTICOLLISION || cmd == CMD_SELECT) + if (cmd == CMD_ANTICOLLISION || cmd == CMD_SELECT) { EMV_Set_Timer(0, 1400); //9 * 128 + 84/20 } - else if(cmd == CMD_WUPA || cmd == CMD_REQA) + else if (cmd == CMD_WUPA || cmd == CMD_REQA) { EMV_Set_Timer(WAIT_ATQA_PRESCALER, WAIT_ATQA_RELOAD); //9 * 128 + 84/20 } - else if(cmd == CMD_RATS) + else if (cmd == CMD_RATS) { EMV_Set_Timer(4, 58812); //FWT,ACTIVATION + Delta,Tpcd(16.4ms) } - else if(cmd == CMD_WUPB || cmd == CMD_REQB) + else if (cmd == CMD_WUPB || cmd == CMD_REQB) { EMV_Set_Timer(WAIT_ATQB_PRESCALER, WAIT_ATQB_RELOAD); //FWT,ATQB + Delta,Tpcd(16.4ms) } - else if(cmd == CMD_IBLOCK || cmd == CMD_RBLOCK || cmd == CMD_ATTRIB || cmd == CMD_HLTB) + else if (cmd == CMD_IBLOCK || cmd == CMD_RBLOCK || cmd == CMD_ATTRIB || cmd == CMD_HLTB) { t = 256 * 16 * EMV_Power(FWI) + 49152 + 222384; //FWT + Delta,FWT + Delta,Tpcd EMV_Set_FWT(t); } - else if(cmd == CMD_SBLOCK) + else if (cmd == CMD_SBLOCK) { - if(WTXM * EMV_Power(FWI) > EMV_Power(14)) + if (WTXM * EMV_Power(FWI) > EMV_Power(14)) { - t = 256 * 16 * EMV_Power(14) + 49152 + 222384; //FWT + Delta,FWT + Delta,Tpcd - EMV_Set_FWT(t); + t = 256 * 16 * EMV_Power(14) + 49152 + 222384; //FWT + Delta,FWT + Delta,Tpcd + EMV_Set_FWT(t); } else { - t = WTXM * 256 * 16 * EMV_Power(FWI) + 49152 + 222384; //WTXM * FWT + Delta,FWT + Delta,Tpcd - EMV_Set_FWT(t); + t = WTXM * 256 * 16 * EMV_Power(FWI) + 49152 + 222384; //WTXM * FWT + Delta,FWT + Delta,Tpcd + EMV_Set_FWT(t); } } - if(cmd == CMD_IBLOCK) + if (cmd == CMD_IBLOCK) { WRITEREG(REG_FIFO_DATA, PCB); } - for(i = 0; i < requestlen && i < FIFO_LENGTH - 3; i++) + for (i = 0; i < requestlen && i < FIFO_LENGTH - 3; i++) { WRITEREG(REG_FIFO_DATA, request[i]); } @@ -441,7 +441,7 @@ CLEARBITMASK(REG_IRQ0_CLEAR, 0x20); - if(cmd == CMD_HLTA) + if (cmd == CMD_HLTA) { WRITEREG(REG_COMMAND, TRANSMIT); } @@ -449,23 +449,23 @@ { WRITEREG(REG_COMMAND, TRANSCEIVE); } - while(i < requestlen) + while (i < requestlen) { - if((READREG(REG_IRQ0_STATE) & 0x20) != 0) + if ((READREG(REG_IRQ0_STATE) & 0x20) != 0) { - if(requestlen - i > FIFO_LENGTH - WATER_LEVEL - 2) + if (requestlen - i > FIFO_LENGTH - WATER_LEVEL - 2) { - for(j = 0; j < FIFO_LENGTH - WATER_LEVEL - 2; j++) + for (j = 0; j < FIFO_LENGTH - WATER_LEVEL - 2; j++) { - WRITEREG(REG_FIFO_DATA, request[i++]); + WRITEREG(REG_FIFO_DATA, request[i++]); } } else { - for(; i< requestlen; i++) + for (; i < requestlen; i++) { - WRITEREG(REG_FIFO_DATA, request[i]); + WRITEREG(REG_FIFO_DATA, request[i]); } } @@ -476,66 +476,66 @@ } t2 = 0; - while((READREG(REG_IRQ0_STATE) & 0x08) == 0) + while ((READREG(REG_IRQ0_STATE) & 0x08) == 0) { t2++; - if(t2 > W_TIME_OUT) + if (t2 > W_TIME_OUT) { return EOT_SHOUT; } } - + SETBITMASK(REG_IRQ0_CLEAR, 0x40); CLEARBITMASK(REG_IRQ0_CLEAR, 0x40); - if(cmd == CMD_HLTA) + if (cmd == CMD_HLTA) { return EMV_ERR_NONE; } - t2=0; - while(1) + t2 = 0; + while (1) { t2++; - if((READREG(REG_IRQ0_STATE) & 0x01) != 0) + if ((READREG(REG_IRQ0_STATE) & 0x01) != 0) { return EMV_ERR_TIME_OUT; } - if((READREG(REG_IRQ0_STATE) & 0x04) != 0) + if ((READREG(REG_IRQ0_STATE) & 0x04) != 0) { break; } - if((READREG(REG_IRQ0_STATE) & 0x40) != 0) + if ((READREG(REG_IRQ0_STATE) & 0x40) != 0) { break; } - if(t2 > W_TIME_OUT) + if (t2 > W_TIME_OUT) { return EOT_SHOUT; } } - + t2 = 0; *responselen = 0; - while((READREG(REG_IRQ0_STATE) & 0x04) == 0) + while ((READREG(REG_IRQ0_STATE) & 0x04) == 0) { t2 ++; - if((READREG(REG_IRQ0_STATE) & 0x40) != 0) + if ((READREG(REG_IRQ0_STATE) & 0x40) != 0) { - for(i = 0; i < FIFO_LENGTH - WATER_LEVEL; i++) + for (i = 0; i < FIFO_LENGTH - WATER_LEVEL; i++) { - - if(*responselen > FSD) + + if (*responselen > FSD) { return EMV_ERR_OVERFLOW; } - if(*responselen < FSD) + if (*responselen < FSD) { response[*responselen] = READREG(REG_FIFO_DATA); } @@ -543,7 +543,7 @@ { READREG(REG_FIFO_DATA); } - + *responselen += 1; } @@ -552,34 +552,34 @@ CLEARBITMASK(REG_IRQ0_CLEAR, 0x40); } - if(t2 > W_TIME_OUT) + if (t2 > W_TIME_OUT) { - return EOT_SHOUT; + return EOT_SHOUT; } } len = READREG(REG_FIFO_LENGTH); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - if(*responselen > FSD) + if (*responselen > FSD) { - return EMV_ERR_OVERFLOW; + return EMV_ERR_OVERFLOW; } - if(*responselen < FSD) + if (*responselen < FSD) { - response[*responselen] = READREG(REG_FIFO_DATA); + response[*responselen] = READREG(REG_FIFO_DATA); } else { - READREG(REG_FIFO_DATA); + READREG(REG_FIFO_DATA); } - + *responselen += 1; } err_flag = READREG(REG_ERROR_FLAG); - if((err_flag & 0x80) || (err_flag & 0x04) || (err_flag & 0x02) || (err_flag & 0x01)) + if ((err_flag & 0x80) || (err_flag & 0x04) || (err_flag & 0x02) || (err_flag & 0x01)) { return EMV_ERR_TRANSMISSION; } @@ -595,9 +595,9 @@ * @retval Error code */ unsigned char YC_EMV_Contactless_L1_APDU_Transceive(const unsigned char *inf, - unsigned short inflen, - unsigned char *res, - unsigned short *reslen) + unsigned short inflen, + unsigned char *res, + unsigned short *reslen) { unsigned short i; @@ -622,9 +622,9 @@ unsigned char Recieving; unsigned char errno = EMV_ERR_NONE; - if(!inf || !res || !reslen) + if (!inf || !res || !reslen) { - return EMV_ERR_PARA; + return EMV_ERR_PARA; } #define ACK 0x0 @@ -648,16 +648,16 @@ }while(0) FSC = FSC_Table[FSCI]; - if(FSC > FSC_CHAINING) + if (FSC > FSC_CHAINING) { - FSC = FSC_CHAINING; + FSC = FSC_CHAINING; } *reslen = 0; - while(1) + while (1) { - if((inflen - Send_Offset) > FSC - 3) + if ((inflen - Send_Offset) > FSC - 3) { Send_Len = FSC - 3; PCB = 0x12; @@ -670,177 +670,177 @@ PCB |= Block_Num; Retran = 0; - send: +send: Swtx = 0; Time_Out = 0; Tran_Err = 0; Recieving = 0; errno = EMV_Transceive(CMD_IBLOCK, inf + Send_Offset, Send_Len, 0, Recv, &Recv_Len, 0); - check: - if(errno == EOT_SHOUT) +check: + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno == EMV_ERR_TIME_OUT) + if (errno == EMV_ERR_TIME_OUT) { Time_Out += 1; - if(Recieving) + if (Recieving) { - SendRB(ACK); + SendRB(ACK); } else { - SendRB(NAK); + SendRB(NAK); } goto check; } - if(errno == EMV_ERR_TRANSMISSION) + if (errno == EMV_ERR_TRANSMISSION) { Tran_Err += 1; - if(Recieving) + if (Recieving) { - SendRB(ACK); + SendRB(ACK); } else { - SendRB(NAK); + SendRB(NAK); } goto check; } - switch((Recv[0] >> 6) & 0x03) + switch ((Recv[0] >> 6) & 0x03) { - case I_BLOCK: - if(Recv_Len + 2 > FSD) //I-Block of length > FSD - { - return EMV_ERR_PROTOCOL; - } - if((Recv[0] & 0x20) || !(Recv[0] & 0x02)) //b6 must be 0, b2 must be 1. - { - return EMV_ERR_PROTOCOL; - } - if((Recv[0] & 0x08) || (Recv[0] & 0x04)) //CID and NAD are not allowed. - { - return EMV_ERR_PROTOCOL; - } - if((Recv[0] & 0x01) != Block_Num) - { - return EMV_ERR_PROTOCOL; - } + case I_BLOCK: + if (Recv_Len + 2 > FSD) //I-Block of length > FSD + { + return EMV_ERR_PROTOCOL; + } + if ((Recv[0] & 0x20) || !(Recv[0] & 0x02)) //b6 must be 0, b2 must be 1. + { + return EMV_ERR_PROTOCOL; + } + if ((Recv[0] & 0x08) || (Recv[0] & 0x04)) //CID and NAD are not allowed. + { + return EMV_ERR_PROTOCOL; + } + if ((Recv[0] & 0x01) != Block_Num) + { + return EMV_ERR_PROTOCOL; + } - if(!SendFinish()) - { - return EMV_ERR_PROTOCOL; - } + if (!SendFinish()) + { + return EMV_ERR_PROTOCOL; + } - Block_Num ^= 0x01; - *reslen += Recv_Len - 1; - for(i = 1; i < Recv_Len; i++) - { - (res + Recv_Offset)[i - 1] = Recv[i]; - } - Recv_Offset += Recv_Len - 1; + Block_Num ^= 0x01; + *reslen += Recv_Len - 1; + for (i = 1; i < Recv_Len; i++) + { + (res + Recv_Offset)[i - 1] = Recv[i]; + } + Recv_Offset += Recv_Len - 1; - if(Recv[0] & 0x10) - { - Swtx = 0; - Time_Out = 0; - Tran_Err = 0; - Recieving = 1; + if (Recv[0] & 0x10) + { + Swtx = 0; + Time_Out = 0; + Tran_Err = 0; + Recieving = 1; - SendRB(ACK); + SendRB(ACK); - goto check; - } - else - { - return EMV_ERR_NONE; - } + goto check; + } + else + { + return EMV_ERR_NONE; + } - case R_BLOCK: - if(!(Recv[0] & 0x20) || !(Recv[0] & 0x02)) - { - return EMV_ERR_PROTOCOL; - } - if((Recv[0] & 0x08) || (Recv[0] & 0x04)) - { - return EMV_ERR_PROTOCOL; - } - if(Recv[0] & 0x10) + case R_BLOCK: + if (!(Recv[0] & 0x20) || !(Recv[0] & 0x02)) + { + return EMV_ERR_PROTOCOL; + } + if ((Recv[0] & 0x08) || (Recv[0] & 0x04)) + { + return EMV_ERR_PROTOCOL; + } + if (Recv[0] & 0x10) + { + return EMV_ERR_PROTOCOL; + } + else + { + if (Recieving) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - else - { - if(Recieving) - { - return EMV_ERR_PROTOCOL; - } - if((Recv[0] & 0x01) != Block_Num) - { - if(++Retran > 2) - { - return EMV_ERR_PROTOCOL; - } + if ((Recv[0] & 0x01) != Block_Num) + { + if (++Retran > 2) + { + return EMV_ERR_PROTOCOL; + } - goto send; - } + goto send; + } - if(SendFinish()) - { - return EMV_ERR_PROTOCOL; - } + if (SendFinish()) + { + return EMV_ERR_PROTOCOL; + } - Block_Num ^= 0x01; - Send_Offset += Send_Len; - } + Block_Num ^= 0x01; + Send_Offset += Send_Len; + } break; - case S_BLOCK: - if(Recv[0] & 0x01) - { - return EMV_ERR_PROTOCOL; - } - if((Recv[0] & 0x04) || (Recv[0] & 0x08)) - { - return EMV_ERR_PROTOCOL; - } - if(!(Recv[0] & 0x02) || ((Recv[0] & 0x30) != 0x30)) - { - return EMV_ERR_PROTOCOL; - } + case S_BLOCK: + if (Recv[0] & 0x01) + { + return EMV_ERR_PROTOCOL; + } + if ((Recv[0] & 0x04) || (Recv[0] & 0x08)) + { + return EMV_ERR_PROTOCOL; + } + if (!(Recv[0] & 0x02) || ((Recv[0] & 0x30) != 0x30)) + { + return EMV_ERR_PROTOCOL; + } - WTXM = Recv[1] & 0x3f; - if((WTXM < 1) || (WTXM > 59)) - { - return EMV_ERR_PROTOCOL; - } + WTXM = Recv[1] & 0x3f; + if ((WTXM < 1) || (WTXM > 59)) + { + return EMV_ERR_PROTOCOL; + } - S_Block[0] = (S_BLOCK << 6) | 0x30 | 0x02; + S_Block[0] = (S_BLOCK << 6) | 0x30 | 0x02; - S_Block[1] = WTXM; + S_Block[1] = WTXM; - errno = EMV_Transceive(CMD_SBLOCK, S_Block, 2, 0, Recv, &Recv_Len, 0); + errno = EMV_Transceive(CMD_SBLOCK, S_Block, 2, 0, Recv, &Recv_Len, 0); - Swtx += 1; + Swtx += 1; goto check; - default: - return EMV_ERR_PROTOCOL; + default: + return EMV_ERR_PROTOCOL; } } } @@ -868,23 +868,23 @@ #if defined (SDK_DEBUG) PRINT("WUPA ->: %02x\r\n", WUPA[0]); #endif - Set_Receive_Parameters(RX_GAIN_18DB,RX_I_R_500); + Set_Receive_Parameters(RX_GAIN_18DB, RX_I_R_500); errno = EMV_Transceive(CMD_WUPA, WUPA, 1, 7, ATQA, &len, 0); - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { #if defined (SDK_DEBUG) PRINT("ATQA <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", ATQA[i]); + PRINT("%02x ", ATQA[i]); } PRINT("\r\n"); #endif - if(len != 2) + if (len != 2) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } } @@ -914,20 +914,20 @@ errno = EMV_Transceive(CMD_REQA, REQA, 1, 7, ATQA, &len, 0); - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { #if defined (SDK_DEBUG) PRINT("ATQA <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", ATQA[i]); + PRINT("%02x ", ATQA[i]); } PRINT("\r\n"); #endif - if(len != 2) + if (len != 2) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } } @@ -946,7 +946,7 @@ unsigned char YC_EMV_Contactless_L1_ANTICOLLISION(unsigned char cl) { unsigned char i; - unsigned short len =0; + unsigned short len = 0; unsigned char errno = EMV_ERR_NONE; unsigned char ANTICOLLISION[2]; unsigned char UID_CLn_Temp[FSD]; @@ -960,9 +960,9 @@ #if defined (SDK_DEBUG) PRINT("ANTICOLLISION ->: "); - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { - PRINT("%02x ", ANTICOLLISION[i]); + PRINT("%02x ", ANTICOLLISION[i]); } PRINT("\r\n"); #endif @@ -970,60 +970,60 @@ errno = EMV_Transceive(CMD_ANTICOLLISION, ANTICOLLISION, 2, 0, UID_CLn_Temp, &len, 0); #if defined (SDK_DEBUG) - PRINT("\r\n"); + PRINT("\r\n"); #endif CLEARBITMASK(REG_RX_BIT_CTRL, 0x10); SETBITMASK(REG_RX_BIT_CTRL, 0x08); - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { #if defined (SDK_DEBUG) PRINT("UID CLn <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", UID_CLn_Temp[i]); + PRINT("%02x ", UID_CLn_Temp[i]); } PRINT("\r\n"); #endif - if(len != 5) - { - return EMV_ERR_PROTOCOL; - } + if (len != 5) + { + return EMV_ERR_PROTOCOL; + } - if(UID_CLn_Temp[4] != (((UID_CLn_Temp[0] ^ UID_CLn_Temp[1]) ^ UID_CLn_Temp[2]) ^ UID_CLn_Temp[3])) - { - return EMV_ERR_TRANSMISSION; + if (UID_CLn_Temp[4] != (((UID_CLn_Temp[0] ^ UID_CLn_Temp[1]) ^ UID_CLn_Temp[2]) ^ UID_CLn_Temp[3])) + { + return EMV_ERR_TRANSMISSION; - } - switch(cl) + } + switch (cl) + { + case CL1: + for (i = 0; i < len; i++) { - case CL1: - for(i = 0; i < len; i++) - { - picc_a.UID_CLn[0][i] = UID_CLn_Temp[i]; - } - break; - - case CL2: - for(i = 0; i < len; i++) - { - picc_a.UID_CLn[1][i] = UID_CLn_Temp[i]; - } - break; + picc_a.UID_CLn[0][i] = UID_CLn_Temp[i]; + } + break; - case CL3: - for(i = 0; i < len; i++) - { - picc_a.UID_CLn[2][i] = UID_CLn_Temp[i]; - } - break; + case CL2: + for (i = 0; i < len; i++) + { + picc_a.UID_CLn[1][i] = UID_CLn_Temp[i]; + } + break; - default: - return EMV_ERR_PARA; + case CL3: + for (i = 0; i < len; i++) + { + picc_a.UID_CLn[2][i] = UID_CLn_Temp[i]; } + break; + + default: + return EMV_ERR_PARA; + } } return errno; @@ -1048,8 +1048,8 @@ * @retval Error code */ unsigned char YC_EMV_Contactless_L1_SELECT(unsigned char cl, - unsigned char *UID_complete, - unsigned char *ISOIEC14443_4_compliant) + unsigned char *UID_complete, + unsigned char *ISOIEC14443_4_compliant) { unsigned char i; unsigned short len = 0; @@ -1060,39 +1060,39 @@ SELECT[0] = cl; SELECT[1] = 0x70; - switch(cl) + switch (cl) { - case CL1: - for(i = 0; i < 5; i++) - { - SELECT[2 + i] = picc_a.UID_CLn[0][i]; - } + case CL1: + for (i = 0; i < 5; i++) + { + SELECT[2 + i] = picc_a.UID_CLn[0][i]; + } break; - case CL2: - for(i = 0; i < 5; i++) - { - SELECT[2 + i] = picc_a.UID_CLn[1][i]; - } + case CL2: + for (i = 0; i < 5; i++) + { + SELECT[2 + i] = picc_a.UID_CLn[1][i]; + } break; - case CL3: - for(i = 0; i < 5; i++) - { - SELECT[2 + i] = picc_a.UID_CLn[2][i]; - } + case CL3: + for (i = 0; i < 5; i++) + { + SELECT[2 + i] = picc_a.UID_CLn[2][i]; + } break; - default: - return EMV_ERR_PARA; + default: + return EMV_ERR_PARA; } #if defined (SDK_DEBUG) PRINT("SELECT ->: "); - for(i = 0; i < 7; i++) + for (i = 0; i < 7; i++) { - PRINT("%02x ", SELECT[i]); + PRINT("%02x ", SELECT[i]); } PRINT("\r\n"); #endif @@ -1100,30 +1100,30 @@ errno = EMV_Transceive(CMD_SELECT, SELECT, 7, 0, SAK, &len, 0); - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { #if defined (SDK_DEBUG) PRINT("SAK <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", SAK[i]); + PRINT("%02x ", SAK[i]); } PRINT("\r\n"); #endif - if(len != 1) + if (len != 1) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - if(UID_complete) + if (UID_complete) { - *UID_complete = (SAK[0] >> 2) & 0x01; + *UID_complete = (SAK[0] >> 2) & 0x01; } - if(ISOIEC14443_4_compliant) + if (ISOIEC14443_4_compliant) { - *ISOIEC14443_4_compliant = (SAK[0] >> 5) & 0x01; + *ISOIEC14443_4_compliant = (SAK[0] >> 5) & 0x01; } } @@ -1138,7 +1138,7 @@ unsigned char YC_EMV_Contactless_L1_RATS(void) { unsigned char i; - unsigned short len= 0; + unsigned short len = 0; unsigned char SFGI; unsigned char TA = 0, TB = 0, TC = 0; unsigned char errno = EMV_ERR_NONE; @@ -1154,27 +1154,27 @@ #if defined (SDK_DEBUG) PRINT("RATS ->: "); - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { - PRINT("%02x ", RATS[i]); + PRINT("%02x ", RATS[i]); } PRINT("\r\n"); #endif errno = EMV_Transceive(CMD_RATS, RATS, 2, 0, ATS, &len, 0); - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { #if defined (SDK_DEBUG) PRINT("ATS <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", ATS[i]); + PRINT("%02x ", ATS[i]); } PRINT("\r\n"); #endif - if(ATS[0] != len) + if (ATS[0] != len) { return EMV_ERR_PROTOCOL; } @@ -1182,9 +1182,9 @@ FWI = 4; FSCI = 2; - if(ATS[0] != 1) + if (ATS[0] != 1) { - if((ATS[1] & 0xf) > 0xc) + if ((ATS[1] & 0xf) > 0xc) { FSCI = 0xc; } @@ -1193,47 +1193,47 @@ FSCI = ATS[1] & 0xf; } - if(ATS[1] & 0x10) + if (ATS[1] & 0x10) { TA = 1; } - if(ATS[1] & 0x20) + if (ATS[1] & 0x20) { TB = 1; } - if(ATS[1] & 0x40) + if (ATS[1] & 0x40) { TC = 1; } - if(TA) + if (TA) { } - if(TB) + if (TB) { - if(((ATS[2+TA] >> 4) & 0x0f) == 15) + if (((ATS[2 + TA] >> 4) & 0x0f) == 15) { FWI = 4; } else { - FWI = (ATS[2+TA] >> 4) & 0x0f; + FWI = (ATS[2 + TA] >> 4) & 0x0f; } - if((ATS[2+TA] & 0x0f) == 15) + if ((ATS[2 + TA] & 0x0f) == 15) { } else { - SFGI = ATS[2+TA] & 0x0f; + SFGI = ATS[2 + TA] & 0x0f; WRITEREG(REG_T_PRESCAL_HI, (4480 >> 8) & 0x1f); WRITEREG(REG_T_PRESCAL_LO, 4480 & 0xff); @@ -1248,11 +1248,11 @@ WRITEREG(REG_T_CTRL, 0x01); WRITEREG(REG_T_CTRL, 0x00); - while((READREG(REG_IRQ0_STATE) & 0x01) == 0); + while ((READREG(REG_IRQ0_STATE) & 0x01) == 0); } } - if(TC) + if (TC) { } @@ -1279,9 +1279,9 @@ #if defined (SDK_DEBUG) PRINT("HLTA ->: "); - for(i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { - PRINT("%02x ", HLTA[i]); + PRINT("%02x ", HLTA[i]); } PRINT("\r\n"); #endif @@ -1315,9 +1315,9 @@ #if defined (SDK_DEBUG) PRINT("WUPB ->: "); - for(i = 0; i < 3; i++) + for (i = 0; i < 3; i++) { - PRINT("%02x ", WUPB[i]); + PRINT("%02x ", WUPB[i]); } PRINT("\r\n"); #endif @@ -1325,63 +1325,63 @@ errno = EMV_Transceive(CMD_WUPB, WUPB, 3, 0, ATQB, &len, 0); - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { #if defined (SDK_DEBUG) PRINT("ATQB <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", ATQB[i]); + PRINT("%02x ", ATQB[i]); } PRINT("\r\n"); #endif - if(ATQB[0] != 0x50) + if (ATQB[0] != 0x50) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - if(len < 12) + if (len < 12) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { - picc_b.PUPI[i] = ATQB[1 + i]; + picc_b.PUPI[i] = ATQB[1 + i]; } - if(((ATQB[10] >> 4) & 0xf) > 0xc) + if (((ATQB[10] >> 4) & 0xf) > 0xc) { - FSCI = 0xc; + FSCI = 0xc; } else { - FSCI = (ATQB[10] >> 4) & 0xf; + FSCI = (ATQB[10] >> 4) & 0xf; } - if(ISOIEC14443_4_compliant) + if (ISOIEC14443_4_compliant) { - *ISOIEC14443_4_compliant = ATQB[10] & 0x1; + *ISOIEC14443_4_compliant = ATQB[10] & 0x1; } - if((ATQB[10] & 0x8) != 0) + if ((ATQB[10] & 0x8) != 0) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - if(((ATQB[11] >> 4) & 0xf) == 15) + if (((ATQB[11] >> 4) & 0xf) == 15) { - FWI = 4; + FWI = 4; } else { - FWI = (ATQB[11] >> 4) & 0xf; + FWI = (ATQB[11] >> 4) & 0xf; } } return errno; @@ -1415,73 +1415,73 @@ #if defined (SDK_DEBUG) PRINT("REQB ->: "); - for(i = 0; i < 3; i++) + for (i = 0; i < 3; i++) { - PRINT("%02x ", REQB[i]); + PRINT("%02x ", REQB[i]); } PRINT("\r\n"); #endif errno = EMV_Transceive(CMD_REQB, REQB, 3, 0, ATQB, &len, 0); - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { - #if defined (SDK_DEBUG) +#if defined (SDK_DEBUG) PRINT("ATQB <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", ATQB[i]); + PRINT("%02x ", ATQB[i]); } PRINT("\r\n"); - #endif +#endif - if(ATQB[0] != 0x50) + if (ATQB[0] != 0x50) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - if(len < 12) + if (len < 12) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - for(i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { - picc_b.PUPI[i] = ATQB[1 + i]; + picc_b.PUPI[i] = ATQB[1 + i]; } - if(((ATQB[10] >> 4) & 0xf) > 0xc) + if (((ATQB[10] >> 4) & 0xf) > 0xc) { - FSCI = 0xc; + FSCI = 0xc; } else { - FSCI = (ATQB[10] >> 4) & 0xf; + FSCI = (ATQB[10] >> 4) & 0xf; } - if(ISOIEC14443_4_compliant) + if (ISOIEC14443_4_compliant) { - *ISOIEC14443_4_compliant = ATQB[10] & 0x1; + *ISOIEC14443_4_compliant = ATQB[10] & 0x1; } - if((ATQB[10] & 0x8) != 0) + if ((ATQB[10] & 0x8) != 0) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - if(((ATQB[11] >> 4) & 0xf) == 15) + if (((ATQB[11] >> 4) & 0xf) == 15) { - FWI = 4; + FWI = 4; } else { - FWI = (ATQB[11] >> 4) & 0xf; + FWI = (ATQB[11] >> 4) & 0xf; } } @@ -1521,37 +1521,37 @@ #if defined (SDK_DEBUG) PRINT("ATTRIB ->: "); - for(i = 0; i < 9; i++) + for (i = 0; i < 9; i++) { - PRINT("%02x ", ATTRIB[i]); + PRINT("%02x ", ATTRIB[i]); } PRINT("\r\n"); #endif errno = EMV_Transceive(CMD_ATTRIB, ATTRIB, 9, 0, ATTRIB_RES, &len, 0); - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { #if defined (SDK_DEBUG) PRINT("ATTRIB_RES <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", ATTRIB_RES[i]); + PRINT("%02x ", ATTRIB_RES[i]); } PRINT("\r\n"); #endif - if(len != 1) + if (len != 1) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } - if((ATTRIB_RES[0] & 0xf) != 0x00) + if ((ATTRIB_RES[0] & 0xf) != 0x00) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } @@ -1583,9 +1583,9 @@ #if defined (SDK_DEBUG) PRINT("HLTB ->: "); - for(i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { - PRINT("%02x ", HLTB[i]); + PRINT("%02x ", HLTB[i]); } PRINT("\r\n"); #endif @@ -1596,9 +1596,9 @@ #if defined (SDK_DEBUG) PRINT("HLTB_RES <-: "); - for(i = 0; i < len; i++) + for (i = 0; i < len; i++) { - PRINT("%02x ", HLTB_RES[i]); + PRINT("%02x ", HLTB_RES[i]); } PRINT("\r\n"); #endif @@ -1608,41 +1608,41 @@ static uint8_t EMV_Poll(void) { - uint8_t errno=0; + uint8_t errno = 0; Poll_Type.Type_A = 0; Poll_Type.Type_B = 0; - while(1) + while (1) { - if(!Poll_Type.Type_A) + if (!Poll_Type.Type_A) { Tp(); errno = YC_EMV_Contactless_L1_WUPA(); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno != EMV_ERR_TIME_OUT) + if (errno != EMV_ERR_TIME_OUT) { Poll_Type.Type_A = 1; YC_EMV_Contactless_L1_HLTA(); } - if(!Poll_Type.Type_B) + if (!Poll_Type.Type_B) { Tp(); errno = YC_EMV_Contactless_L1_WUPB(NULL); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { - return EOT_SHOUT; + return EOT_SHOUT; } - if(errno != EMV_ERR_TIME_OUT) + if (errno != EMV_ERR_TIME_OUT) { - Poll_Type.Type_B = 1; + Poll_Type.Type_B = 1; } } else @@ -1655,7 +1655,7 @@ break; } - if(!(Poll_Type.Type_A || Poll_Type.Type_B)) + if (!(Poll_Type.Type_A || Poll_Type.Type_B)) { return EMV_ERR_NO_CARD; } @@ -1676,19 +1676,19 @@ uint8_t cl; uint8_t UID_complete; uint8_t ISOIEC14443_4_compliant; - uint8_t retr=0; + uint8_t retr = 0; uint8_t errno = EMV_ERR_NONE; Tp(); - while(1) + while (1) { errno = YC_EMV_Contactless_L1_WUPA(); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { break; } @@ -1700,11 +1700,11 @@ { ++i; - if(i == 1) + if (i == 1) { cl = CL1; } - else if(i == 2) + else if (i == 2) { cl = CL2; } @@ -1714,15 +1714,15 @@ } retr = 0; - while(1) + while (1) { errno = YC_EMV_Contactless_L1_ANTICOLLISION(cl); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { break; } @@ -1731,15 +1731,15 @@ } retr = 0; - while(1) + while (1) { errno = YC_EMV_Contactless_L1_SELECT(cl, &UID_complete, &ISOIEC14443_4_compliant); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { break; } @@ -1747,23 +1747,23 @@ GeneralExceptionProcess(); } - if(!UID_complete) + if (!UID_complete) { - if(!ISOIEC14443_4_compliant) + if (!ISOIEC14443_4_compliant) { - return EMV_ERR_PROTOCOL; + return EMV_ERR_PROTOCOL; } break; } - if(i == 3) + if (i == 3) { return EMV_ERR_PROTOCOL; } } - while(i < 3); + while (i < 3); return errno; } @@ -1776,22 +1776,22 @@ unsigned char EMV_B_Collision_Detect(void) { uint8_t retr = 0; - uint8_t ISOIEC14443_4_compliant=0; + uint8_t ISOIEC14443_4_compliant = 0; uint8_t errno = EMV_ERR_NONE; Tp(); - while(1) + while (1) { errno = YC_EMV_Contactless_L1_WUPB(&ISOIEC14443_4_compliant); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { - if(!ISOIEC14443_4_compliant) + if (!ISOIEC14443_4_compliant) { return EMV_ERR_PROTOCOL; } @@ -1815,15 +1815,15 @@ { uint8_t errno = EMV_ERR_NONE; - if(Poll_Type.Type_A && Poll_Type.Type_B) + if (Poll_Type.Type_A && Poll_Type.Type_B) { return EMV_ERR_COLLISION; } - else if(Poll_Type.Type_A) + else if (Poll_Type.Type_A) { errno = EMV_A_Collision_Detect(); } - else if(Poll_Type.Type_B) + else if (Poll_Type.Type_B) { errno = EMV_B_Collision_Detect(); } @@ -1842,35 +1842,35 @@ uint8_t errno = EMV_ERR_NONE; errno = EMV_Poll(); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno != EMV_ERR_NONE) + if (errno != EMV_ERR_NONE) { return EMV_ERR_NO_CARD; } errno = EMV_Collision_General_Detect(); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { - if(Poll_Type.Type_A) + if (Poll_Type.Type_A) { - while(1) + while (1) { errno = YC_EMV_Contactless_L1_RATS(); - if(errno == EOT_SHOUT) + if (errno == EOT_SHOUT) { return EOT_SHOUT; } - if(errno == EMV_ERR_NONE) + if (errno == EMV_ERR_NONE) { break; } @@ -1878,23 +1878,23 @@ GeneralExceptionProcess(); } } - else if(Poll_Type.Type_B) + else if (Poll_Type.Type_B) { - while(1) - { - - errno = YC_EMV_Contactless_L1_ATTRIB(); - if(errno == EOT_SHOUT) - { - return EOT_SHOUT; - } - if(errno == EMV_ERR_NONE) - { - break; - } + while (1) + { - GeneralExceptionProcess(); + errno = YC_EMV_Contactless_L1_ATTRIB(); + if (errno == EOT_SHOUT) + { + return EOT_SHOUT; + } + if (errno == EMV_ERR_NONE) + { + break; } + + GeneralExceptionProcess(); + } } } @@ -1908,15 +1908,15 @@ */ static uint8_t EMV_PICC_Remove(void) { - if(Poll_Type.Type_A) + if (Poll_Type.Type_A) { YC_EMV_Contactless_L1_Switch_Card_Type(TYPE_A); Tp(); - while(YC_EMV_Contactless_L1_WUPA() != EMV_ERR_TIME_OUT) + while (YC_EMV_Contactless_L1_WUPA() != EMV_ERR_TIME_OUT) { - removea: +removea: YC_EMV_Contactless_L1_HLTA(); Tp(); @@ -1924,42 +1924,42 @@ Tretransmission(); - if(YC_EMV_Contactless_L1_WUPA() != EMV_ERR_TIME_OUT) + if (YC_EMV_Contactless_L1_WUPA() != EMV_ERR_TIME_OUT) { goto removea; } Tretransmission(); - if(YC_EMV_Contactless_L1_WUPA() != EMV_ERR_TIME_OUT) + if (YC_EMV_Contactless_L1_WUPA() != EMV_ERR_TIME_OUT) { goto removea; } return EMV_ERR_TIME_OUT; } - else if(Poll_Type.Type_B) + else if (Poll_Type.Type_B) { YC_EMV_Contactless_L1_Switch_Card_Type(TYPE_B); Tp(); - while(YC_EMV_Contactless_L1_WUPB(NULL) != EMV_ERR_TIME_OUT) + while (YC_EMV_Contactless_L1_WUPB(NULL) != EMV_ERR_TIME_OUT) { - removeb: +removeb: Tp(); } Tretransmission(); - if(YC_EMV_Contactless_L1_WUPB(NULL) != EMV_ERR_TIME_OUT) + if (YC_EMV_Contactless_L1_WUPB(NULL) != EMV_ERR_TIME_OUT) { goto removeb; } Tretransmission(); - if(YC_EMV_Contactless_L1_WUPB(NULL) != EMV_ERR_TIME_OUT) + if (YC_EMV_Contactless_L1_WUPB(NULL) != EMV_ERR_TIME_OUT) { goto removeb; } @@ -1981,23 +1981,23 @@ uint8_t res[FSD]; uint16_t reslen; - const uint8_t APDU_PPSE[] = {0x00,0xA4,0x04,0x00,0x0E, - 0x32,0x50,0x41,0x59,0x2E,0x53,0x59,0x53,0x2E,0x44,0x44,0x46,0x30,0x31, - 0x00 + const uint8_t APDU_PPSE[] = {0x00, 0xA4, 0x04, 0x00, 0x0E, + 0x32, 0x50, 0x41, 0x59, 0x2E, 0x53, 0x59, 0x53, 0x2E, 0x44, 0x44, 0x46, 0x30, 0x31, + 0x00 }; #if defined (SDK_DEBUG) PRINT("C-APDU ->: "); - for(i = 0; i < sizeof(APDU_PPSE); i++) + for (i = 0; i < sizeof(APDU_PPSE); i++) { - PRINT("%02x ", APDU_PPSE[i]); + PRINT("%02x ", APDU_PPSE[i]); } PRINT("\n"); #endif errno = YC_EMV_Contactless_L1_APDU_Transceive(APDU_PPSE, sizeof(APDU_PPSE), res, &reslen); - if(errno != EMV_ERR_NONE) + if (errno != EMV_ERR_NONE) { return errno; } @@ -2005,48 +2005,48 @@ #if defined (SDK_DEBUG) PRINT("R-APDU <-: "); - for(i = 0; i < reslen; i++) + for (i = 0; i < reslen; i++) { PRINT("%02x ", res[i]); } PRINT("\n"); #endif - while(1) + while (1) { - if(res[1] == 0x70) + if (res[1] == 0x70) { - return EOT_IND_REMOVE; + return EOT_IND_REMOVE; } - if(res[1] == 0x72) + if (res[1] == 0x72) { - return EOT_IND_POWER_OFF; + return EOT_IND_POWER_OFF; } #if defined (SDK_DEBUG) PRINT("C-APDU ->: "); - for(i = 0; i < reslen - 2; i++) + for (i = 0; i < reslen - 2; i++) { - PRINT("%02x ", res[i]); + PRINT("%02x ", res[i]); } PRINT("\n"); #endif errno = YC_EMV_Contactless_L1_APDU_Transceive(res, reslen - 2, res, &reslen); - if(errno != EMV_ERR_NONE) + if (errno != EMV_ERR_NONE) { - return errno; + return errno; } #if defined (SDK_DEBUG) PRINT("R-APDU <-: "); - for(i = 0; i < reslen; i++) + for (i = 0; i < reslen; i++) { - PRINT("%02x ", res[i]); + PRINT("%02x ", res[i]); } PRINT("\n"); #endif @@ -2101,7 +2101,7 @@ uint8_t tmp; tmp = READREG(REG_RSSI_CALC_CTRL); tmp = tmp & 0xfd; - tmp = tmp | ((en & 0x01)<<1); + tmp = tmp | ((en & 0x01) << 1); WRITEREG(REG_RSSI_CALC_CTRL, tmp); } @@ -2117,28 +2117,28 @@ } uint8_t dc_cali_i(void) { - uint8_t cali=0, dc=0, cnt = 0; - while(1) + uint8_t cali = 0, dc = 0, cnt = 0; + while (1) { cnt ++; force_dc_calc(); dc = get_dc_i(); cali = get_cali_i(); - if(cnt == 0xff) + if (cnt == 0xff) { return CALI_FAIL; } - if((dc <= DC_ACCEPT_RANGE) || (dc >= (256 - DC_ACCEPT_RANGE))) + if ((dc <= DC_ACCEPT_RANGE) || (dc >= (256 - DC_ACCEPT_RANGE))) { return CALI_OK; } - if((dc & 0x80) == 0) + if ((dc & 0x80) == 0) { - if((cali & 0x80) == 0) + if ((cali & 0x80) == 0) { - if(cali == 0) + if (cali == 0) { cali = 0x80; } @@ -2150,7 +2150,7 @@ } else { - if(cali == 0xff) + if (cali == 0xff) { cali = cali; } @@ -2163,9 +2163,9 @@ } else { - if((cali & 0x80) == 0) + if ((cali & 0x80) == 0) { - if(cali == 0x7f) + if (cali == 0x7f) { cali = 0x7f; } @@ -2176,7 +2176,7 @@ } else { - if(cali == 0x80) + if (cali == 0x80) { cali = 0x00; } @@ -2193,8 +2193,8 @@ } uint8_t dc_cali_q(void) { - uint8_t cali=0, dc=0, cnt=0; - while(1) + uint8_t cali = 0, dc = 0, cnt = 0; + while (1) { cnt ++; force_dc_calc(); @@ -2202,20 +2202,20 @@ cali = get_cali_q(); - if(cnt == 0xff) + if (cnt == 0xff) { return CALI_FAIL; } - if((dc <= DC_ACCEPT_RANGE) || (dc >= (256 - DC_ACCEPT_RANGE))) + if ((dc <= DC_ACCEPT_RANGE) || (dc >= (256 - DC_ACCEPT_RANGE))) { return CALI_OK; } - if((dc & 0x80) == 0) + if ((dc & 0x80) == 0) { - if((cali & 0x80) == 0) + if ((cali & 0x80) == 0) { - if(cali == 0) + if (cali == 0) { cali = 0x80; } @@ -2226,7 +2226,7 @@ } else { - if(cali == 0xff) + if (cali == 0xff) { cali = cali; } @@ -2238,9 +2238,9 @@ } else { - if((cali & 0x80) == 0) + if ((cali & 0x80) == 0) { - if(cali == 0x7f) + if (cali == 0x7f) { cali = 0x7f; } @@ -2251,7 +2251,7 @@ } else { - if(cali == 0x80) + if (cali == 0x80) { cali = 0x00; } @@ -2269,22 +2269,22 @@ void dc_cali_alg(uint8_t win_size) { - WRITEREG(REG_DA_RX_FLT_GRCK_EN, 0x00); - WRITEREG(REG_DA_TX_PA_EN, 0x00); - set_dc_win(win_size); + WRITEREG(REG_DA_RX_FLT_GRCK_EN, 0x00); + WRITEREG(REG_DA_TX_PA_EN, 0x00); + set_dc_win(win_size); WRITEREG(REG_TOP_CTRL, 0x11); set_rssi_calc_en(1); WRITEREG(REG_ADC_CTRL, 0x08); - WRITEREG(REG_RX_CTRL3, RX_CTRL3); - WRITEREG(REG_RX_CTRL4, RX_CTRL4); - WRITEREG(REG_RX_CTRL5, RX_CTRL5); + WRITEREG(REG_RX_CTRL3, RX_CTRL3); + WRITEREG(REG_RX_CTRL4, RX_CTRL4); + WRITEREG(REG_RX_CTRL5, RX_CTRL5); - Set_Receive_Parameters(RX_GAIN_18DB,RX_I_R_500); + Set_Receive_Parameters(RX_GAIN_18DB, RX_I_R_500); - if(CALI_OK == dc_cali_i()) + if (CALI_OK == dc_cali_i()) { gain_i_q_table[2][1] = get_cali_i(); } @@ -2292,7 +2292,7 @@ { gain_i_q_table[2][1] = 0; } - if(CALI_OK == dc_cali_q()) + if (CALI_OK == dc_cali_q()) { gain_i_q_table[2][2] = get_cali_q(); } @@ -2307,44 +2307,44 @@ { WRITEREG(REG_TX_PA_GAIN, PaGain); } -void Set_Receive_Parameters(unsigned char RxGain,unsigned char RfAtt) +void Set_Receive_Parameters(unsigned char RxGain, unsigned char RfAtt) { uint8_t val = 0; uint8_t i = 0; val = RxGain | RfAtt; WRITEREG(REG_RX_CTRL0, val); - switch(RxGain) + switch (RxGain) { - case RX_GAIN_6DB: - i = 0; + case RX_GAIN_6DB: + i = 0; break; - case RX_GAIN_12DB: - i = 1; + case RX_GAIN_12DB: + i = 1; break; - case RX_GAIN_18DB: - i = 2; + case RX_GAIN_18DB: + i = 2; break; - case RX_GAIN_24DB: - i = 3; + case RX_GAIN_24DB: + i = 3; break; - case RX_GAIN_30DB: - i = 4; + case RX_GAIN_30DB: + i = 4; break; - case RX_GAIN_36DB: - i = 5; + case RX_GAIN_36DB: + i = 5; break; - case RX_GAIN_42DB: - i = 6; + case RX_GAIN_42DB: + i = 6; break; - case RX_GAIN_48DB: - i = 7; + case RX_GAIN_48DB: + i = 7; break; - case RX_GAIN_54DB: - i = 8; + case RX_GAIN_54DB: + i = 8; break; - default: - i = 0; + default: + i = 0; break; } WRITEREG(REG_RX_CTRL1, gain_i_q_table[i][1]); Index: yc_nfc_common.h =================================================================== --- /YC3121_SDK/fw/sdk/yc_nfc/yc_nfc_common.h (revision 718) +++ /YC3121_SDK/fw/sdk/yc_nfc/yc_nfc_common.h (working copy) @@ -3,20 +3,20 @@ #define STOP 0x00 -#include "..\sdk\yc_uart.h" -#include "..\sdk\yc_gpio.h" -#include "..\sdk\yc_spi.h" -#include "..\sdk\yc_timer.h" +#include "yc_uart.h" +#include "yc_gpio.h" +#include "yc_spi.h" +#include "yc_timer.h" +#include "board_config.h" + #define __O volatile /*!< defines 'write only' permissions */ #define __IO volatile /*!< defines 'read / write' permissions */ -#define LED_ON() GPIO_ResetBits(GPIOA, GPIO_Pin_11) -#define LED_OFF() GPIO_SetBits(GPIOA, GPIO_Pin_11) +#define RST_Enable() GPIO_Config(NFC_RST_PORT, NFC_RST_PIN, OUTPUT_HIGH); +#define RST_Disable() GPIO_Config(NFC_RST_PORT, NFC_RST_PIN, OUTPUT_LOW); void Nfc_SysTick_Delay_Us(__IO uint32_t us); void Nfc_SysTick_Delay_Ms(__IO uint32_t ms); -void Nfc_UART_Init(void); -void Nfc_SPI_Init(void); void WRITEREG(uint8_t addr, uint8_t data); @@ -24,7 +24,4 @@ void YC_EMV_HwReset(void); - - - #endif Index: yc_nfc_common.c =================================================================== --- /YC3121_SDK/fw/sdk/yc_nfc/yc_nfc_common.c (revision 718) +++ /YC3121_SDK/fw/sdk/yc_nfc/yc_nfc_common.c (working copy) @@ -1,105 +1,66 @@ #include "yc_nfc_common.h" -void Nfc_SysTick_Delay_Us( uint32_t us) +void Nfc_SysTick_Delay_Us(uint32_t us) { - //((void(*)(int us))0x42bc+1)(us); - delay_us(us); + //((void(*)(int us))0x42bc+1)(us); + delay_us(us); } -void Nfc_SysTick_Delay_Ms( uint32_t ms) +void Nfc_SysTick_Delay_Ms(uint32_t ms) { - //((void(*)(int ms))0x42e0+1)(ms); - delay_ms(ms); + //((void(*)(int ms))0x42e0+1)(ms); + delay_ms(ms); } -#define uartBaud 921600 -void Nfc_UART_Init(void) -{ - UART_InitTypeDef UART_InitStruct; - - /* Configure serial ports RX and TX for IO. */ - GPIO_Config(GPIOA, GPIO_Pin_1, UART0_TXD); - GPIO_Config(GPIOA, GPIO_Pin_0, UART0_RXD); - - UART_InitStruct.BaudRate = uartBaud; - UART_InitStruct.DataBits = Databits_8b; - UART_InitStruct.StopBits = StopBits_1; - UART_InitStruct.Parity = Parity_None; - UART_InitStruct.FlowCtrl = FlowCtrl_None; - UART_InitStruct.Mode = Mode_duplex; - - UART_Init(UART0, &UART_InitStruct); -} -void Nfc_SPI_Init(void) -{ - SPI_InitTypeDef SPI_InitStruct; - SPI_InitStruct.Mode = SPI_Mode_Master; - SPI_InitStruct.BaudRatePrescaler = SPI_BaudRatePrescaler_4; - SPI_InitStruct.CPHA = SPI_CPHA_First_Edge; - SPI_InitStruct.CPOL = SPI_CPOL_Low; - SPI_InitStruct.RW_Delay = 1; - - GPIO_Config(GPIOB, GPIO_Pin_2, SPID0_MISO); - GPIO_Config(GPIOB, GPIO_Pin_1, SPID0_MOSI); - GPIO_Config(GPIOB, GPIO_Pin_6, SPID0_NCS); - GPIO_Config(GPIOB, GPIO_Pin_0, SPID0_SCK); - - SPI_Init(SPI0, &SPI_InitStruct); -} - - - /************************** Communication Interface ***************** -Start- */ -#define RST_Enable() GPIO_Config(GPIOA, GPIO_Pin_4, OUTPUT_LOW); -#define RST_Disable() GPIO_Config(GPIOA, GPIO_Pin_4, OUTPUT_HIGH); /* Hardware reset */ void YC_EMV_HwReset(void) { - RST_Enable(); + RST_Disable() Nfc_SysTick_Delay_Ms(5); - RST_Disable(); + RST_Enable() Nfc_SysTick_Delay_Ms(20); } void WRITEREG(uint8_t addr, uint8_t data) { - uint8_t flag = 0,ucbuf[3] = {0}; - if(addr & 0x80) //page1 - { - flag = 1; - ucbuf[0] = ((0x00<<1) & 0xFE); - ucbuf[1] = 0x01; - SPI_SendBuff(SPI0,ucbuf,2); - } - ucbuf[0] = ((addr<<1) & 0xFE); - ucbuf[1] = data; - SPI_SendBuff(SPI0,ucbuf,2); - if (flag) - { - ucbuf[0] = ((0x00<<1) & 0xFE); - ucbuf[1] = 0x00; - SPI_SendBuff(SPI0,ucbuf,2); - } + uint8_t flag = 0, ucbuf[3] = {0}; + if (addr & 0x80) //page1 + { + flag = 1; + ucbuf[0] = ((0x00 << 1) & 0xFE); + ucbuf[1] = 0x01; + SPI_SendBuff(NFC_SPI, ucbuf, 2); + } + ucbuf[0] = ((addr << 1) & 0xFE); + ucbuf[1] = data; + SPI_SendBuff(NFC_SPI, ucbuf, 2); + if (flag) + { + ucbuf[0] = ((0x00 << 1) & 0xFE); + ucbuf[1] = 0x00; + SPI_SendBuff(NFC_SPI, ucbuf, 2); + } } uint8_t READREG(uint8_t addr) { - uint8_t reg = 0xFF,ucbuf[3] = {0}; - uint8_t flag = 0; - if(addr & 0x80) //page1 - { - flag = 1; - ucbuf[0] = ((0x00<<1) & 0xFE); - ucbuf[1] = 0x01; - SPI_SendBuff(SPI0,ucbuf,2); - } - ucbuf[0] = (((addr<<1) & 0xFE) | 0x01); - SPI_SendAndReceiveData(SPI0, ucbuf, 1, ®, 1); - if (flag) - { - ucbuf[0] = ((0x00<<1) & 0xFE); - ucbuf[1] = 0x00; - SPI_SendBuff(SPI0,ucbuf,2); - } - return reg; + uint8_t reg = 0xFF, ucbuf[3] = {0}; + uint8_t flag = 0; + if (addr & 0x80) //page1 + { + flag = 1; + ucbuf[0] = ((0x00 << 1) & 0xFE); + ucbuf[1] = 0x01; + SPI_SendBuff(NFC_SPI, ucbuf, 2); + } + ucbuf[0] = (((addr << 1) & 0xFE) | 0x01); + SPI_SendAndReceiveData(NFC_SPI, ucbuf, 1, ®, 1); + if (flag) + { + ucbuf[0] = ((0x00 << 1) & 0xFE); + ucbuf[1] = 0x00; + SPI_SendBuff(NFC_SPI, ucbuf, 2); + } + return reg; }