mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-16 01:44:34 +00:00
92957de362
Prior to commit 29caf9305b ("cyclic: Use schedule() instead of
WATCHDOG_RESET()") we had
/* Currently only needed for fs/cramfs/uncompress.c */
static inline void watchdog_reset_func(void)
{
WATCHDOG_RESET();
}
and .outcb was set to that watchdog_reset_func(). Said commit changed
that .outcb to cyclic_run instead of schedule, which would otherwise
match all the other WATCHDOG_RESET replacements done. As the
HW_WATCHDOG case is not handled by cyclic_run, this seems to be an
oversight.
Signed-off-by: Rasmus Villemoes <ravi@prevas.dk>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
84 lines
1.9 KiB
C
84 lines
1.9 KiB
C
/*
|
|
* uncompress.c
|
|
*
|
|
* Copyright (C) 1999 Linus Torvalds
|
|
* Copyright (C) 2000-2002 Transmeta Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License (Version 2) as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* cramfs interfaces to the uncompression library. There's really just
|
|
* three entrypoints:
|
|
*
|
|
* - cramfs_uncompress_init() - called to initialize the thing.
|
|
* - cramfs_uncompress_exit() - tell me when you're done
|
|
* - cramfs_uncompress_block() - uncompress a block.
|
|
*
|
|
* NOTE NOTE NOTE! The uncompression is entirely single-threaded. We
|
|
* only have one stream, and we'll initialize it only once even if it
|
|
* then is used by multiple filesystems.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <malloc.h>
|
|
#include <watchdog.h>
|
|
#include <u-boot/schedule.h>
|
|
#include <u-boot/zlib.h>
|
|
|
|
static z_stream stream;
|
|
|
|
/* Returns length of decompressed data. */
|
|
int cramfs_uncompress_block (void *dst, void *src, int srclen)
|
|
{
|
|
int err;
|
|
|
|
inflateReset (&stream);
|
|
|
|
stream.next_in = src;
|
|
stream.avail_in = srclen;
|
|
|
|
stream.next_out = dst;
|
|
stream.avail_out = 4096 * 2;
|
|
|
|
err = inflate (&stream, Z_FINISH);
|
|
|
|
if (err != Z_STREAM_END)
|
|
goto err;
|
|
return stream.total_out;
|
|
|
|
err:
|
|
/*printf ("Error %d while decompressing!\n", err); */
|
|
/*printf ("%p(%d)->%p\n", src, srclen, dst); */
|
|
return -1;
|
|
}
|
|
|
|
int cramfs_uncompress_init (void)
|
|
{
|
|
int err;
|
|
|
|
stream.zalloc = gzalloc;
|
|
stream.zfree = gzfree;
|
|
stream.next_in = 0;
|
|
stream.avail_in = 0;
|
|
|
|
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
|
|
stream.outcb = (cb_func)schedule;
|
|
#else
|
|
stream.outcb = Z_NULL;
|
|
#endif /* CONFIG_HW_WATCHDOG */
|
|
|
|
err = inflateInit (&stream);
|
|
if (err != Z_OK) {
|
|
printf ("Error: inflateInit2() returned %d\n", err);
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int cramfs_uncompress_exit (void)
|
|
{
|
|
inflateEnd (&stream);
|
|
return 0;
|
|
}
|