ADD: num_to_bytebitsLSBF function.

[proxmark3-svn] / common / crc16.c

diff --git a/common/crc16.c b/common/crc16.c
index 07090fc6fbbeec4f56300dbb6246c4a5adf74041..9d3f68c9fe9990645d7f188d3f6566964308c33e 100644 (file)
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -7,7 +7,9 @@
 //-----------------------------------------------------------------------------
 
 #include "crc16.h"
-#define CRC16_MASK_CCITT 0x1021
+#define CRC16_POLY_CCITT 0x1021
+#define CRC16_POLY 0x8408
+#define CRC16_POLY_LEGIC 0xB400
 
 unsigned short update_crc16( unsigned short crc, unsigned char c )
 {
@@ -15,11 +17,11 @@ unsigned short update_crc16( unsigned short crc, unsigned char c )
 
   v = (crc ^ c) & 0xff;
   for (i = 0; i < 8; i++) {
-      tcrc = ( (tcrc ^ v) & 1 ) ? ( tcrc >> 1 ) ^ 0x8408 : tcrc >> 1;
+      tcrc = ( (tcrc ^ v) & 1 ) ? ( tcrc >> 1 ) ^ CRC16_POLY : tcrc >> 1;
       v >>= 1;
   }
 
-  return ((crc >> 8) ^ tcrc)&0xffff;
+  return ((crc >> 8) ^ tcrc) & 0xffff;
 }
 
 uint16_t crc16(uint8_t const *message, int length, uint16_t remainder, uint16_t polynomial) {
@@ -41,12 +43,19 @@ uint16_t crc16(uint8_t const *message, int length, uint16_t remainder, uint16_t
 }
 
 uint16_t crc16_ccitt(uint8_t const *message, int length) {
-    return crc16(message, length, 0xffff, CRC16_MASK_CCITT);
+    return crc16(message, length, 0xffff, CRC16_POLY_CCITT);
 }
 
 uint16_t crc16_ccitt_kermit(uint8_t const *message, int length) {
-    return bit_reverse_uint16(crc16(message, length, 0x0000, CRC16_MASK_CCITT));
+    return bit_reverse_uint16(crc16(message, length, 0x0000, CRC16_POLY_CCITT));
 }
+
+//ICEMAN: not working yet,
+// This CRC-16 is used in Legic Advant systems. 
+uint16_t crc16_legic(uint8_t const *message, int length, uint16_t inital) {
+       return crc16(message, length, inital, CRC16_POLY_LEGIC);
+}
+
 uint16_t bit_reverse_uint16 (uint16_t value) {
        const uint16_t mask0 = 0x5555;
        const uint16_t mask1 = 0x3333;