--- libelwix/inc/elwix/acrc.h	2017/12/08 00:07:48	1.6
+++ libelwix/inc/elwix/acrc.h	2024/10/10 23:53:00	1.7.36.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: acrc.h,v 1.6 2017/12/08 00:07:48 misho Exp $
+* $Id: acrc.h,v 1.7.36.1 2024/10/10 23:53:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2017
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@ typedef struct tagCRCPoly crcPoly_t;
  *
  * @crcNum = Number for reflection
  * @crcBits = Number width bits 
- * return: -1 error, !=-1 reflecting number
+ * return: reflecting number
  */
 unsigned int crcReflect(unsigned int crcNum, unsigned char crcBits);
 /*
@@ -76,18 +76,38 @@ unsigned int crcReflect(unsigned int crcNum, unsigned 
  * @RevOpts = Options for computation (REVOPTS_REVERTBYTE, REVOPTS_REVERTCRC)
  * @initCRC = Initial CRC value
  * @xorCRC = Last xor CRC value
- * return: -1 error, !=-1 CRC checksum
+ * return: CRC checksum
  */
 unsigned int crcCalc(unsigned char * __restrict psBuf, unsigned int bufLen, 
 		unsigned char crcBits, unsigned char RevOpts, 
 		unsigned int initCRC, unsigned int xorCRC);
+#define crc_32(x, l)		crcCalc((x), (l), 32, REVOPTS_REVERTBYTE|REVOPTS_REVERTCRC, 0xFFFFFFFF, 0xFFFFFFFF)
+#define crc_16(x, l)		crcCalc((x), (l), 16, REVOPTS_REVERTBYTE|REVOPTS_REVERTCRC, 0x0, 0x0)
+#define crc_16_ccitt(x, l)	crcCalc((x), (l), 161, 0, 0x0, 0x0)
+#define crc_16_xmodem(x, l)	crcCalc((x), (l), 162, REVOPTS_REVERTBYTE|REVOPTS_REVERTCRC, 0x0, 0x0)
 
 /*
+ * crc16_ccitt() - Checksum calculation
+ *
+ * @buf = Data for calculation
+ * @bufLen = Length of data
+ * return: Checksum
+ */
+unsigned short crc16_ccitt(unsigned char * __restrict buf, int bufLen);
+/*
+ * crc16_xy() - Checksum calculation in X/Y modem communication
+ *
+ * @buf = Data for calculation
+ * @bufLen = Length of data
+ * return: Checksum
+ */
+unsigned short crc16_xy(unsigned char * __restrict buf, int bufLen);
+/*
  * crcIP() - Checksum in IP communication
  *
  * @buf = Data for calculation
  * @bufLen = Length of data
- * return: -1 error, !=-1 Checksum
+ * return: Checksum
  */
 unsigned short crcIP(unsigned char * __restrict buf, int bufLen);
 /*
@@ -96,7 +116,7 @@ unsigned short crcIP(unsigned char * __restrict buf, i
  * @buf = Data for calculation
  * @bufLen = Length of data
  * @th = TCP header
- * return: -1 error, !=-1 Checksum
+ * return: Checksum
  */
 unsigned short crcTCP(struct in_addr src, struct in_addr dst, 
 		unsigned char * __restrict th);
@@ -106,7 +126,7 @@ unsigned short crcTCP(struct in_addr src, struct in_ad
  * @buf = Data for calculation
  * @bufLen = Length of data
  * @uh = UDP header
- * return: -1 error, !=-1 Checksum
+ * return: Checksum
  */
 unsigned short crcUDP(struct in_addr src, struct in_addr dst, 
 		unsigned char * __restrict uh);
@@ -116,7 +136,7 @@ unsigned short crcUDP(struct in_addr src, struct in_ad
  *
  * @nBuf = Data for calculation
  * @bufLen = Length of data
- * return: -1 error, !=-1 Checksum
+ * return: Checksum
  */
 unsigned short crcFletcher16(unsigned short * __restrict nBuf, int bufLen);
 /*
@@ -124,7 +144,7 @@ unsigned short crcFletcher16(unsigned short * __restri
  *
  * @nBuf = Data for calculation
  * @bufLen = Length of data
- * return: -1 error, !=-1 Checksum
+ * return: Checksum
  */
 unsigned int crcFletcher(unsigned short * __restrict nBuf, int bufLen);
 /*
@@ -132,7 +152,7 @@ unsigned int crcFletcher(unsigned short * __restrict n
  *
  * @psBuf = Data for calculation
  * @bufLen = Length of data
- * return: -1 error, !=-1 Checksum
+ * return: Checksum
  */
 unsigned int crcAdler(unsigned char * __restrict psBuf, int bufLen);
 
@@ -141,19 +161,19 @@ unsigned int crcAdler(unsigned char * __restrict psBuf
  *
  * @psBuf = Data for calculation
  * @bufLen = Length of data
- * return: -1 error, !=-1 Checksum
+ * return: Checksum
  */
 #define crcEther(psBuf, bufLen) crcCalc((psBuf), (bufLen), 32, 3, 0xFFFFFFFF, 0xFFFFFFFF)
 
 /*
- * crc_32() - CRC32 calculation from table
+ * crc32tbl() - CRC32 calculation from table
  *
  * @crc = Initial crc value
  * @buf = Data for calculation
  * @len = Length of data
  * return: calculated CRC32
  */
-unsigned int crc_32(unsigned int crc, const unsigned char * __restrict buf, unsigned int len);
+unsigned int crc32tbl(unsigned int crc, const unsigned char * __restrict buf, unsigned int len);
 
 /*
  * crcPelco() - Calculate Pelco D/P CRC