Merge pull request #5 from TimerOverflow/20200907

20200907

Author: TimerOverflow

crc16.c

@@ -6,15 +6,20 @@
 /*********************************************************************************/
 #include "crc16.h"
 /*********************************************************************************/
-#if(AVR_CRC16_REVISION_DATE != 20190905)
+#if(AVR_CRC16_REVISION_DATE != 20200907)
 #error wrong include file. (crc16.h)
 #endif
 /*********************************************************************************/
 /** Global variable **/
 
 
 /* CRC16 Table High byte */
-const unsigned char CRC16Hi[] =
+#if(__CRC16_TARGET_IAR_AVR__ == true)
+#include <ina90.h>
+const tU8 __flash CRC16Hi[] =
+#else
+const tU8 CRC16Hi[] =
+#endif
 {
 	0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,
 	0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40,
@@ -51,7 +56,11 @@ const unsigned char CRC16Hi[] =
 };
 
 /* CRC16 Table Low byte */
-const unsigned char CRC16Lo[] =
+#if(__CRC16_TARGET_IAR_AVR__ == true)
+const tU8 __flash CRC16Lo[] =
+#else
+const tU8 CRC16Lo[] =
+#endif
 {
 	0x00, 0xC0, 0xC1, 0x01, 0xC3, 0x03, 0x02, 0xC2,
 	0xC6, 0x06, 0x07, 0xC7, 0x05, 0xC5, 0xC4, 0x04,
@@ -87,26 +96,25 @@ const unsigned char CRC16Lo[] =
 	0x82, 0x42, 0x43, 0x83, 0x41, 0x81, 0x80, 0x40
 };
 /*********************************************************************************/
-tU16 Crc16Check(char *BufCurPos, char *BufOffSet, char *BufEnd, tU16 Length)
+tU16 Crc16Check(tU8 *BufCurPos, tU8 *BufOffSet, tU8 *BufEnd, tU16 Length)
 {
-	unsigned char CRCHi ;
-	unsigned char CRCLo ;
-	tU16  Index ;
+	tU8 CRCHi, CRCLo;
+	tU16  Index;
 
-	CRCHi = 0xFF ;
-  CRCLo = 0xFF ;
-  while(Length--)
+	CRCHi = 0xFF;
+	CRCLo = 0xFF;
+	while(Length--)
 	{
-		Index = CRCHi ^ *BufCurPos++;
+		Index = CRCHi ^ *BufCurPos;
 		CRCHi = CRCLo ^ CRC16Hi[Index];
 		CRCLo = CRC16Lo[Index];
 
-		if(BufCurPos > BufEnd)
+		if(++BufCurPos > BufEnd)
 		{
 			BufCurPos = BufOffSet;
 		}
-  }
+	}
 
-  return ((tU16) CRCHi << 8 | CRCLo);
+	return (tU16) (CRCHi << 8) + CRCLo;
 }
 /*********************************************************************************/

crc16.h

@@ -9,25 +9,33 @@
 /*********************************************************************************/
 #include "SysTypedef.h"
 /*********************************************************************************/
-#define AVR_CRC16_REVISION_DATE		20190905
+#define AVR_CRC16_REVISION_DATE		20200907
 /*********************************************************************************/
 /** REVISION HISTORY **/
 /*
-	2019. 09. 05.					- SysTypedef 적용.
+	2020. 09. 07.					- __CRC16_TARGET_IAR_AVR__ 추가. AVR 타겟일 경우 crc테이블을 플래쉬 메모리에 할당.
+	Jeong Hyun Gu
+
+	2019. 10. 07.					- 'SysTypedef.h' 적용.
 	Jeong Hyun Gu
 
 	2018. 05. 02.					- CRC16 테이블 변수 타입 변경.
 	Jeong Hyun Gu
 
 	2016. 11. 08.					- revision valid check 추가.
-	Jung Hyun Gu
+	Jeong Hyun Gu
 
 	2016. 10. 28.					- 초기버전.
-	Jung Hyun Gu
+	Jeong Hyun Gu
 */
 /*********************************************************************************/
 /**Define**/
 
+#define true		1
+#define	false		0
+#define	null		0
+
+#define __CRC16_TARGET_IAR_AVR__			true
 
 /*********************************************************************************/
 /**Enum**/
@@ -42,7 +50,7 @@
 /*********************************************************************************/
 /**Function**/
 
-tU16 Crc16Check(char *BufCurPos, char *BufOffSet, char *BufEnd, tU16 Length);
+tU16 Crc16Check(tU8 *BufCurPos, tU8 *BufOffSet, tU8 *BufEnd, tU16 Length);
 
 /*********************************************************************************/
 #endif //__CRC16_H__