GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the ulzma prototype out of the function to make the code easier to read. 

Check the return value.  Minor formatting and LAR -> CBFS.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4752 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson 2009-10-09 15:22:35 +00:00
parent 00f0267f78
commit 86bf6795c3
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/cbfs.h
View File

@ -52,7 +52,7 @@
#include <boot/coreboot_tables.h> #include <boot/coreboot_tables.h>
/** These are standard values for the known compression /** These are standard values for the known compression
alogrithms that coreboot knows about for stages and alogrithms that coreboot knows about for stages and
payloads. Of course, other LAR users can use whatever payloads. Of course, other CBFS users can use whatever
values they want, as long as they understand them. */ values they want, as long as they understand them. */
#define CBFS_COMPRESS_NONE 0 #define CBFS_COMPRESS_NONE 0

12
src/lib/cbfs.c
View File

@ -29,6 +29,8 @@
#define ntohl(x) (x) #define ntohl(x) (x)
#endif #endif
unsigned long ulzma(unsigned char *src, unsigned char *dst);
int cbfs_decompress(int algo, void *src, void *dst, int len) int cbfs_decompress(int algo, void *src, void *dst, int len)
{ {
switch(algo) { switch(algo) {
@ -36,15 +38,15 @@ int cbfs_decompress(int algo, void *src, void *dst, int len)
memcpy(dst, src, len); memcpy(dst, src, len);
return 0; return 0;
case CBFS_COMPRESS_LZMA: { case CBFS_COMPRESS_LZMA:
unsigned long ulzma(unsigned char *src, unsigned char *dst); if (!ulzma(src, dst)) {
ulzma(src, dst); printk_err("CBFS: LZMA decompression failed!\n");
return -1;
} }
return 0; return 0;
default: default:
printk_info( "CBFS: Unknown compression type %d\n", printk_info( "CBFS: Unknown compression type %d\n", algo);
algo);
return -1; return -1;
} }
} }