Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / common / crc.h

diff --git a/common/crc.h b/common/crc.h
index 957226a4e2f3d8ba68d90dea5d88f963b65cda9d..56f0435794cc1460df09accdd899dde18340641b 100644 (file)
--- a/common/crc.h
+++ b/common/crc.h
@@ -44,6 +44,7 @@ extern void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_v
  * data_width lower-most bits are used).
  */
 extern void crc_update(crc_t *crc, uint32_t data, int data_width);
  * data_width lower-most bits are used).
  */
 extern void crc_update(crc_t *crc, uint32_t data, int data_width);

+extern void crc_update2(crc_t *crc, uint32_t data, int data_width);

 
 /* Clean the crc state, e.g. reset it to initial_value */
 extern void crc_clear(crc_t *crc);
 
 /* Clean the crc state, e.g. reset it to initial_value */
 extern void crc_clear(crc_t *crc);


@@ -65,12 +66,11 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size);
 // ie:  uidcrc = 0x78  then initial_value == 0x7878
 uint32_t CRC16Legic(uint8_t *buff, size_t size, uint8_t uidcrc);
 
 // ie:  uidcrc = 0x78  then initial_value == 0x7878
 uint32_t CRC16Legic(uint8_t *buff, size_t size, uint8_t uidcrc);
 

-// Calculate CRC-8/ja checksum
-uint32_t CRC8ja(uint8_t *buff, size_t size);
-

 // test crc 16.
 uint32_t CRC16_DNP(uint8_t *buff, size_t size);
 uint32_t CRC16_CCITT(uint8_t *buff, size_t size);
 // test crc 16.
 uint32_t CRC16_DNP(uint8_t *buff, size_t size);
 uint32_t CRC16_CCITT(uint8_t *buff, size_t size);

+uint32_t CRC16_Iso15693(uint8_t *buff, size_t size);
+uint32_t CRC16_ICLASS(uint8_t *buff, size_t size);

 
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \
 
 /* Static initialization of a crc structure */
 #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \