ecos: packages/fs/jffs2/current/src/compr

annotate packages/fs/jffs2/current/src/compr_zlib.c @ 1713:0492a413d138

* Merge from public MTD.

author	asl
date	Thu, 12 Aug 2004 21:35:27 +0000
parents	cd7d2afbc7dd
children	9558d3d305bf

rev	line source
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	1 /*
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	2 * JFFS2 -- Journalling Flash File System, Version 2.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	3 *
1372 121121d3d18f Merge changes from David Woodhouse (bring up to date with MTD project) gthomas parents: 1118 diff changeset	4 * Copyright (C) 2001-2003 Red Hat, Inc.
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	5 *
1372 121121d3d18f Merge changes from David Woodhouse (bring up to date with MTD project) gthomas parents: 1118 diff changeset	6 * Created by David Woodhouse <dwmw2@redhat.com>
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	7 *
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	8 * For licensing information, see the file 'LICENCE' in this directory.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	9 *
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	10 * $Id: compr_zlib.c,v 1.28 2004/06/23 16:34:40 havasi Exp $
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	11 *
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	12 */
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	13
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	14 #if !defined(__KERNEL__) && !defined(__ECOS)
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	15 #error "The userspace support got too messy and was removed. Update your mkfs.jffs2"
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	16 #endif
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	17
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	18 #include <linux/config.h>
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	19 #include <linux/kernel.h>
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	20 #include <linux/slab.h>
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	21 #include <linux/zlib.h>
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	22 #include <linux/zutil.h>
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	23 #include <asm/semaphore.h>
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	24 #include "nodelist.h"
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	25 #include "compr.h"
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	26
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	27 /* Plan: call deflate() with avail_in == *sourcelen,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	28 avail_out = *dstlen - 12 and flush == Z_FINISH.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	29 If it doesn't manage to finish, call it again with
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	30 avail_in == 0 and avail_out set to the remaining 12
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	31 bytes for it to clean up.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	32 Q: Is 12 bytes sufficient?
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	33 */
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	34 #define STREAM_END_SPACE 12
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	35
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	36 static DECLARE_MUTEX(deflate_sem);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	37 static DECLARE_MUTEX(inflate_sem);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	38 static z_stream inf_strm, def_strm;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	39
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	40 #ifdef __KERNEL__ /* Linux-only */
1443 cd7d2afbc7dd Import latest JFFS2 code from David Woodhouse gthomas parents: 1372 diff changeset	41 #include <linux/vmalloc.h>
cd7d2afbc7dd Import latest JFFS2 code from David Woodhouse gthomas parents: 1372 diff changeset	42 #include <linux/init.h>
cd7d2afbc7dd Import latest JFFS2 code from David Woodhouse gthomas parents: 1372 diff changeset	43
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	44 static int __init alloc_workspaces(void)
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	45 {
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	46 def_strm.workspace = vmalloc(zlib_deflate_workspacesize());
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	47 if (!def_strm.workspace) {
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	48 printk(KERN_WARNING "Failed to allocate %d bytes for deflate workspace\n", zlib_deflate_workspacesize());
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	49 return -ENOMEM;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	50 }
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	51 D1(printk(KERN_DEBUG "Allocated %d bytes for deflate workspace\n", zlib_deflate_workspacesize()));
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	52 inf_strm.workspace = vmalloc(zlib_inflate_workspacesize());
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	53 if (!inf_strm.workspace) {
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	54 printk(KERN_WARNING "Failed to allocate %d bytes for inflate workspace\n", zlib_inflate_workspacesize());
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	55 vfree(def_strm.workspace);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	56 return -ENOMEM;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	57 }
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	58 D1(printk(KERN_DEBUG "Allocated %d bytes for inflate workspace\n", zlib_inflate_workspacesize()));
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	59 return 0;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	60 }
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	61
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	62 static void free_workspaces(void)
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	63 {
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	64 vfree(def_strm.workspace);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	65 vfree(inf_strm.workspace);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	66 }
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	67 #else
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	68 #define alloc_workspaces() (0)
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	69 #define free_workspaces() do { } while(0)
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	70 #endif /* __KERNEL__ */
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	71
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	72 int jffs2_zlib_compress(unsigned char data_in, unsigned char cpage_out,
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	73 uint32_t sourcelen, uint32_t dstlen, void *model)
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	74 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	75 int ret;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	76
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	77 if (*dstlen <= STREAM_END_SPACE)
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	78 return -1;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	79
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	80 down(&deflate_sem);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	81
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	82 if (Z_OK != zlib_deflateInit(&def_strm, 3)) {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	83 printk(KERN_WARNING "deflateInit failed\n");
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	84 up(&deflate_sem);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	85 return -1;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	86 }
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	87
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	88 def_strm.next_in = data_in;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	89 def_strm.total_in = 0;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	90
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	91 def_strm.next_out = cpage_out;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	92 def_strm.total_out = 0;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	93
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	94 while (def_strm.total_out < dstlen - STREAM_END_SPACE && def_strm.total_in < sourcelen) {
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	95 def_strm.avail_out = *dstlen - (def_strm.total_out + STREAM_END_SPACE);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	96 def_strm.avail_in = min((unsigned)(*sourcelen-def_strm.total_in), def_strm.avail_out);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	97 D1(printk(KERN_DEBUG "calling deflate with avail_in %d, avail_out %d\n",
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	98 def_strm.avail_in, def_strm.avail_out));
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	99 ret = zlib_deflate(&def_strm, Z_PARTIAL_FLUSH);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	100 D1(printk(KERN_DEBUG "deflate returned with avail_in %d, avail_out %d, total_in %ld, total_out %ld\n",
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	101 def_strm.avail_in, def_strm.avail_out, def_strm.total_in, def_strm.total_out));
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	102 if (ret != Z_OK) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	103 D1(printk(KERN_DEBUG "deflate in loop returned %d\n", ret));
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	104 zlib_deflateEnd(&def_strm);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	105 up(&deflate_sem);
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	106 return -1;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	107 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	108 }
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	109 def_strm.avail_out += STREAM_END_SPACE;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	110 def_strm.avail_in = 0;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	111 ret = zlib_deflate(&def_strm, Z_FINISH);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	112 zlib_deflateEnd(&def_strm);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	113
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	114 if (ret != Z_STREAM_END) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	115 D1(printk(KERN_DEBUG "final deflate returned %d\n", ret));
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	116 ret = -1;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	117 goto out;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	118 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	119
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	120 if (def_strm.total_out >= def_strm.total_in) {
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	121 D1(printk(KERN_DEBUG "zlib compressed %ld bytes into %ld; failing\n",
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	122 def_strm.total_in, def_strm.total_out));
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	123 ret = -1;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	124 goto out;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	125 }
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	126
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	127 D1(printk(KERN_DEBUG "zlib compressed %ld bytes into %ld\n",
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	128 def_strm.total_in, def_strm.total_out));
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	129
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	130 *dstlen = def_strm.total_out;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	131 *sourcelen = def_strm.total_in;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	132 ret = 0;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	133 out:
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	134 up(&deflate_sem);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	135 return ret;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	136 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	137
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	138 int jffs2_zlib_decompress(unsigned char data_in, unsigned char cpage_out,
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	139 uint32_t srclen, uint32_t destlen, void *model)
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	140 {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	141 int ret;
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	142 int wbits = MAX_WBITS;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	143
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	144 down(&inflate_sem);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	145
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	146 inf_strm.next_in = data_in;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	147 inf_strm.avail_in = srclen;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	148 inf_strm.total_in = 0;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	149
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	150 inf_strm.next_out = cpage_out;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	151 inf_strm.avail_out = destlen;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	152 inf_strm.total_out = 0;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	153
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	154 /* If it's deflate, and it's got no preset dictionary, then
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	155 we can tell zlib to skip the adler32 check. */
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	156 if (srclen > 2 && !(data_in[1] & PRESET_DICT) &&
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	157 ((data_in[0] & 0x0f) == Z_DEFLATED) &&
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	158 !(((data_in[0]<<8) + data_in[1]) % 31)) {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	159
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	160 D2(printk(KERN_DEBUG "inflate skipping adler32\n"));
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	161 wbits = -((data_in[0] >> 4) + 8);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	162 inf_strm.next_in += 2;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	163 inf_strm.avail_in -= 2;
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	164 } else {
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	165 /* Let this remain D1 for now -- it should never happen */
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	166 D1(printk(KERN_DEBUG "inflate not skipping adler32\n"));
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	167 }
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	168
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	169
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	170 if (Z_OK != zlib_inflateInit2(&inf_strm, wbits)) {
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	171 printk(KERN_WARNING "inflateInit failed\n");
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	172 up(&inflate_sem);
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	173 return 1;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	174 }
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	175
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	176 while((ret = zlib_inflate(&inf_strm, Z_FINISH)) == Z_OK)
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	177 ;
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	178 if (ret != Z_STREAM_END) {
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	179 printk(KERN_NOTICE "inflate returned %d\n", ret);
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	180 }
570 a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	181 zlib_inflateEnd(&inf_strm);
a7947d436e85 Update to latest public JFFS2 sources gthomas parents: 208 diff changeset	182 up(&inflate_sem);
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	183 return 0;
208 e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST jlarmour parents: diff changeset	184 }
1713 0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	185
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	186 static struct jffs2_compressor jffs2_zlib_comp = {
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	187 .priority = JFFS2_ZLIB_PRIORITY,
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	188 .name = "zlib",
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	189 .compr = JFFS2_COMPR_ZLIB,
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	190 .compress = &jffs2_zlib_compress,
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	191 .decompress = &jffs2_zlib_decompress,
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	192 #ifdef JFFS2_ZLIB_DISABLED
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	193 .disabled = 1,
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	194 #else
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	195 .disabled = 0,
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	196 #endif
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	197 };
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	198
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	199 int __init jffs2_zlib_init(void)
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	200 {
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	201 int ret;
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	202
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	203 ret = alloc_workspaces();
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	204 if (ret)
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	205 return ret;
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	206
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	207 ret = jffs2_register_compressor(&jffs2_zlib_comp);
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	208 if (ret)
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	209 free_workspaces();
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	210
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	211 return ret;
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	212 }
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	213
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	214 void jffs2_zlib_exit(void)
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	215 {
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	216 jffs2_unregister_compressor(&jffs2_zlib_comp);
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	217 free_workspaces();
0492a413d138 * Merge from public MTD. asl parents: 1443 diff changeset	218 }

Mercurial > ecos

annotate packages/fs/jffs2/current/src/compr_zlib.c @ 1713:0492a413d138