merge makefiles into one

[proxmark3-svn] / common / crc16.c

diff --git a/common/crc16.c b/common/crc16.c
index 6cdf3ea3b2023e91efb8717ea104bb37e3682bb0..c26ced8a5a2ddb8cf8badd076b6caa6d85a8c4b7 100644 (file)
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -1,5 +1,5 @@
-unsigned short update_crc16( WORD crc, BYTE c ) {\r
-       WORD i, v, tcrc = 0;\r
+unsigned short update_crc16( unsigned short crc, unsigned char c ) {\r
+       unsigned short i, v, tcrc = 0;\r
 \r
        v = (crc ^ c) & 0xff;\r
   for (i = 0; i < 8; i++) {\r
@@ -7,5 +7,5 @@ unsigned short update_crc16( WORD crc, BYTE c ) {
       v >>= 1;\r
   }\r
 \r
-  return (crc >> 8) ^ tcrc;\r
+  return ((crc >> 8) ^ tcrc)&0xffff;\r
 }\r