projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove superfluous preprocessor tests from some cmd_*.c files.
[oweals/u-boot.git]
/
lib_generic
/
crc32.c
diff --git
a/lib_generic/crc32.c
b/lib_generic/crc32.c
index 58cd22eb7d8f98d2376ca3ac6089797bcc0a23b7..b27048ceebf2f07075457aedc5f1b0a3cb6db381 100644
(file)
--- a/
lib_generic/crc32.c
+++ b/
lib_generic/crc32.c
@@
-14,7
+14,10
@@
#include <stdint.h>
#endif
#include <stdint.h>
#endif
-#include "zlib.h"
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+#include <watchdog.h>
+#endif
+#include "u-boot/zlib.h"
#define local static
#define ZEXPORT /* empty */
#define local static
#define ZEXPORT /* empty */
@@
-53,7
+56,7
@@
local void make_crc_table()
{
uint32_t c;
int n, k;
{
uint32_t c;
int n, k;
- uLong poly;
/* polynomial exclusive-or pattern */
+ uLong poly; /* polynomial exclusive-or pattern */
/* terms of polynomial defining this crc (except x^32): */
static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
/* terms of polynomial defining this crc (except x^32): */
static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
@@
-151,10
+154,7
@@
const uint32_t * ZEXPORT get_crc_table()
#define DO8(buf) DO4(buf); DO4(buf);
/* ========================================================================= */
#define DO8(buf) DO4(buf); DO4(buf);
/* ========================================================================= */
-uint32_t ZEXPORT crc32(crc, buf, len)
- uint32_t crc;
- const Bytef *buf;
- uInt len;
+uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len)
{
#ifdef DYNAMIC_CRC_TABLE
if (crc_table_empty)
{
#ifdef DYNAMIC_CRC_TABLE
if (crc_table_empty)
@@
-172,9
+172,7
@@
uint32_t ZEXPORT crc32(crc, buf, len)
return crc ^ 0xffffffffL;
}
return crc ^ 0xffffffffL;
}
-#if defined(CONFIG_CMD_JFFS2) || \
- (defined(CONFIG_CMD_NAND) \
- && !defined(CFG_NAND_LEGACY))
+#if defined(CONFIG_CMD_JFFS2) || defined(CONFIG_CMD_NAND)
/* No ones complement version. JFFS2 (and other things ?)
* don't use ones compliment in their CRC calculations.
/* No ones complement version. JFFS2 (and other things ?)
* don't use ones compliment in their CRC calculations.
@@
-203,7
+201,9
@@
uint32_t ZEXPORT crc32_no_comp(uint32_t crc, const Bytef *buf, uInt len)
* Calculate the crc32 checksum triggering the watchdog every 'chunk_sz' bytes
* of input.
*/
* Calculate the crc32 checksum triggering the watchdog every 'chunk_sz' bytes
* of input.
*/
-ulong crc32_wd (ulong crc, const unsigned char *buf, uint len, uint chunk_sz)
+uint32_t ZEXPORT crc32_wd (uint32_t crc,
+ const unsigned char *buf,
+ uInt len, uInt chunk_sz)
{
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
const unsigned char *end, *curr;
{
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
const unsigned char *end, *curr;
@@
-220,7
+220,7
@@
ulong crc32_wd (ulong crc, const unsigned char *buf, uint len, uint chunk_sz)
WATCHDOG_RESET ();
}
#else
WATCHDOG_RESET ();
}
#else
-
crc = crc32 (crc, buf, len);
+ crc = crc32 (crc, buf, len);
#endif
return crc;
#endif
return crc;