Client cleanup and restructuring. Stage 1...

[proxmark3-svn] / common / crc16.c

diff --git a/common/crc16.c b/common/crc16.c
index 6cdf3ea3b2023e91efb8717ea104bb37e3682bb0..a5713333a66f2c6bc86b0967e64cec7174225d43 100644 (file)
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -1,11 +1,14 @@
-unsigned short update_crc16( WORD crc, BYTE c ) {\r
-       WORD i, v, tcrc = 0;\r
+#include "crc16.h"\r
 \r
-       v = (crc ^ c) & 0xff;\r
+unsigned short update_crc16( unsigned short crc, unsigned char c )\r
+{\r
+  unsigned short i, v, tcrc = 0;\r
+\r
+  v = (crc ^ c) & 0xff;\r
   for (i = 0; i < 8; i++) {\r
       tcrc = ( (tcrc ^ v) & 1 ) ? ( tcrc >> 1 ) ^ 0x8408 : tcrc >> 1;\r
       v >>= 1;\r
   }\r
 \r
-  return (crc >> 8) ^ tcrc;\r
+  return ((crc >> 8) ^ tcrc)&0xffff;\r
 }\r