summaryrefslogtreecommitdiff
path: root/src/stream
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2009-04-22 16:23:47 +0000
committerStefan Reinauer <stepan@openbios.org>2009-04-22 16:23:47 +0000
commitf96c2d96a87a7da6c843242d210720383d73fcbe (patch)
tree9a2101b985470ac25aa788a842696474fe41272b /src/stream
parent7faa7d6bde8693cdf089c869d6929f9b261548bd (diff)
fix warnings, shadowed declarations and style guide violations (all trivial)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4179 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/stream')
-rw-r--r--src/stream/rom_stream.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c
index adb412865e..35e27ead8a 100644
--- a/src/stream/rom_stream.c
+++ b/src/stream/rom_stream.c
@@ -21,7 +21,7 @@ extern unsigned char _heap, _eheap;
#endif
#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
-#if HAVE_UNCOMPRESSER
+#ifdef HAVE_UNCOMPRESSER
#error "You're defining more than one compression type, which is not allowed."
#endif
#define HAVE_UNCOMPRESSER 1
@@ -49,17 +49,18 @@ static const unsigned char *rom;
#ifdef UNCOMPRESSER
unsigned long
-uncompress(uint8_t * rom_start, uint8_t *dest )
+uncompress(uint8_t * start_addr, uint8_t *dest_addr)
{
#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B)
unsigned long ilen; // used compressed stream length
- return unrv2b(rom_start, dest, &ilen);
+ return unrv2b(start_addr, dest_addr, &ilen);
#endif
#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
- return ulzma(rom_start, dest);
+ return ulzma(start_addr, dest_addr);
#endif
}
#endif
+
int stream_init(void)
{
#ifdef UNCOMPRESSER