diff options
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | lib/crc32.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/common.h b/include/common.h index 319535b376..0edc778095 100644 --- a/include/common.h +++ b/include/common.h @@ -109,8 +109,8 @@ unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base) long simple_strtol(const char *cp,char **endp,unsigned int base); /* lib_generic/crc32.c */ -ulong crc32 (ulong, const unsigned char *, uint); -ulong crc32_no_comp (ulong, const unsigned char *, uint); +uint32_t crc32(uint32_t, const void*, unsigned int); +uint32_t crc32_no_comp(uint32_t, const void*, unsigned int); /* common/console.c */ int ctrlc (void); diff --git a/lib/crc32.c b/lib/crc32.c index be35366fb6..34817824f1 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -132,8 +132,10 @@ static const ulong crc_table[256] = { #define DO8(buf) DO4(buf); DO4(buf); /* ========================================================================= */ -ulong crc32(ulong crc, const unsigned char *buf, uint len) +uint32_t crc32(uint32_t crc, const void *_buf, unsigned int len) { + const unsigned char *buf = _buf; + #ifdef CONFIG_DYNAMIC_CRC_TABLE if (crc_table_empty) make_crc_table(); @@ -153,13 +155,13 @@ ulong crc32(ulong crc, const unsigned char *buf, uint len) EXPORT_SYMBOL(crc32); #endif -#if 0 - /* No ones complement version. JFFS2 (and other things ?) * don't use ones compliment in their CRC calculations. */ -uLong crc32_no_comp(uLong crc, const Bytef *buf, uint len) +uint32_t crc32_no_comp(uint32_t crc, const void *_buf, unsigned int len) { + const unsigned char *buf = _buf; + #ifdef CONFIG_DYNAMIC_CRC_TABLE if (crc_table_empty) make_crc_table(); @@ -176,4 +178,3 @@ uLong crc32_no_comp(uLong crc, const Bytef *buf, uint len) return crc; } -#endif |