diff options
Diffstat (limited to 'src/stream')
| -rw-r--r-- | src/stream/rom_stream.c | 14 | ||||
| -rw-r--r-- | src/stream/serial_stream.c | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c index 5e5a1ed66d..2000c5f576 100644 --- a/src/stream/rom_stream.c +++ b/src/stream/rom_stream.c @@ -5,23 +5,23 @@ #include <string.h> /* if they set the precompressed rom stream, they better have set a type */ -#if CONFIG_PRECOMPRESSED_ROM_STREAM && ((!CONFIG_COMPRESSED_ROM_STREAM) && (!CONFIG_COMPRESSED_ROM_STREAM_NRV2B) && (!CONFIG_COMPRESSED_ROM_STREAM_LZMA)) -#error "You set CONFIG_PRECOMPRESSED_ROM_STREAM but need to set CONFIG_COMPRESSED_ROM_STREAM (implies NRV2B, deprecated) or CONFIG_COMPRESSED_ROM_STREAM_NRV2B or CONFIG_COMPRESSED_ROM_STREAM_LZMA" +#if CONFIG_PRECOMPRESSED_PAYLOAD && ((!CONFIG_COMPRESSED_PAYLOAD_NRV2B) && (!CONFIG_COMPRESSED_PAYLOAD_LZMA)) +#error "You set CONFIG_PRECOMPRESSED_PAYLOAD but need to set CONFIG_COMPRESSED_PAYLOAD_NRV2B or CONFIG_COMPRESSED_PAYLOAD_LZMA" #endif /* If they set ANY of these, then we're compressed */ -#if ((CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) || (CONFIG_COMPRESSED_ROM_STREAM_LZMA)) +#if ((CONFIG_COMPRESSED_PAYLOAD_NRV2B) || (CONFIG_COMPRESSED_PAYLOAD_LZMA)) #define UNCOMPRESSER 1 extern unsigned char _heap, _eheap; #endif -#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) +#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) #define HAVE_UNCOMPRESSER 1 // include generic nrv2b #include "../lib/nrv2b.c" #endif -#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA) +#if (CONFIG_COMPRESSED_PAYLOAD_LZMA) #if HAVE_UNCOMPRESSER #error "You're defining more than one compression type, which is not allowed (of course)" #endif @@ -53,11 +53,11 @@ static const unsigned char *rom; unsigned long uncompress(uint8_t * rom_start, uint8_t *dest ) { -#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) +#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) unsigned long ilen; // used compressed stream length return unrv2b(rom_start, dest, &ilen); #endif -#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA) +#if (CONFIG_COMPRESSED_PAYLOAD_LZMA) return ulzma(rom_start, dest); #endif } diff --git a/src/stream/serial_stream.c b/src/stream/serial_stream.c index b3af26b1db..5be6624ac4 100644 --- a/src/stream/serial_stream.c +++ b/src/stream/serial_stream.c @@ -5,16 +5,16 @@ #include <string.h> /* if they set the precompressed rom stream, they better have set a type */ -#if CONFIG_PRECOMPRESSED_ROM_STREAM && ((!CONFIG_COMPRESSED_ROM_STREAM) && (!CONFIG_COMPRESSED_ROM_STREAM_NRV2B) && (!CONFIG_COMPRESSED_ROM_STREAM_LZMA)) -#error "You set CONFIG_PRECOMPRESSED_ROM_STREAM but need to set CONFIG_COMPRESSED_ROM_STREAM (implies NRV2B, deprecated) or CONFIG_COMPRESSED_ROM_STREAM_NRV2B or CONFIG_COMPRESSED_ROM_STREAM_LZMA" +#if CONFIG_PRECOMPRESSED_PAYLOAD && ((!CONFIG_COMPRESSED_PAYLOAD_NRV2B) && (!CONFIG_COMPRESSED_PAYLOAD_LZMA)) +#error "You set CONFIG_PRECOMPRESSED_PAYLOAD but need to set CONFIG_COMPRESSED_PAYLOAD_NRV2B or CONFIG_COMPRESSED_PAYLOAD_LZMA" #endif -#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) +#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) #define HAVE_UNCOMPRESSER 1 #include "../lib/nrv2b.c" #endif -#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA) +#if (CONFIG_COMPRESSED_PAYLOAD_LZMA) #if HAVE_UNCOMPRESSER #error "You're defining more than one compression type, which is not allowed (of course)" #endif @@ -33,11 +33,11 @@ static int stream_max_bytes = 0x00800000; #if HAVE_UNCOMPRESSER static unsigned long uncompress(uint8_t *src, uint8_t *dest) { -#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) +#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) unsigned long ilen; return unrv2b(src, dest, &ilen); #endif -#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA) +#if (CONFIG_COMPRESSED_PAYLOAD_LZMA) return ulzma(src, dest); #endif } |