sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

crc32: activate crc32_no_comp (needed for jffs2 and UBI) 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2010-06-24 22:24:15 +02:00
parent a398a920b6
commit 1b5de4c0fe
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common.h
View File

@ -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);

11
lib/crc32.c
View File

@ -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