X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b7e8338d2b15b636017118e983c849f3de6784ae..dc3a58466d5118dde8bcd1978d44dd9c64774f26:/common/crc.c?ds=inline diff --git a/common/crc.c b/common/crc.c index f8179008..f9a15234 100644 --- a/common/crc.c +++ b/common/crc.c @@ -35,7 +35,7 @@ void crc_clear(crc_t *crc) { crc->state = reflect(crc->state, crc->order); } -void crc_update(crc_t *crc, uint32_t data, int data_width){ +void crc_update2(crc_t *crc, uint32_t data, int data_width){ if (crc->refin) data = reflect(data, data_width); @@ -52,7 +52,7 @@ void crc_update(crc_t *crc, uint32_t data, int data_width){ } } -void crc_update2(crc_t *crc, uint32_t data, int data_width) +void crc_update(crc_t *crc, uint32_t data, int data_width) { if (crc->refin) data = reflect(data, data_width); @@ -68,7 +68,6 @@ void crc_update2(crc_t *crc, uint32_t data, int data_width) } } - uint32_t crc_finish(crc_t *crc) { uint32_t val = crc->state; if (crc->refout) val = reflect(val, crc->order); @@ -96,7 +95,7 @@ uint32_t CRC8Maxim(uint8_t *buff, size_t size) { crc_t crc; crc_init_ref(&crc, 8, 0x31, 0, 0, TRUE, TRUE); for ( int i=0; i < size; ++i) - crc_update(&crc, buff[i], 8); + crc_update2(&crc, buff[i], 8); return crc_finish(&crc); } @@ -115,7 +114,7 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size) { crc_t crc; crc_init_ref(&crc, 8, 0x63, 0x55, 0, TRUE, TRUE); for ( int i = 0; i < size; ++i) - crc_update(&crc, buff[i], 8); + crc_update2(&crc, buff[i], 8); return reflect(crc_finish(&crc), 8); } @@ -139,7 +138,7 @@ uint32_t CRC16_DNP(uint8_t *buff, size_t size) { crc_t crc; crc_init_ref(&crc, 16, 0x3d65, 0, 0xffff, TRUE, TRUE); for ( int i=0; i < size; ++i) - crc_update(&crc, buff[i], 8); + crc_update2(&crc, buff[i], 8); return BSWAP_16(crc_finish(&crc)); }