diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-04-08 12:23:30 +0000 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 20:21:45 +0200 | 
| commit | e89516f031dbf711b71e6ee4d131cdc8b9946fb0 (patch) | |
| tree | cb36d506165e971849cc1237565798fcc236af0b /lib/zlib/inftrees.h | |
| parent | 56c1769806a437c994355422f5b52ca3eee70834 (diff) | |
| download | olio-uboot-2014.01-e89516f031dbf711b71e6ee4d131cdc8b9946fb0.tar.xz olio-uboot-2014.01-e89516f031dbf711b71e6ee4d131cdc8b9946fb0.zip | |
zlib: split up to match original source tree
While looking to upgrade to zlib-1.2.5, the current mondo merge of
multiple files into a single was making things way more difficult
than it should have been.  Hard to pick out what has been changed
to port it to U-Boot, been removed as useless, and bug fixes added
after the fact.
So split the single file up into the original file names, and merge
non-essential changes back from the original tree (for some reason,
style in code in a bunch of places was changed to U-Boot style even
though this isn't "U-Boot" code).
The original build style is retained -- we have a single zlib.c that
includes all the other files, and that is the only file we compile.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'lib/zlib/inftrees.h')
| -rw-r--r-- | lib/zlib/inftrees.h | 55 | 
1 files changed, 55 insertions, 0 deletions
| diff --git a/lib/zlib/inftrees.h b/lib/zlib/inftrees.h new file mode 100644 index 000000000..b1104c87e --- /dev/null +++ b/lib/zlib/inftrees.h @@ -0,0 +1,55 @@ +/* inftrees.h -- header to use inftrees.c + * Copyright (C) 1995-2005 Mark Adler + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +/* WARNING: this file should *not* be used by applications. It is +   part of the implementation of the compression library and is +   subject to change. Applications should only use zlib.h. + */ + +/* Structure for decoding tables.  Each entry provides either the +   information needed to do the operation requested by the code that +   indexed that table entry, or it provides a pointer to another +   table that indexes more bits of the code.  op indicates whether +   the entry is a pointer to another table, a literal, a length or +   distance, an end-of-block, or an invalid code.  For a table +   pointer, the low four bits of op is the number of index bits of +   that table.  For a length or distance, the low four bits of op +   is the number of extra bits to get after the code.  bits is +   the number of bits in this code or part of the code to drop off +   of the bit buffer.  val is the actual byte to output in the case +   of a literal, the base length or distance, or the offset from +   the current table to the next table.  Each entry is four bytes. */ +typedef struct { +    unsigned char op;           /* operation, extra bits, table bits */ +    unsigned char bits;         /* bits in this part of the code */ +    unsigned short val;         /* offset in table or code value */ +} code; + +/* op values as set by inflate_table(): +    00000000 - literal +    0000tttt - table link, tttt != 0 is the number of table index bits +    0001eeee - length or distance, eeee is the number of extra bits +    01100000 - end of block +    01000000 - invalid code + */ + +/* Maximum size of dynamic tree.  The maximum found in a long but non- +   exhaustive search was 1444 code structures (852 for length/literals +   and 592 for distances, the latter actually the result of an +   exhaustive search).  The true maximum is not known, but the value +   below is more than safe. */ +#define ENOUGH 2048 +#define MAXD 592 + +/* Type of code to build for inftable() */ +typedef enum { +    CODES, +    LENS, +    DISTS +} codetype; + +extern int inflate_table OF((codetype type, unsigned short FAR *lens, +                             unsigned codes, code FAR * FAR *table, +                             unsigned FAR *bits, unsigned short FAR *work)); |