Index: ICCard/ICCard/prj/MDK/Objects/YC3121_Keil.axf =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: ICCard/ICCard/prj/MDK/Objects/YC3121_Keil.axf ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ICCard/ICCard/prj/MDK/YC3121_Keil.uvoptx =================================================================== --- /YC3121_demo/ModuleDemo/ICCard/ICCard/prj/MDK/YC3121_Keil.uvoptx (nonexistent) +++ /YC3121_demo/ModuleDemo/ICCard/ICCard/prj/MDK/YC3121_Keil.uvoptx (working copy) @@ -0,0 +1,337 @@ + + + + 1.0 + +
### uVision Project, (C) Keil Software
+ + + *.c + *.s*; *.src; *.a* + *.obj; *.o + *.lib + *.txt; *.h; *.inc + *.plm + *.cpp + 0 + + + + 0 + 0 + + + + YC3121 + 0x4 + ARM-ADS + + 12000000 + + 1 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + .\Listings\ + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 1 + + 0 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 4 + + + + + + + + + + ..\..\..\..\..\ConfigFiles\MDK\flash.ini + Segger\JL2CM3.dll + + + + 0 + JL2CM3 + -U4294967295 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO31 -FD20000 -FCA000 -FN1 -FF0YC3121 -FS01000000 -FL080000 + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000) + + + + + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + + + + core + 1 + 0 + 0 + 0 + + 1 + 1 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\core\misc.c + misc.c + 0 + 0 + + + 1 + 2 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\core\system.c + system.c + 0 + 0 + + + + + main + 1 + 0 + 0 + 0 + + 2 + 3 + 1 + 0 + 0 + 0 + ..\..\user\main.c + main.c + 0 + 0 + + + 2 + 4 + 1 + 0 + 0 + 0 + ..\..\user\bt_code.c + bt_code.c + 0 + 0 + + + + + sdk + 1 + 0 + 0 + 0 + + 3 + 5 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_gpio.c + yc_gpio.c + 0 + 0 + + + 3 + 6 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_uart.c + yc_uart.c + 0 + 0 + + + 3 + 7 + 1 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_timer.c + yc_timer.c + 0 + 0 + + + + + startup + 1 + 0 + 0 + 0 + + 4 + 8 + 2 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\startup\flash_start.s + flash_start.s + 0 + 0 + + + 4 + 9 + 2 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\startup\startup.s + startup.s + 0 + 0 + + + + + ICCard + 1 + 0 + 0 + 0 + + 5 + 10 + 4 + 0 + 0 + 0 + ..\..\..\..\..\Librarier\sdk\yc_7816\yc_7816.lib + yc_7816.lib + 0 + 0 + + + + Index: ICCard/ICCard/prj/MDK/YC3121_Keil.uvprojx =================================================================== --- /YC3121_demo/ModuleDemo/ICCard/ICCard/prj/MDK/YC3121_Keil.uvprojx (revision 570) +++ /YC3121_demo/ModuleDemo/ICCard/ICCard/prj/MDK/YC3121_Keil.uvprojx (working copy) @@ -16,7 +16,7 @@ ARMCM0 ARM - ARM.CMSIS.5.3.0 + ARM.CMSIS.5.5.1 http://www.keil.com/pack/ IRAM(0x20000000,0x00020000) IROM(0x00000000,0x00040000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE @@ -134,10 +134,10 @@ 1 1 1 - 4100 + 4096 - 0 - Segger\JL2CM3.dll + 1 + BIN\UL2CM3.DLL "" () @@ -337,7 +337,7 @@ __USEKEILCOMPILE__ - ..\..\..\..\..\Librarier\core;..\..\..\..\..\Librarier\sdk;..\..\..\..\..\Librarier\yc_7816 + ..\..\..\..\..\Librarier\core;..\..\..\..\..\Librarier\sdk;..\..\..\..\..\Librarier\sdk\yc_7816 @@ -387,11 +387,6 @@ ..\..\..\..\..\Librarier\core\misc.c - rom_main.c - 1 - ..\..\..\..\..\Librarier\core\rom_main.c - - system.c 1 ..\..\..\..\..\Librarier\core\system.c @@ -452,24 +447,9 @@ ICCard - yc_7816.c - 1 - ..\..\..\..\..\Librarier\yc_7816\yc_7816.c - - - yc_7816_comm.c - 1 - ..\..\..\..\..\Librarier\yc_7816\yc_7816_comm.c - - - yc_7816_T0.c - 1 - ..\..\..\..\..\Librarier\yc_7816\yc_7816_T0.c - - - yc_7816_T1.c - 1 - ..\..\..\..\..\Librarier\yc_7816\yc_7816_T1.c + yc_7816.lib + 4 + ..\..\..\..\..\Librarier\sdk\yc_7816\yc_7816.lib Index: ICCard/ICCard/user/main.c =================================================================== --- /YC3121_demo/ModuleDemo/ICCard/ICCard/user/main.c (revision 570) +++ /YC3121_demo/ModuleDemo/ICCard/ICCard/user/main.c (working copy) @@ -1,10 +1,10 @@ /** ****************************************************************************** - * @file 3121Demo\ModuleDemo\UART\UART_TX_Sendbuf\user\main.c + * @file 3121Demo\ModuleDemo\ICCard\ICCard\user\main.c * @author Yichip Application Team * @version V1.0.0 - * @date 15-July-2019 - * @brief UART TX SendBuf test program. + * @date 9-Feb-2020 + * @brief ICCard test program. ****************************************************************************** * @attention * @@ -25,6 +25,7 @@ #include "yc3121.h" #include "yc_gpio.h" #include "yc_uart.h" +#include "yc_timer.h" #include "yc_7816.h" /* Private typedef -----------------------------------------------------------*/ @@ -36,6 +37,24 @@ /* Private function prototypes -----------------------------------------------*/ void UART_Configuration(void); void UART_Sendbuf_test(void); +uint16_t ISO7816_loopBack(void); + +void ISO7816_IO_Config(void) +{ + sci_pin.clk.gpio_group = GPIOC; + sci_pin.clk.gpio_pin = GPIO_Pin_13; + + sci_pin.io.gpio_group = GPIOC; + sci_pin.io.gpio_pin = GPIO_Pin_14; + + sci_pin.reset.gpio_group = GPIOC; + sci_pin.reset.gpio_pin = GPIO_Pin_15; + + sci_pin.detect.gpio_group = GPIOC; + sci_pin.detect.gpio_pin = GPIO_Pin_12; + + sci_pin.detect_state = 1; +} /** * @brief Main program @@ -48,10 +67,11 @@ MyPrintf("7816 Demo !\n\n"); - ISO7816_LoopBack(); + ISO7816_IO_Config(); + while (1) { - + ISO7816_loopBack(); } } @@ -86,4 +106,194 @@ UART_Init(UART0, &UART_InitStruct); } + +uint16_t ISO7816_loopBack(void) +{ + uint8_t Reg_Int1; + uint8_t ATRLen; + uint16_t Ret; + uint16_t RecLen; + uint16_t SendLen; + uint8_t ApduCmd[280]; + + uint8_t SELECT_PSE[] = {0x00,0xA4,0x04,0x00,0x0E, + 0x31,0x50,0x41,0x59,0x2E,0x53,0x59,0x53,0x2E,0x44,0x44,0x46,0x30,0x31,0x00}; /* SELECT_PPSE */ + uint8_t i=0; + + atr_time_start(); + +TOResetCard: +#if 1 + delay_ms(1000); //1s +#endif + + //激活卡片 + Ret = ISO7816_OperateSelect(ISO7816_ACTIVE_CARD); + if(Ret == ISO7816_CARD_STUTES_ERROR) + { + goto TOResetCard; + } + +TOWarmResetCard: + //接收复位信息 + Ret = ISO7816_GetAtr(&g_7816Para.aAtr[1], &ATRLen); + + //清除atr相关计算器 + if(OK != Ret) + { + if((ISO7816_ATR_LEN_ERROR == Ret)) + { + if((g_7816Para.bFlag & BIT1) == 0) + { + delay_ms(10); + + ISO7816_OperateSelect(ISO7816_WARM_RESET); + goto TOWarmResetCard; + } + + } + iso7816_deactive(); + delay_ms(5); + goto TOResetCard; + } + + g_7816Para.aAtr[0] = ATRLen; + delay_ms(50); + + //自动发送C0 + g_7816Para.bFlag |= BIT2; + memset(&g_T1.bIFSC, 0, sizeof(g_T1)); + + g_T1.bIFSC = 32; + //ATR数据处理 + Ret = ISO7816_DisposeATR(&g_7816Para.aAtr[1], ATRLen); + if(OK != Ret) + { + if((Ret == ISO7816_ATR_TA1_ERROR) || (Ret == ISO7816_ATR_TB1_ERROR) + || (Ret == ISO7816_ATR_TB3_ERROR) || (Ret == ISO7816_ATR_TA3_ERROR) + || (Ret == ISO7816_ATR_TC2_ERROR) || (Ret == ISO7816_ATR_TC3_ERROR) + || (Ret == ISO7816_ATR_TA2_ERROR) || (Ret == ISO7816_ATR_TD2_ERROR) + || (Ret == ISO7816_ATR_TB2_ERROR) ) + { + if((g_7816Para.bFlag & BIT1) == 0) + { + ISO7816_OperateSelect(ISO7816_WARM_RESET); + goto TOWarmResetCard; + } + else + { + ISO7816_OperateSelect(ISO7816_DEACTIVE_CARD); + delay_ms(10); + goto TOResetCard; + } + } + else + { + ISO7816_OperateSelect(ISO7816_DEACTIVE_CARD); + delay_ms(10); + goto TOResetCard; + } + } + + ISO7816_config_mode_fun(); + + #ifdef DEBUG_7816_EMV + MyPrintf("reset ok\n"); + #endif + + //处理pps + if((g_7816Para.bFlag & BIT0) == 1) + { + if(g_7816Para.bTA1 != 0x11) + { + Ret = ISO7816_DisposePPS(g_7816Para.bTA1); + if(OK != Ret) + { + ISO7816_OperateSelect(ISO7816_DEACTIVE_CARD); + delay_ms(10); + goto TOResetCard; + } + } + } + + memcpy(ApduCmd,SELECT_PSE,20); + SendLen= 20; + + //t1 + if(g_7816Para.bProlType == 1) + { + uint8_t TmpCmd[5]; + //??IFSD + g_T1.bIFSD = 254; + TmpCmd[0] = 254; + + Ret = ISO7816_TPDU_T1Send(TmpCmd, 1, T_S_IFS); + if(Ret != OK) + { + ISO7816_OperateSelect( ISO7816_DEACTIVE_CARD); + delay_ms(10); + goto TOResetCard; + } + } + +TOSendCMD: + delay_ms(2); + + #ifdef DEBUG_7816_EMV + MyPrintf("cmd\n"); + #endif + Ret = ISO7816_Dispose_CMD(ApduCmd, SendLen, g_7816Para.aRecBuff, &RecLen); + if(OK != Ret) + { + if((ISO7816_PARITY_ERROR == Ret)) + { + ISO7816_OperateSelect(ISO7816_WARM_RESET); + delay_ms(10); + goto TOWarmResetCard; + } + + ISO7816_OperateSelect( ISO7816_DEACTIVE_CARD); + delay_ms(10); + goto TOResetCard; + + } + #ifdef DEBUG_7816_EMV + MyPrintf("cmd ok\n"); + #endif + delay_ms(2); + + if(RecLen >= 6) + { + if(g_7816Para.aRecBuff[1] == 0x70) + { + ISO7816_OperateSelect(ISO7816_DEACTIVE_CARD); + delay_ms(100); + goto TOResetCard; + } + else + { + SendLen = RecLen-2; + memcpy(ApduCmd,g_7816Para.aRecBuff,SendLen); + + delay_ms(2); + goto TOSendCMD; + } + } + else + { + if(g_7816Para.aRecBuff[0] == 0xff) + { + ISO7816_OperateSelect(ISO7816_DEACTIVE_CARD); + delay_ms(10); + goto TOResetCard; + } + } + + delay_ms(2); + + memcpy(ApduCmd,SELECT_PSE,20); + SendLen= 20; + goto TOSendCMD ; +} + /************************ (C) COPYRIGHT Yichip Microelectronics *****END OF FILE****/ \ No newline at end of file