diff options
author | Tom Rini <trini@ti.com> | 2013-03-04 16:14:27 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-03-04 16:14:27 (GMT) |
commit | 1c9f47ab2a2e9b62d08d39bfb9c4adc8f8edc5da (patch) | |
tree | fa4ee32d67f02d1c8fa80a55b9d85982cedac062 /lib | |
parent | c259188b203d95e4a854e7e29b9e4472cc982f65 (diff) | |
parent | 218da0f35f4b5e5bf13d3dba6d975d4d5d65516f (diff) | |
download | u-boot-1c9f47ab2a2e9b62d08d39bfb9c4adc8f8edc5da.tar.xz |
Merge branch 'mem' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'lib')
-rw-r--r-- | lib/crc32.c | 9 | ||||
-rw-r--r-- | lib/display_options.c | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/crc32.c b/lib/crc32.c index 27335a3..76205da 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -249,3 +249,12 @@ uint32_t ZEXPORT crc32_wd (uint32_t crc, return crc; } + +void crc32_wd_buf(const unsigned char *input, unsigned int ilen, + unsigned char *output, unsigned int chunk_sz) +{ + uint32_t crc; + + crc = crc32_wd(0, input, ilen, chunk_sz); + memcpy(output, &crc, sizeof(crc)); +} diff --git a/lib/display_options.c b/lib/display_options.c index 694d2f2..0339970 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -98,7 +98,8 @@ void print_size(unsigned long long size, const char *s) */ #define MAX_LINE_LENGTH_BYTES (64) #define DEFAULT_LINE_LENGTH_BYTES (16) -int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen) +int print_buffer(ulong addr, const void *data, uint width, uint count, + uint linelen) { /* linebuf as a union causes proper alignment */ union linebuf { |