Index: yc_msr/libyc_msr.a
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: yc_msr/libyc_msr.a
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: yc_msr/yc_msr.c
===================================================================
--- /YC3121_SDK/fw/sdk/yc_msr/yc_msr.c	(revision 602)
+++ /YC3121_SDK/fw/sdk/yc_msr/yc_msr.c	(working copy)
@@ -19,8 +19,8 @@
 unsigned char T2data_buf[MAX_TRACK_RAW_DATA_SZIE] ={0};
 unsigned char T3data_buf[MAX_TRACK_RAW_DATA_SZIE] ={0};
 
-static swiping_direction SwipDirectionConfig =SD_BIDIRECTION;  //Óû§ÅäÖÃË¢¿¨·½Ïò
-static swiping_direction SwipDirection =SD_FORWARD_DIRECTION;  //ʵ¼ÊË¢¿¨·½Ïò
+static swiping_direction SwipDirectionConfig =SD_BIDIRECTION;  //�û�����ˢ������
+static swiping_direction SwipDirection =SD_FORWARD_DIRECTION;  //ʵ��ˢ������
 
 static uint8_t  TrackDataHead[3] = {0x45,0x0B,0x0B};//1,0,0,0,1,0,1   ,0,1,0,1,1     0,1,0,1,1
 static uint8_t  TrackDataEnd[3]  = {0x1F,0x1F,0x1F};//0,0,1,1,1,1,1    1,1,1,1,1      1,1,1,1,1
@@ -78,8 +78,8 @@
 }MSR_DataStruct;
  MSR_DataStruct MsrData;
 
-#define indexadd(a,b) ((b)<4)?((b)++):((a)++, (b)=0)//a:bufindex,b:bitindex£» bufindexÊǵ±Ç°¼ìË÷µÄ×Ö½ÚÊý£¬bitindexÊÇÔÚµ±Ç°×Ö½ÚµÄÓÐЧλ
-#define indexdec(a,b) ((b)>0)?((b)--):((a)--, (b)=4)//·´ÏòË¢¿¨µÄË÷ÒýÒƶ¯
+#define indexadd(a,b) ((b)<4)?((b)++):((a)++, (b)=0)//a:bufindex,b:bitindex�� bufindex�ǵ�ǰ�������ֽ�����bitindex���ڵ�ǰ�ֽڵ���Чλ
+#define indexdec(a,b) ((b)>0)?((b)--):((a)--, (b)=4)//����ˢ���������ƶ�
 
 static uint8_t  get_data_bit(uint8_t data, int bitindex)
 {
@@ -101,7 +101,7 @@
 	switch(direction)
 	{
 		case SD_FORWARD_DIRECTION:
-			while( bitnum < CodingBits)     //ÔÚ°üÍ·µÄ³¤¶ÈÄÚ¶ÁÈ¡¶ÔӦλµÄÊý¾Ý
+			while( bitnum < CodingBits)     //�ڰ�ͷ�ij����ڶ�ȡ��Ӧλ������
 			{
 				if( 1 == get_data_bit(InputBuf[bufindex], bitindex)  )
 				getchar |=  (1<<bitnum);
@@ -185,11 +185,11 @@
 	uint8_t LRCData=0x00;
 	for (int i = 0; i < len-1; i++)
   	{
-  		if(CodingBits==5)	data[i]&=0x0F;//ÆæżУÑéλ²»²ÎÓëLRCУÑé
+  		if(CodingBits==5)	data[i]&=0x0F;//��żУ��λ������LRCУ��
 		else	data[i]&=0x3F;
 
   		LRCData ^=  data[i];
-  		if(CodingBits==5)	data[i]+=0x30;//±àÂëת»»
+  		if(CodingBits==5)	data[i]+=0x30;//����ת��
 		else	data[i]+=0x20;
  	 }
  	 if(CodingBits==5)	data[len-1]&=0x0F;
@@ -238,7 +238,7 @@
 		CodingBits: one data size
 		direction: swipcard direction
 		track: the track you select ,it will equal to TRACK_SELECT_1,TRACK_SELECT_2 or TRACK_SELECT_3
-		OutputBuf£ºdecoding data
+		OutputBuf��decoding data
 		Outlen: decoding data length 
 
 * @retval 
@@ -257,7 +257,7 @@
 	{
 		return TRACK_NO_DATA;          
 	}
-	int TempDirection=SD_FORWARD_DIRECTION, HeadIndex=0;//ĬÈÏ°´ÕÕÕýÏò½âÂ룬
+	int TempDirection=SD_FORWARD_DIRECTION, HeadIndex=0;//Ĭ�ϰ���������룬
 	int bufindex = 0;
 	int bitindex = 0;
 	uint8_t tempdata = 0;
@@ -276,7 +276,7 @@
 	#endif
 	
 	
-//ÕýÏòÕÒµ½ÁËÍ· ¾ÍÏÈÕý½â
+//�����ҵ���ͷ ��������
 
 	SwipDirection=SD_FORWARD_DIRECTION;
 		
@@ -295,13 +295,13 @@
 			{	
 					if(get_data_bit( InputBuf[bufindex], bitindex))
 					{
-						tempdata|= 1<<getbinarynum;    //×îÖÕ»ñµÃ5¸öbitµÄÊý×ÖÖµ£¬ÓÃÓÚÆæżУÑé
+						tempdata|= 1<<getbinarynum;    //���ջ��5��bit������ֵ��������żУ��
 					}
 					getbinarynum++;
-					indexadd(bufindex,bitindex);	//#define indexadd(a,b) ((b)<4)?((b)++):((a)++, (b)=0)bufindexÊǵ±Ç°¼ìË÷µÄ×Ö½ÚÊý£¬bitindexÊÇÔÚµ±Ç°×Ö½ÚµÄÓÐЧλ
+					indexadd(bufindex,bitindex);	//#define indexadd(a,b) ((b)<4)?((b)++):((a)++, (b)=0)bufindex�ǵ�ǰ�������ֽ�����bitindex���ڵ�ǰ�ֽڵ���Чλ
 			}
 
-			if(!MSR_OddEvenCheck(tempdata,CodingBits))                   //ÆæУÑ飬Èç¹û´íÎóÔò½øÈëÖ´ÐÐ
+			if(!MSR_OddEvenCheck(tempdata,CodingBits))                   //��У�飬������������ִ��
 			{
 				#ifdef MSR_DEBUG
 				MyPrintf("Forward direction Odd Even Check error bufindex:%d  bitindex %d data:%02X\n",bufindex,bitindex,tempdata);
@@ -310,7 +310,7 @@
 				rtnvalue = PARITY_ERR;
 				break;
 			}
-			OutputBuf[(*OutLen)++] = tempdata;     //ÆæУÑéͨ¹ý
+			OutputBuf[(*OutLen)++] = tempdata;     //��У��ͨ��
 
 			if(*(OutLen) >MAX_TRACK_DATA_SIZE)
 			{
@@ -323,7 +323,7 @@
 			}
 			else
 			{
-				if(OutputBuf[(*OutLen)-1] == end)//ÕÒµ½Í£Ö¹Î»°
+				if(OutputBuf[(*OutLen)-1] == end)//�ҵ�ֹͣλ�
 				{
 					tempdata = 0;
 					getbinarynum = 0;
@@ -351,7 +351,7 @@
 					}
 					if(MSR_LRCCheck(OutputBuf, ((*OutLen)+1), CodingBits))
 					{
-						OutputBuf[*OutLen] = 0x00;//ÌÞ³ýLRCУÑéλ
+						OutputBuf[*OutLen] = 0x00;//�޳�LRCУ��λ
 						if((TempDirection==SwipDirectionConfig) ||(SwipDirectionConfig==SD_BIDIRECTION))
 						{
 							return MSR_SUCCESS;
@@ -380,7 +380,7 @@
 	}
 
 	
-//·´Ïò½âÂëÆðʼλÖÃ
+//���������ʼλ��
 	SwipDirection = SD_REVERSE_DIRECTION;
 	TempDirection = SD_REVERSE_DIRECTION;
 	HeadIndex=MSR_GetHeadIndex(InputBuf,InPutLen, head, end, CodingBits,&TempDirection);
@@ -437,7 +437,7 @@
 		}
 		else
 		{
-			if(OutputBuf[(*OutLen)-1] == end)//ÕÒµ½Í£Ö¹Î»
+			if(OutputBuf[(*OutLen)-1] == end)//�ҵ�ֹͣλ
 			{
 				tempdata = 0;
 				getbinarynum = 0;
@@ -465,7 +465,7 @@
 				
 				if(MSR_LRCCheck(OutputBuf, ((*OutLen)+1), CodingBits))
 				{
-					OutputBuf[*OutLen]=0x00;//ÌÞ³ýLRCУÑéλ
+					OutputBuf[*OutLen]=0x00;//�޳�LRCУ��λ
 					if(TempDirection==SwipDirectionConfig||SwipDirectionConfig==SD_BIDIRECTION)
 					{
 						return MSR_SUCCESS;
@@ -496,8 +496,12 @@
  uint8_t MSR_GetDecodeData(track_data  *ptrack, uint8_t options, uint8_t *cfmt, uint8_t *tflag)
  {
  	uint8_t result[3];
- 	int i; 
- 	if(options&TRACK_SELECT_1||options&TRACK_SELECT_ALL)   //Ñ¡Ôñ´ÅµÀÒ»»òÈ«²¿´ÅµÀ
+	int i; 
+	*tflag = 0;
+	*cfmt =0;
+	 memset((char*)ptrack,0,sizeof(ptrack));
+
+ 	if(options&TRACK_SELECT_1||options&TRACK_SELECT_ALL)   //ѡ��ŵ�һ��ȫ���ŵ�
  	{
  		#if defined (MSR_DEBUG) 
  		MyPrintf("\nstart track1 decode\n");
@@ -660,11 +664,11 @@
 				new_track_data_num[i]=ISO7811_GetTrackDataNum(1<<i);
 				if(old_track_data_num[i]!=new_track_data_num[i])
 				{
-					return DETECT_NO_SWIPING_CARD;//ÔÚË¢¿¨
+					return DETECT_NO_SWIPING_CARD;//��ˢ��
 				}
 				else
 				{
-					//ûÓÐdone¡¢char_num²»Îª0¡¢Ò»¶Îʱ¼äÒ²²»±ä»¯£¬ÔòÈÏΪÊÇÂÒµÄÊý¾Ý
+					//û��done��char_num��Ϊ0��һ��ʱ��Ҳ���仯������Ϊ���ҵ�����
 					MSR_ENABLE(DISABLE);
 					MSR_ENABLE(ENABLE);
 					return DETECT_NO_SWIPING_CARD;
@@ -737,11 +741,11 @@
 				new_track_data_num[i]=ISO7811_GetTrackDataNum(1<<i);
 				if(old_track_data_num[i]!=new_track_data_num[i])
 				{
-					return DETECT_NO_SWIPING_CARD;//ÔÚË¢¿¨
+					return DETECT_NO_SWIPING_CARD;//��ˢ��
 				}
 				else
 				{
-					//ûÓÐdone¡¢char_num²»Îª0¡¢Ò»¶Îʱ¼äÒ²²»±ä»¯£¬ÔòÈÏΪÊÇÂÒµÄÊý¾Ý
+					//û��done��char_num��Ϊ0��һ��ʱ��Ҳ���仯������Ϊ���ҵ�����
 					MSR_ENABLE(DISABLE);
 					MSR_ENABLE(ENABLE);
 					return DETECT_NO_SWIPING_CARD;
@@ -1005,7 +1009,7 @@
 
 /**
  * @brief	:Channel select signal for 3 tracks 
- * @param £ºT1ChannelSel: channel seletct signal for track 1,the param must equal to signal_t1 in this software version.
+ * @param ��T1ChannelSel: channel seletct signal for track 1,the param must equal to signal_t1 in this software version.
 						T2ChannelSel: channel seletct signal for track 2,the param can  equal to signal_t2,signal_t3
 						T3ChannelSel: channel seletct signal for track 3,the param can  equal to signal_t2,signal_t3
 						//parm select from enum signal_fortrack.
Index: yc_msr/yc_msr_single.c
===================================================================
--- /YC3121_SDK/fw/sdk/yc_msr/yc_msr_single.c	(revision 602)
+++ /YC3121_SDK/fw/sdk/yc_msr/yc_msr_single.c	(working copy)
@@ -22,8 +22,8 @@
 unsigned char T2data_buf[MAX_TRACK_RAW_DATA_SZIE] ={0};
 unsigned char T3data_buf[MAX_TRACK_RAW_DATA_SZIE] ={0};
 
-static swiping_direction SwipDirectionConfig =SD_BIDIRECTION;  //Óû§ÅäÖÃË¢¿¨·½Ïò
-static swiping_direction SwipDirection =SD_FORWARD_DIRECTION;  //ʵ¼ÊË¢¿¨·½Ïò
+static swiping_direction SwipDirectionConfig =SD_BIDIRECTION;  //�û�����ˢ������
+static swiping_direction SwipDirection =SD_FORWARD_DIRECTION;  //ʵ��ˢ������
 
 static uint8_t  TrackDataHead[3] = {0x45,0x0B,0x0B};//1,0,0,0,1,0,1   ,0,1,0,1,1     0,1,0,1,1
 static uint8_t  TrackDataEnd[3]  = {0x1F,0x1F,0x1F};//0,0,1,1,1,1,1    1,1,1,1,1      1,1,1,1,1
@@ -81,8 +81,8 @@
 }MSR_DataStruct;
  MSR_DataStruct MsrData;
 
-#define indexadd(a,b) ((b)<4)?((b)++):((a)++, (b)=0)//a:bufindex,b:bitindex£» bufindexÊǵ±Ç°¼ìË÷µÄ×Ö½ÚÊý£¬bitindexÊÇÔÚµ±Ç°×Ö½ÚµÄÓÐЧλ
-#define indexdec(a,b) ((b)>0)?((b)--):((a)--, (b)=4)//·´ÏòË¢¿¨µÄË÷ÒýÒƶ¯
+#define indexadd(a,b) ((b)<4)?((b)++):((a)++, (b)=0)//a:bufindex,b:bitindex�� bufindex�ǵ�ǰ�������ֽ�����bitindex���ڵ�ǰ�ֽڵ���Чλ
+#define indexdec(a,b) ((b)>0)?((b)--):((a)--, (b)=4)//����ˢ���������ƶ�
 
 static uint8_t  get_data_bit(uint8_t data, int bitindex)
 {
@@ -104,7 +104,7 @@
 	switch(direction)
 	{
 		case SD_FORWARD_DIRECTION:
-			while( bitnum < CodingBits)     //ÔÚ°üÍ·µÄ³¤¶ÈÄÚ¶ÁÈ¡¶ÔӦλµÄÊý¾Ý
+			while( bitnum < CodingBits)     //�ڰ�ͷ�ij����ڶ�ȡ��Ӧλ������
 			{
 				if( 1 == get_data_bit(InputBuf[bufindex], bitindex)  )
 				getchar |=  (1<<bitnum);
@@ -188,11 +188,11 @@
 	uint8_t LRCData=0x00;
 	for (int i = 0; i < len-1; i++)
   	{
-  		if(CodingBits==5)	data[i]&=0x0F;//ÆæżУÑéλ²»²ÎÓëLRCУÑé
+  		if(CodingBits==5)	data[i]&=0x0F;//��żУ��λ������LRCУ��
 		else	data[i]&=0x3F;
 
   		LRCData ^=  data[i];
-  		if(CodingBits==5)	data[i]+=0x30;//±àÂëת»»
+  		if(CodingBits==5)	data[i]+=0x30;//����ת��
 		else	data[i]+=0x20;
  	 }
  	 if(CodingBits==5)	data[len-1]&=0x0F;
@@ -241,7 +241,7 @@
 		CodingBits: one data size
 		direction: swipcard direction
 		track: the track you select ,it will equal to TRACK_SELECT_1,TRACK_SELECT_2 or TRACK_SELECT_3
-		OutputBuf£ºdecoding data
+		OutputBuf��decoding data
 		Outlen: decoding data length 
 
 * @retval 
@@ -260,7 +260,7 @@
 	{
 		return TRACK_NO_DATA;          
 	}
-	int TempDirection=SD_FORWARD_DIRECTION, HeadIndex=0;//ĬÈÏ°´ÕÕÕýÏò½âÂ룬
+	int TempDirection=SD_FORWARD_DIRECTION, HeadIndex=0;//Ĭ�ϰ���������룬
 	int bufindex = 0;
 	int bitindex = 0;
 	uint8_t tempdata = 0;
@@ -279,7 +279,7 @@
 	#endif
 	
 	
-//ÕýÏòÕÒµ½ÁËÍ· ¾ÍÏÈÕý½â
+//�����ҵ���ͷ ��������
 
 	SwipDirection=SD_FORWARD_DIRECTION;
 		
@@ -298,13 +298,13 @@
 			{	
 					if(get_data_bit( InputBuf[bufindex], bitindex))
 					{
-						tempdata|= 1<<getbinarynum;    //×îÖÕ»ñµÃ5¸öbitµÄÊý×ÖÖµ£¬ÓÃÓÚÆæżУÑé
+						tempdata|= 1<<getbinarynum;    //���ջ��5��bit������ֵ��������żУ��
 					}
 					getbinarynum++;
-					indexadd(bufindex,bitindex);	//#define indexadd(a,b) ((b)<4)?((b)++):((a)++, (b)=0)bufindexÊǵ±Ç°¼ìË÷µÄ×Ö½ÚÊý£¬bitindexÊÇÔÚµ±Ç°×Ö½ÚµÄÓÐЧλ
+					indexadd(bufindex,bitindex);	//#define indexadd(a,b) ((b)<4)?((b)++):((a)++, (b)=0)bufindex�ǵ�ǰ�������ֽ�����bitindex���ڵ�ǰ�ֽڵ���Чλ
 			}
 
-			if(!MSR_OddEvenCheck(tempdata,CodingBits))                   //ÆæУÑ飬Èç¹û´íÎóÔò½øÈëÖ´ÐÐ
+			if(!MSR_OddEvenCheck(tempdata,CodingBits))                   //��У�飬������������ִ��
 			{
 				#ifdef MSR_DEBUG
 				MyPrintf("Forward direction Odd Even Check error bufindex:%d  bitindex %d data:%02X\n",bufindex,bitindex,tempdata);
@@ -313,7 +313,7 @@
 				rtnvalue = PARITY_ERR;
 				break;
 			}
-			OutputBuf[(*OutLen)++] = tempdata;     //ÆæУÑéͨ¹ý
+			OutputBuf[(*OutLen)++] = tempdata;     //��У��ͨ��
 
 			if(*(OutLen) >MAX_TRACK_DATA_SIZE)
 			{
@@ -326,7 +326,7 @@
 			}
 			else
 			{
-				if(OutputBuf[(*OutLen)-1] == end)//ÕÒµ½Í£Ö¹Î»°
+				if(OutputBuf[(*OutLen)-1] == end)//�ҵ�ֹͣλ�
 				{
 					tempdata = 0;
 					getbinarynum = 0;
@@ -354,7 +354,7 @@
 					}
 					if(MSR_LRCCheck(OutputBuf, ((*OutLen)+1), CodingBits))
 					{
-						OutputBuf[*OutLen] = 0x00;//ÌÞ³ýLRCУÑéλ
+						OutputBuf[*OutLen] = 0x00;//�޳�LRCУ��λ
 						if((TempDirection==SwipDirectionConfig) ||(SwipDirectionConfig==SD_BIDIRECTION))
 						{
 							return MSR_SUCCESS;
@@ -383,7 +383,7 @@
 	}
 
 	
-//·´Ïò½âÂëÆðʼλÖÃ
+//���������ʼλ��
 	SwipDirection = SD_REVERSE_DIRECTION;
 	TempDirection = SD_REVERSE_DIRECTION;
 	HeadIndex=MSR_GetHeadIndex(InputBuf,InPutLen, head, end, CodingBits,&TempDirection);
@@ -440,7 +440,7 @@
 		}
 		else
 		{
-			if(OutputBuf[(*OutLen)-1] == end)//ÕÒµ½Í£Ö¹Î»
+			if(OutputBuf[(*OutLen)-1] == end)//�ҵ�ֹͣλ
 			{
 				tempdata = 0;
 				getbinarynum = 0;
@@ -468,7 +468,7 @@
 				
 				if(MSR_LRCCheck(OutputBuf, ((*OutLen)+1), CodingBits))
 				{
-					OutputBuf[*OutLen]=0x00;//ÌÞ³ýLRCУÑéλ
+					OutputBuf[*OutLen]=0x00;//�޳�LRCУ��λ
 					if(TempDirection==SwipDirectionConfig||SwipDirectionConfig==SD_BIDIRECTION)
 					{
 						return MSR_SUCCESS;
@@ -499,8 +499,12 @@
  uint8_t MSR_GetDecodeData(track_data  *ptrack, uint8_t options, uint8_t *cfmt, uint8_t *tflag)
  {
  	uint8_t result[3];
- 	int i; 
- 	if(options&TRACK_SELECT_1||options&TRACK_SELECT_ALL)   //Ñ¡Ôñ´ÅµÀÒ»»òÈ«²¿´ÅµÀ
+	int i; 
+	*tflag = 0;
+	*cfmt =0;
+	 memset((char*)ptrack,0,sizeof(ptrack));
+	 
+ 	if(options&TRACK_SELECT_1||options&TRACK_SELECT_ALL)   //ѡ��ŵ�һ��ȫ���ŵ�
  	{
  		#if defined (MSR_DEBUG) 
  		MyPrintf("\nstart track1 decode\n");
@@ -806,7 +810,7 @@
 	ISO7811_T2_AGC_CFG |= 1<<ISO7811_AGC_CFG_DISAB_MASK;
 	ISO7811_T3_AGC_CFG |= 1<<ISO7811_AGC_CFG_DISAB_MASK;
 	
-	//µ¥¶Ë´ÅÍ·ÅäÖÃ
+	//���˴�ͷ����
 	ISO7811_T2_PEAK_WIDTH_CFG	 = 0x620064;
 	ISO7811_T2_PULSE_WIDTH_CFG	 = 0x14afffe;
 	#if 0
@@ -828,7 +832,7 @@
 	
 //	ISO7811_T3_AGC_CFG = 0x24722b22;
 	
-	delay_ms(300);//´¦ÀíÉϵçµÚÒ»´ÎË¢¿¨Ê§°ÜÎÊÌâ(ÅäÖÃÍêÄ£Äâ¼Ä´æÆ÷ÐèÒªµÈ´ýÎȶ¨ÔÙʹÄÜ×Ü¿ª¹Ø)
+	delay_ms(300);//�����ϵ��һ��ˢ��ʧ������(������ģ��Ĵ�����Ҫ�ȴ��ȶ���ʹ���ܿ���)
 #ifdef MSR_FPGA
 	ISO7811_CTRL &= ~(0x1FF <<20);
 #endif
@@ -939,7 +943,7 @@
 
 /**
  * @brief	:Channel select signal for 3 tracks 
- * @param £ºT1ChannelSel: channel seletct signal for track 1,the param must equal to signal_t1 in this software version.
+ * @param ��T1ChannelSel: channel seletct signal for track 1,the param must equal to signal_t1 in this software version.
 						T2ChannelSel: channel seletct signal for track 2,the param can  equal to signal_t2,signal_t3
 						T3ChannelSel: channel seletct signal for track 3,the param can  equal to signal_t2,signal_t3
 						//parm select from enum signal_fortrack.

Index: yc_msr/yc_msr.lib
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream