[BACK]Return to aitcrc.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitcrc / inc

Diff for /libaitcrc/inc/aitcrc.h between versions 1.2 and 1.3.2.1

version 1.2, 2010/01/20 00:04:45 version 1.3.2.1, 2010/06/13 16:29:02
Line 19 Line 19
   
 struct tagCRCPoly {  struct tagCRCPoly {
         u_char  poly_bits;          u_char  poly_bits;
        u_long        poly_num;        u_int        poly_num;
         char    poly_name[19];          char    poly_name[19];
 };      // size 24bytes  };      // size 24bytes
 typedef struct tagCRCPoly crcPoly_t;  typedef struct tagCRCPoly crcPoly_t;
Line 32  inline int crc_GetErrno(); Line 32  inline int crc_GetErrno();
 inline const char *crc_GetError();  inline const char *crc_GetError();
 // -------------------------------------------------------  // -------------------------------------------------------
   
   
 /*  /*
  * crcReflect() Reflect all bits of number    * crcReflect() Reflect all bits of number 
  * @crcNum = Number for reflection   * @crcNum = Number for reflection
  * @crcBits = Number width bits    * @crcBits = Number width bits 
  * return: -1 error, !=-1 reflecting number   * return: -1 error, !=-1 reflecting number
  */   */
inline u_long crcReflect(u_long crcNum, u_char crcBits);inline u_int crcReflect(u_int crcNum, u_char crcBits);
 /*  /*
  * crcCalc() Generic CRC calculation function for many sub variants of CRC algorithms   * crcCalc() Generic CRC calculation function for many sub variants of CRC algorithms
  * @psBuf = Data for calculation   * @psBuf = Data for calculation
Line 49  inline u_long crcReflect(u_long crcNum, u_char crcBits Line 50  inline u_long crcReflect(u_long crcNum, u_char crcBits
  * @xorCRC = Last xor CRC value   * @xorCRC = Last xor CRC value
  * return: -1 error, !=-1 CRC checksum   * return: -1 error, !=-1 CRC checksum
  */   */
inline u_long crcCalc(u_char * __restrict psBuf, u_int bufLen, u_char crcBits, u_char RevOpts, u_long initCRC, u_long xorCRC);inline u_int crcCalc(u_char * __restrict psBuf, u_int bufLen, u_char crcBits, 
                 u_char RevOpts, u_int initCRC, u_int xorCRC);
   
 /*  /*
  * crcIP() Checksum in IP communication   * crcIP() Checksum in IP communication
Line 59  inline u_long crcCalc(u_char * __restrict psBuf, u_int Line 61  inline u_long crcCalc(u_char * __restrict psBuf, u_int
  */   */
 inline u_short crcIP(u_short * __restrict nBuf, int bufLen);  inline u_short crcIP(u_short * __restrict nBuf, int bufLen);
 /*  /*
 * crcFletcher() Fletcher-16 Checksum computing * crcFletcher16() Fletcher-16 Checksum computing
  * @nBuf = Data for calculation   * @nBuf = Data for calculation
  * @bufLen = Length of data   * @bufLen = Length of data
  * return: -1 error, !=-1 Checksum   * return: -1 error, !=-1 Checksum
  */   */
inline u_long crcFletcher(u_short * __restrict nBuf, int bufLen);inline u_short crcFletcher16(u_short * __restrict nBuf, int bufLen);
 /*  /*
    * crcFletcher() Fletcher-32 Checksum computing
    * @nBuf = Data for calculation
    * @bufLen = Length of data
    * return: -1 error, !=-1 Checksum
    */
   inline u_int crcFletcher(u_short * __restrict nBuf, int bufLen);
   /*
  * crcAdler() crcAdler-32 Checksum computing   * crcAdler() crcAdler-32 Checksum computing
  * @psBuf = Data for calculation   * @psBuf = Data for calculation
  * @bufLen = Length of data   * @bufLen = Length of data
  * return: -1 error, !=-1 Checksum   * return: -1 error, !=-1 Checksum
  */   */
inline u_long crcAdler(u_char * __restrict psBuf, int bufLen);inline u_int crcAdler(u_char * __restrict psBuf, int bufLen);
   
 /*  /*
  * crcEther() Checksum in Ethernet communication   * crcEther() Checksum in Ethernet communication
Line 79  inline u_long crcAdler(u_char * __restrict psBuf, int  Line 88  inline u_long crcAdler(u_char * __restrict psBuf, int 
  * @bufLen = Length of data   * @bufLen = Length of data
  * return: -1 error, !=-1 Checksum   * return: -1 error, !=-1 Checksum
  */   */
#define crcEther(psBuf, bufLen)         crcCalc((psBuf), (bufLen), 32, 3, 0xFFFFFFFF, 0xFFFFFFFF)#define crcEther(psBuf, bufLen) crcCalc((psBuf), (bufLen), 32, 3, 0xFFFFFFFF, 0xFFFFFFFF)
   
   
 /*  /*
  * crcPelco() Calculate Pelco D/P CRC   * crcPelco() Calculate Pelco D/P CRC
  * @ver = Pelco protocol version (Dd | Pp)   * @ver = Pelco protocol version (Dd | Pp)
Line 89  inline u_long crcAdler(u_char * __restrict psBuf, int  Line 99  inline u_long crcAdler(u_char * __restrict psBuf, int 
         Pelco protocol not supported          Pelco protocol not supported
  */   */
 inline u_char crcPelco(u_char ver, u_char *pkt);  inline u_char crcPelco(u_char ver, u_char *pkt);
   
   
   /*
    * hash_varchar() Compute index hash by variable length string
    * @csStr = Input data buffer
    * @nStrLen = Length of data buffer
    * @nVer = Version of algorythm; 0 - original, 1 - AITNET variant
    * return: Hash value
   */
   inline u_int hash_varchar(const char *csStr, int nStrLen, int nVer);
   /*
    * hash_bernstein() Compute index hash by Bernstein
    * @csStr = Input data buffer
    * @nStrLen = Length of data buffer
    * @nVer = Version of algorythm; 0 - Bernstein, 1 - DJBX33A variant
    * return: Hash value
   */
   inline u_int hash_bernstein(const char *csStr, int nStrLen, int nVer);
   /*
    * hash_jenkins() Compute index hash by Jenkins (one-at-a-time)
    * @csStr = Input data buffer
    * @nStrLen = Length of data buffer
    * return: Hash value
   */
   inline u_int hash_jenkins(const char *csStr, int nStrLen);
   /*
    * hash_fnv1() Compute index hash by FNV-1
    * @csStr = Input data buffer
    * @nStrLen = Length of data buffer
    * @nVer = Version of algorythm; 0 - FNV-1, 1 - FNV-1a (best avalanche)
    * return: Hash value
   */
   inline u_int hash_fnv1(const char *csStr, int nStrLen, int nVer);
   
   /*
    * hash_fnv() Compute index hash by FNV-1a
    * @csStr = Input data buffer
    * @nStrLen = Length of data buffer
    * return: Hash value
   */
   #define hash_fnv(str, len)      hash_fnv1((str), (len), 1)
   
   
 #endif  #endif
Removed from v.1.2  
changed lines
  Added in v.1.3.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>