diff options
author | wdenk <wdenk> | 2003-10-15 23:53:47 (GMT) |
---|---|---|
committer | wdenk <wdenk> | 2003-10-15 23:53:47 (GMT) |
commit | 42d1f0394bef0624fc9664714d54bb137931d6a6 (patch) | |
tree | 892a4130507484d25faf9a72e019cf88cfb3e3d9 /lib_generic/bzlib_private.h | |
parent | 2d5b561e2bfdee8552a99b2cf93016cce2a74895 (diff) | |
download | u-boot-42d1f0394bef0624fc9664714d54bb137931d6a6.tar.xz |
* Patches by Xianghua Xiao, 15 Oct 2003:
- Added Motorola CPU 8540/8560 support (cpu/85xx)
- Added Motorola MPC8540ADS board support (board/mpc8540ads)
- Added Motorola MPC8560ADS board support (board/mpc8560ads)
* Minor code cleanup
Diffstat (limited to 'lib_generic/bzlib_private.h')
-rw-r--r-- | lib_generic/bzlib_private.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/lib_generic/bzlib_private.h b/lib_generic/bzlib_private.h index 9c26774..87d8f94 100644 --- a/lib_generic/bzlib_private.h +++ b/lib_generic/bzlib_private.h @@ -77,7 +77,6 @@ #endif - /*-- General stuff. --*/ #define BZ_VERSION "1.0.2, 30-Dec-2001" @@ -105,7 +104,7 @@ extern void BZ2_bz__AssertH__fail ( int errcode ); #define AssertD(cond,msg) \ { if (!(cond)) { \ fprintf ( stderr, \ - "\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\ + "\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\ exit(1); \ }} #else @@ -163,7 +162,6 @@ extern void bz_internal_error ( int errcode ); #define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE)) - /*-- Stuff for randomising repetitive blocks. --*/ extern Int32 BZ2_rNums[512]; @@ -187,7 +185,6 @@ extern Int32 BZ2_rNums[512]; s->rNToGo--; - /*-- Stuff for doing CRCs. --*/ extern UInt32 BZ2_crc32Table[256]; @@ -205,12 +202,11 @@ extern UInt32 BZ2_crc32Table[256]; #define BZ_UPDATE_CRC(crcVar,cha) \ { \ crcVar = (crcVar << 8) ^ \ - BZ2_crc32Table[(crcVar >> 24) ^ \ - ((UChar)cha)]; \ + BZ2_crc32Table[(crcVar >> 24) ^ \ + ((UChar)cha)]; \ } - /*-- States and modes for compression. --*/ #define BZ_M_IDLE 1 @@ -227,8 +223,6 @@ extern UInt32 BZ2_crc32Table[256]; #define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2) - - /*-- Structure holding all the compression-side stuff. --*/ typedef @@ -304,7 +298,6 @@ typedef EState; - /*-- externs for compression. --*/ extern void @@ -323,7 +316,6 @@ extern void BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 ); - /*-- states for decompression. --*/ #define BZ_X_IDLE 1 @@ -372,14 +364,12 @@ BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 ); #define BZ_X_CCRC_4 50 - /*-- Constants for the fast MTF decoder. --*/ #define MTFA_SIZE 4096 #define MTFL_SIZE 16 - /*-- Structure holding all the decompression-side stuff. --*/ typedef @@ -476,7 +466,6 @@ typedef DState; - /*-- Macros for decompression. --*/ #define BZ_GET_FAST(cccc) \ @@ -491,8 +480,8 @@ typedef #define SET_LL4(i,n) \ { if (((i) & 0x1) == 0) \ - s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else \ - s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4); \ + s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else \ + s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4); \ } #define GET_LL4(i) \ @@ -521,7 +510,7 @@ BZ2_decompress ( DState* ); extern void BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, - Int32, Int32, Int32 ); + Int32, Int32, Int32 ); #endif |