Add constants for fast path resume copying

[coreboot.git] / src / lib / lzma.c

diff --git a/src/lib/lzma.c b/src/lib/lzma.c
index 42746e1029da806736cebd18874021c5580d8e0f..bc38f353f9d5790aae6f4cff160c6ab90da7a9ca 100644 (file)
--- a/src/lib/lzma.c
+++ b/src/lib/lzma.c
@@ -1,15 +1,20 @@
-/* 
-
-LinuxBIOS interface to memory-saving variant of LZMA decoder
-(C)opyright 2006 Carl-Daniel Hailfinger
-Released under the GNU GPL
-
-*/
+/*
+ * coreboot interface to memory-saving variant of LZMA decoder
+ *
+ * Copyright (C) 2006 Carl-Daniel Hailfinger
+ * Released under the GNU GPL v2 or later
+ *
+ * Parts of this file are based on C/7zip/Compress/LZMA_C/LzmaTest.c from the LZMA
+ * SDK 4.42, which is written and distributed to public domain by Igor Pavlov.
+ *
+ */
 
 #include "lzmadecode.c"
+#include <console/console.h>
+#include <string.h>
+#include <lib.h>
 
-
-static unsigned long ulzma(unsigned char * src, unsigned char * dst)
+unsigned long ulzma(unsigned char * src, unsigned char * dst)
 {
        unsigned char properties[LZMA_PROPERTIES_SIZE];
        UInt32 outSize;
@@ -23,17 +28,20 @@ static unsigned long ulzma(unsigned char * src, unsigned char * dst)
        memcpy(properties, src, LZMA_PROPERTIES_SIZE);
        outSize = *(UInt32 *)(src + LZMA_PROPERTIES_SIZE);
        if (LzmaDecodeProperties(&state.Properties, properties, LZMA_PROPERTIES_SIZE) != LZMA_RESULT_OK) {
-               printk_warning("Incorrect stream properties\n");
+               printk(BIOS_WARNING, "lzma: Incorrect stream properties.\n");
+               return 0;
        }
        mallocneeds = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
        if (mallocneeds > 15980) {
-               printk_warning("Decoder scratchpad too small!\n");
+               printk(BIOS_WARNING, "lzma: Decoder scratchpad too small!\n");
+               return 0;
        }
        state.Probs = (CProb *)scratchpad;
        res = LzmaDecode(&state, src + LZMA_PROPERTIES_SIZE + 8, (SizeT)0xffffffff, &inProcessed,
                dst, outSize, &outProcessed);
        if (res != 0) {
-               printk_warning("Decoding error = %d\n", res);
+               printk(BIOS_WARNING, "lzma: Decoding error = %d\n", res);
+               return 0;
        }
        return outSize;
 }