Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc22c17e authored by Alain Knaff's avatar Alain Knaff Committed by H. Peter Anvin
Browse files

bzip2/lzma: library support for gzip, bzip2 and lzma decompression 



Impact: Replaces inflate.c with a wrapper around zlib_inflate; new library code

This is the first part of the bzip2/lzma patch

The bzip patch is based on an idea by Christian Ludwig, includes support for
compressing the kernel with bzip2 or lzma rather than gzip. Both
compressors give smaller sizes than gzip.  Lzma's decompresses faster
than bzip2.

It also supports ramdisks and initramfs' compressed using these two
compressors.

The functionality has been successfully used for a couple of years by
the udpcast project

This version applies to "tip" kernel 2.6.28

This part contains:
- changed inflate.c to accomodate rest of patch
- implementation of bzip2 compression (not used at this stage yet)
- implementation of lzma compression (not used at this stage yet)
- Makefile routines to support bzip2 and lzma kernel compression

Signed-off-by: default avatarAlain Knaff <alain@knaff.lu>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 7d3b56ba

include/linux/decompress/bunzip2.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef DECOMPRESS_BUNZIP2_H

#define DECOMPRESS_BUNZIP2_H



int bunzip2(unsigned char *inbuf, int len,

	    int(*fill)(void*, unsigned int),

	    int(*flush)(void*, unsigned int),

	    unsigned char *output,

	    int *pos,

	    void(*error)(char *x));

#endif

include/linux/decompress/generic.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#ifndef DECOMPRESS_GENERIC_H

#define DECOMPRESS_GENERIC_H



/* Minimal chunksize to be read.

 *Bzip2 prefers at least 4096

 *Lzma prefers 0x10000 */

#define COMPR_IOBUF_SIZE	4096



typedef int (*decompress_fn) (unsigned char *inbuf, int len,

			      int(*fill)(void*, unsigned int),

			      int(*writebb)(void*, unsigned int),

			      unsigned char *output,

			      int *posp,

			      void(*error)(char *x));



/* inbuf   - input buffer

 *len     - len of pre-read data in inbuf

 *fill    - function to fill inbuf if empty

 *writebb - function to write out outbug

 *posp    - if non-null, input position (number of bytes read) will be

 *	  returned here

 *

 *If len != 0, the inbuf is initialized (with as much data), and fill

 *should not be called

 *If len = 0, the inbuf is allocated, but empty. Its size is IOBUF_SIZE

 *fill should be called (repeatedly...) to read data, at most IOBUF_SIZE

 */





#endif

include/linux/decompress/inflate.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef INFLATE_H

#define INFLATE_H



/* Other housekeeping constants */

#define INBUFSIZ 4096



int gunzip(unsigned char *inbuf, int len,

	   int(*fill)(void*, unsigned int),

	   int(*flush)(void*, unsigned int),

	   unsigned char *output,

	   int *pos,

	   void(*error_fn)(char *x));

#endif

include/linux/decompress/mm.h

0 → 100644
+87 −0
Original line number Diff line number Diff line 
/*

 * linux/compr_mm.h

 *

 * Memory management for pre-boot and ramdisk uncompressors

 *

 * Authors: Alain Knaff <alain@knaff.lu>

 *

 */



#ifndef DECOMPR_MM_H

#define DECOMPR_MM_H



#ifdef STATIC



/* Code active when included from pre-boot environment: */



/* A trivial malloc implementation, adapted from

 *  malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994

 */

static unsigned long malloc_ptr;

static int malloc_count;



static void *malloc(int size)

{

	void *p;



	if (size < 0)

		error("Malloc error");

	if (!malloc_ptr)

		malloc_ptr = free_mem_ptr;



	malloc_ptr = (malloc_ptr + 3) & ~3;     /* Align */



	p = (void *)malloc_ptr;

	malloc_ptr += size;



	if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr)

		error("Out of memory");



	malloc_count++;

	return p;

}



static void free(void *where)

{

	malloc_count--;

	if (!malloc_count)

		malloc_ptr = free_mem_ptr;

}



#define large_malloc(a) malloc(a)

#define large_free(a) free(a)



#define set_error_fn(x)



#define INIT



#else /* STATIC */



/* Code active when compiled standalone for use when loading ramdisk: */



#include <linux/kernel.h>

#include <linux/fs.h>

#include <linux/string.h>

#include <linux/vmalloc.h>



/* Use defines rather than static inline in order to avoid spurious

 * warnings when not needed (indeed large_malloc / large_free are not

 * needed by inflate */



#define malloc(a) kmalloc(a, GFP_KERNEL)

#define free(a) kfree(a)



#define large_malloc(a) vmalloc(a)

#define large_free(a) vfree(a)



static void(*error)(char *m);

#define set_error_fn(x) error = x;



#define INIT __init

#define STATIC



#include <linux/init.h>



#endif /* STATIC */



#endif /* DECOMPR_MM_H */

include/linux/decompress/unlzma.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#ifndef DECOMPRESS_UNLZMA_H

#define DECOMPRESS_UNLZMA_H



int unlzma(unsigned char *, int,

	   int(*fill)(void*, unsigned int),

	   int(*flush)(void*, unsigned int),

	   unsigned char *output,

	   int *posp,

	   void(*error)(char *x)

	);



#endif