mtd/fs/jffs2 compr_lzari.c, NONE, 1.1 compr_lzo.c, NONE,
1.1 Makefile.common, 1.3, 1.4 compr.c, 1.36, 1.37 compr.h, 1.2, 1.3
havasi at infradead.org
havasi at infradead.org
Tue May 25 07:31:54 EDT 2004
- Previous message: mtd/fs Config.in,1.2,1.3 Kconfig,1.2,1.3
- Next message: mtd/util Makefile,1.50,1.51 compr.c,1.1,1.2 compr.h,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/home/havasi/mtd/fs/jffs2
Modified Files:
Makefile.common compr.c compr.h
Added Files:
compr_lzari.c compr_lzo.c
Log Message:
2 new compressors:
- lzari
- lzo
--- NEW FILE compr_lzari.c ---
/*
* JFFS2 -- Journalling Flash File System, Version 2.
*
* Copyright (C) 2004 Patrik Kluba,
* University of Szeged, Hungary
*
* For licensing information, see the file 'LICENCE' in the
* jffs2 directory.
*
* $Id: compr_lzari.c,v 1.1 2004/05/25 11:31:52 havasi Exp $
*
*/
/*
Lempel-Ziv-Arithmetic coding compression module for jffs2
Based on the LZARI source included in LDS (lossless datacompression sources)
*/
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
/*
Original copyright follows:
**************************************************************
LZARI.C -- A Data Compression Program
(tab = 4 spaces)
**************************************************************
4/7/1989 Haruhiko Okumura
Use, distribute, and modify this program freely.
Please send me your improved versions.
PC-VAN SCIENCE
NIFTY-Serve PAF01022
CompuServe 74050,1022
**************************************************************
LZARI.C (c)1989 by Haruyasu Yoshizaki, Haruhiko Okumura, and Kenji Rikitake.
All rights reserved. Permission granted for non-commercial use.
*/
/*
2004-02-18 pajko <pajko(AT)halom(DOT)u-szeged(DOT)hu>
Removed unused variables and fixed no return value
2004-02-16 pajko <pajko(AT)halom(DOT)u-szeged(DOT)hu>
Initial release
*/
/* lzari.c */
#define N 4096 /* size of ring buffer */
#define F 60 /* upper limit for match_length */
#define THRESHOLD 2 /* encode string into position and length
if match_length is greater than this */
#define NIL N /* index for root of binary search trees */
static unsigned char
text_buf[N + F - 1]; /* ring buffer of size N,
with extra F-1 bytes to facilitate string comparison */
static unsigned long match_position, match_length, /* of longest match. These are
set by the InsertNode() procedure. */
lson[N + 1], rson[N + 257], dad[N + 1]; /* left & right children &
parents -- These constitute binary search trees. */
static void InitTree(void) /* Initialize trees */
{
unsigned long i;
/* For i = 0 to N - 1, rson[i] and lson[i] will be the right and
left children of node i. These nodes need not be initialized.
Also, dad[i] is the parent of node i. These are initialized to
NIL (= N), which stands for 'not used.'
For i = 0 to 255, rson[N + i + 1] is the root of the tree
for strings that begin with character i. These are initialized
to NIL. Note there are 256 trees. */
for (i = N + 1; i <= N + 256; i++) rson[i] = NIL; /* root */
for (i = 0; i < N; i++) dad[i] = NIL; /* node */
}
static void InsertNode(unsigned long r)
/* Inserts string of length F, text_buf[r..r+F-1], into one of the
trees (text_buf[r]'th tree) and returns the longest-match position
and length via the global variables match_position and match_length.
If match_length = F, then removes the old node in favor of the new
one, because the old one will be deleted sooner.
Note r plays double role, as tree node and position in buffer. */
{
unsigned long i, p, temp;
unsigned char *key;
signed long cmp;
cmp = 1; key = &text_buf[r]; p = N + 1 + key[0];
rson[r] = lson[r] = NIL; match_length = 0;
for ( ; ; ) {
if (cmp >= 0) {
if (rson[p] != NIL) p = rson[p];
else { rson[p] = r; dad[r] = p; return; }
} else {
if (lson[p] != NIL) p = lson[p];
else { lson[p] = r; dad[r] = p; return; }
}
for (i = 1; i < F; i++)
if ((cmp = key[i] - text_buf[p + i]) != 0) break;
if (i > THRESHOLD) {
if (i > match_length) {
match_position = (r - p) & (N - 1);
if ((match_length = i) >= F) break;
} else if (i == match_length) {
if ((temp = (r - p) & (N - 1)) < match_position)
match_position = temp;
}
}
}
dad[r] = dad[p]; lson[r] = lson[p]; rson[r] = rson[p];
dad[lson[p]] = r; dad[rson[p]] = r;
if (rson[dad[p]] == p) rson[dad[p]] = r;
else lson[dad[p]] = r;
dad[p] = NIL; /* remove p */
}
static void DeleteNode(unsigned long p) /* Delete node p from tree */
{
unsigned long q;
if (dad[p] == NIL) return; /* not in tree */
if (rson[p] == NIL) q = lson[p];
else if (lson[p] == NIL) q = rson[p];
else {
q = lson[p];
if (rson[q] != NIL) {
do { q = rson[q]; } while (rson[q] != NIL);
rson[dad[q]] = lson[q]; dad[lson[q]] = dad[q];
lson[q] = lson[p]; dad[lson[p]] = q;
}
rson[q] = rson[p]; dad[rson[p]] = q;
}
dad[q] = dad[p];
if (rson[dad[p]] == p) rson[dad[p]] = q;
else lson[dad[p]] = q;
dad[p] = NIL;
}
/********** Arithmetic Compression **********/
/* If you are not familiar with arithmetic compression, you should read
I. E. Witten, R. M. Neal, and J. G. Cleary,
Communications of the ACM, Vol. 30, pp. 520-540 (1987),
from which much have been borrowed. */
#define M 15
/* Q1 (= 2 to the M) must be sufficiently large, but not so
large as the unsigned long 4 * Q1 * (Q1 - 1) overflows. */
#define Q1 (1UL << M)
#define Q2 (2 * Q1)
#define Q3 (3 * Q1)
#define Q4 (4 * Q1)
#define MAX_CUM (Q1 - 1)
#define N_CHAR (256 - THRESHOLD + F)
/* character code = 0, 1, ..., N_CHAR - 1 */
static unsigned long char_to_sym[N_CHAR], sym_to_char[N_CHAR + 1];
static unsigned long
sym_freq[N_CHAR + 1], /* frequency for symbols */
sym_cum[N_CHAR + 1], /* cumulative freq for symbols */
position_cum[N + 1]; /* cumulative freq for positions */
static void StartModel(void) /* Initialize model */
{
unsigned long ch, sym, i;
sym_cum[N_CHAR] = 0;
for (sym = N_CHAR; sym >= 1; sym--) {
ch = sym - 1;
char_to_sym[ch] = sym; sym_to_char[sym] = ch;
sym_freq[sym] = 1;
sym_cum[sym - 1] = sym_cum[sym] + sym_freq[sym];
}
sym_freq[0] = 0; /* sentinel (!= sym_freq[1]) */
position_cum[N] = 0;
for (i = N; i >= 1; i--)
position_cum[i - 1] = position_cum[i] + 10000 / (i + 200);
/* empirical distribution function (quite tentative) */
/* Please devise a better mechanism! */
}
static void UpdateModel(unsigned long sym)
{
unsigned long c, ch_i, ch_sym;
unsigned long i;
if (sym_cum[0] >= MAX_CUM) {
c = 0;
for (i = N_CHAR; i > 0; i--) {
sym_cum[i] = c;
c += (sym_freq[i] = (sym_freq[i] + 1) >> 1);
}
sym_cum[0] = c;
}
for (i = sym; sym_freq[i] == sym_freq[i - 1]; i--) ;
if (i < sym) {
ch_i = sym_to_char[i]; ch_sym = sym_to_char[sym];
sym_to_char[i] = ch_sym; sym_to_char[sym] = ch_i;
char_to_sym[ch_i] = sym; char_to_sym[ch_sym] = i;
}
sym_freq[i]++;
while (--i > 0) sym_cum[i]++;
sym_cum[0]++;
}
static unsigned long BinarySearchSym(unsigned long x)
/* 1 if x >= sym_cum[1],
N_CHAR if sym_cum[N_CHAR] > x,
i such that sym_cum[i - 1] > x >= sym_cum[i] otherwise */
{
unsigned long i, j, k;
i = 1; j = N_CHAR;
while (i < j) {
k = (i + j) / 2;
if (sym_cum[k] > x) i = k + 1; else j = k;
}
return i;
}
unsigned long BinarySearchPos(unsigned long x)
/* 0 if x >= position_cum[1],
N - 1 if position_cum[N] > x,
i such that position_cum[i] > x >= position_cum[i + 1] otherwise */
{
unsigned long i, j, k;
i = 1; j = N;
while (i < j) {
k = (i + j) / 2;
if (position_cum[k] > x) i = k + 1; else j = k;
}
return i - 1;
}
/* modified for block compression */
/* on return, srclen will contain the number of successfully compressed bytes
and dstlen will contain completed compressed bytes */
static int Encode(unsigned char *srcbuf, unsigned char *dstbuf, unsigned long *srclen,
unsigned long *dstlen)
{
unsigned long c, i, len, r, s, last_match_length, sym, range;
unsigned long low = 0;
unsigned long high = Q4;
unsigned long shifts = 0; /* counts for magnifying low and high around Q2 */
unsigned char *ip, *op;
unsigned long written = 0;
unsigned long read = 0;
unsigned char buffer = 0;
unsigned char mask = 128;
unsigned char *srcend = srcbuf + *srclen;
unsigned char *dstend = dstbuf + *dstlen;
ip = srcbuf;
op = dstbuf;
StartModel();
InitTree(); /* initialize trees */
s = 0; r = N - F;
for (i = s; i < r; i++) text_buf[i] = ' '; /* Clear the buffer with
any character that will appear often. */
for (len = 0; (len < F) && (ip < srcend); len++)
text_buf[r + len] = *(ip++); /* Read F bytes into the last F bytes of
the buffer */
read = len;
for (i = 1; i <= F; i++) InsertNode(r - i); /* Insert the F strings,
each of which begins with one or more 'space' characters. Note
the order in which these strings are inserted. This way,
degenerate trees will be less likely to occur. */
InsertNode(r); /* Finally, insert the whole string just read. The
global variables match_length and match_position are set. */
do {
if (match_length > len) match_length = len; /* match_length
may be spuriously long near the end of text. */
if (match_length <= THRESHOLD) {
match_length = 1; /* Not long enough match. Send one byte. */
sym = char_to_sym[text_buf[r]];
range = high - low;
high = low + (range * sym_cum[sym - 1]) / sym_cum[0];
low += (range * sym_cum[sym ]) / sym_cum[0];
for ( ; ; ) {
if (high <= Q2) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
for ( ; shifts > 0; shifts--) {
buffer |= mask;
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
} else if (low >= Q2) {
buffer |= mask;
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
for ( ; shifts > 0; shifts--) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
low -= Q2;
high -= Q2;
} else if (low >= Q1 && high <= Q3) {
shifts++;
low -= Q1;
high -= Q1;
} else break;
low += low; high += high;
}
UpdateModel(sym);
} else {
sym = char_to_sym[255 - THRESHOLD + match_length];
range = high - low;
high = low + (range * sym_cum[sym - 1]) / sym_cum[0];
low += (range * sym_cum[sym ]) / sym_cum[0];
for ( ; ; ) {
if (high <= Q2) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
for ( ; shifts > 0; shifts--) {
buffer |= mask;
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
} else if (low >= Q2) {
buffer |= mask;
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
for ( ; shifts > 0; shifts--) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
low -= Q2;
high -= Q2;
} else if (low >= Q1 && high <= Q3) {
shifts++;
low -= Q1;
high -= Q1;
} else break;
low += low; high += high;
}
UpdateModel(sym);
range = high - low;
high = low + (range * position_cum[match_position - 1]) / position_cum[0];
low += (range * position_cum[match_position ]) / position_cum[0];
for ( ; ; ) {
if (high <= Q2) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
for ( ; shifts > 0; shifts--) {
buffer |= mask;
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
} else {
if (low >= Q2) {
buffer |= mask;
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
for ( ; shifts > 0; shifts--) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
low -= Q2;
high -= Q2;
} else {
if ((low >= Q1) && (high <= Q3)) {
shifts++;
low -= Q1;
high -= Q1;
} else {
break;
}
}
}
low += low;
high += high;
}
}
last_match_length = match_length;
for (i = 0; (i < last_match_length) && (ip < srcend); i++) {
c = *(ip++);
DeleteNode(s);
text_buf[s] = c;
if (s < F - 1)
text_buf[s + N] = c;
s = (s + 1) & (N - 1);
r = (r + 1) & (N - 1);
InsertNode(r);
}
read += i;
while (i++ < last_match_length) {
DeleteNode(s);
s = (s + 1) & (N - 1);
r = (r + 1) & (N - 1);
if (--len) InsertNode(r);
}
} while (len > 0);
shifts++;
if (low < Q1) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
for ( ; shifts > 0; shifts--) {
buffer |= mask;
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
} else {
buffer |= mask;
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
for ( ; shifts > 0; shifts--) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
}
for (i = 0; i < 7; i++) {
if ((mask >>= 1) == 0) {
if (op >= dstend) {
*dstlen = written;
return -1;
}
*(op++) = buffer;
buffer = 0;
mask = 128;
written++;
*srclen = read;
}
}
*dstlen = written;
return 0;
}
static int Decode(unsigned char *srcbuf, unsigned char *dstbuf, unsigned long srclen,
unsigned long dstlen) /* Just the reverse of Encode(). */
{
unsigned long i, r, j, k, c, range, sym;
unsigned char *ip, *op;
unsigned char *srcend = srcbuf + srclen;
unsigned char *dstend = dstbuf + dstlen;
unsigned char buffer = 0;
unsigned char mask = 0;
unsigned long low = 0;
unsigned long high = Q4;
unsigned long value = 0;
ip = srcbuf;
op = dstbuf;
for (i = 0; i < M + 2; i++) {
value *= 2;
if ((mask >>= 1) == 0) {
buffer = (ip >= srcend) ? 0 : *(ip++);
mask = 128;
}
value += ((buffer & mask) != 0);
}
StartModel();
for (i = 0; i < N - F; i++) text_buf[i] = ' ';
r = N - F;
while (op < dstend) {
range = high - low;
sym = BinarySearchSym((unsigned long)
(((value - low + 1) * sym_cum[0] - 1) / range));
high = low + (range * sym_cum[sym - 1]) / sym_cum[0];
low += (range * sym_cum[sym ]) / sym_cum[0];
for ( ; ; ) {
if (low >= Q2) {
value -= Q2; low -= Q2; high -= Q2;
} else if (low >= Q1 && high <= Q3) {
value -= Q1; low -= Q1; high -= Q1;
} else if (high > Q2) break;
low += low; high += high;
value *= 2;
if ((mask >>= 1) == 0) {
buffer = (ip >= srcend) ? 0 : *(ip++);
mask = 128;
}
value += ((buffer & mask) != 0);
}
c = sym_to_char[sym];
UpdateModel(sym);
if (c < 256) {
if (op >= dstend) return -1;
*(op++) = c;
text_buf[r++] = c;
r &= (N - 1);
} else {
j = c - 255 + THRESHOLD;
range = high - low;
i = BinarySearchPos((unsigned long)
(((value - low + 1) * position_cum[0] - 1) / range));
high = low + (range * position_cum[i ]) / position_cum[0];
low += (range * position_cum[i + 1]) / position_cum[0];
for ( ; ; ) {
if (low >= Q2) {
value -= Q2; low -= Q2; high -= Q2;
} else if (low >= Q1 && high <= Q3) {
value -= Q1; low -= Q1; high -= Q1;
} else if (high > Q2) break;
low += low; high += high;
value *= 2;
if ((mask >>= 1) == 0) {
buffer = (ip >= srcend) ? 0 : *(ip++);
mask = 128;
}
value += ((buffer & mask) != 0);
}
i = (r - i - 1) & (N - 1);
for (k = 0; k < j; k++) {
c = text_buf[(i + k) & (N - 1)];
if (op >= dstend) return -1;
*(op++) = c;
text_buf[r++] = c;
r &= (N - 1);
}
}
}
return 0;
}
/* interface to jffs2 follows */
#include "compr.h"
#include <linux/jffs2.h>
int jffs2_lzari_compress (unsigned char *input,
unsigned char *output, uint32_t *sourcelen,
uint32_t *dstlen);
int jffs2_lzari_estimate (uint32_t *est_rtime, uint32_t *est_wtime, uint32_t *est_size,
unsigned char *cdata_in, unsigned char *data_out,
uint32_t cdatalen, uint32_t datalen);
int jffs2_lzari_decompress (unsigned char *input,
unsigned char *output, uint32_t sourcelen,
uint32_t dstlen);
struct jffs2_compressor jffs2_lzari_comp = {
.priority = JFFS2_LZARI_PRIORITY,
.name = "lzari",
.compr = JFFS2_COMPR_LZARI,
.compress = &jffs2_lzari_compress,
.decompress = &jffs2_lzari_decompress,
#ifdef JFFS2_LZARI_DISABLED
.disabled = 1,
#else
.disabled = 0,
#endif
};
int jffs2_lzari_compress (unsigned char *input,
unsigned char *output, uint32_t *sourcelen,
uint32_t *dstlen)
{
return Encode(input, output, (unsigned long *)sourcelen, (unsigned long *)dstlen);
}
int jffs2_lzari_estimate (uint32_t *est_rtime, uint32_t *est_wtime, uint32_t *est_size,
unsigned char *cdata_in, unsigned char *data_out,
uint32_t cdatalen, uint32_t datalen)
{
return 0;
}
int jffs2_lzari_decompress (unsigned char *input,
unsigned char *output, uint32_t sourcelen,
uint32_t dstlen)
{
return Decode(input, output, sourcelen, dstlen);
}
int jffs2_lzari_init (void)
{
return jffs2_register_compressor(&jffs2_lzari_comp);
}
void jffs2_lzari_exit (void)
{
jffs2_unregister_compressor (&jffs2_lzari_comp);
}
--- NEW FILE compr_lzo.c ---
/*
* JFFS2 -- Journalling Flash File System, Version 2.
*
* Copyright (C) 2004 Patrik Kluba,
* University of Szeged, Hungary
*
* For licensing information, see the file 'LICENCE' in the
* jffs2 directory.
*
* $Id: compr_lzo.c,v 1.1 2004/05/25 11:31:52 havasi Exp $
*
*/
/*
LZO1X-1 (and -999) compression module for jffs2
based on the original LZO sources
*/
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
[...2301 lines suppressed...]
uint32_t dstlen)
{
lzo_uint outlen = dstlen;
return lzo1x_decompress (input, sourcelen, output, &outlen, NULL);
}
int jffs2_lzo_init (void)
{
wrkmem = (lzo_bytep) JFFS2_MALLOC_BIG(lzo1x_compressor_memsize);
if (!wrkmem) return -1;
jffs2_register_compressor(&jffs2_lzo_comp);
return 0;
}
void jffs2_lzo_exit (void)
{
jffs2_unregister_compressor (&jffs2_lzo_comp);
if (cmprssmem) JFFS2_FREE_BIG(cmprssmem);
JFFS2_FREE_BIG(wrkmem);
}
Index: Makefile.common
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/Makefile.common,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.common 25 May 2004 11:25:25 -0000 1.3
+++ Makefile.common 25 May 2004 11:31:51 -0000 1.4
@@ -15,6 +15,8 @@
JRUBIN_OBJS-$(CONFIG_JFFS2_RUBIN) := compr_rubin.o
JRTIME_OBJS-$(CONFIG_JFFS2_RTIME) := compr_rtime.o
JZLIB_OBJS-$(CONFIG_JFFS2_ZLIB) := compr_zlib.o
+JLZO_OBJS-$(CONFIG_JFFS2_LZO) := compr_lzo.o
+JLZARI_OBJS-$(CONFIG_JFFS2_LZARI) := compr_lzari.o
JPROC_OBJS-$(CONFIG_JFFS2_PROC) := proc.o
JFFS2_OBJS := compr.o dir.o file.o ioctl.o nodelist.o malloc.o \
read.o nodemgmt.o readinode.o write.o scan.o gc.o \
@@ -32,7 +34,7 @@
jffs2-objs := $(COMPR_OBJS) $(JFFS2_OBJS) $(VERS_OBJS) $(NAND_OBJS-y) \
$(LINUX_OBJS) $(JRUBIN_OBJS-y) $(JRTIME_OBJS-y) $(JZLIB_OBJS-y) \
- $(JPROC_OBJS-y)
+ $(JPROC_OBJS-y) $(JLZO_OBJS-y) $(JLZARI_OBJS-y)
# 2.4 build compatibility
ifeq ($(BELOW25),y)
Index: compr.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- compr.c 25 May 2004 11:25:25 -0000 1.36
+++ compr.c 25 May 2004 11:31:52 -0000 1.37
@@ -432,6 +432,12 @@
jffs2_rubinmips_init();
jffs2_dynrubin_init();
#endif
+#ifdef CONFIG_JFFS2_LZARI
+ jffs2_lzari_init();
+#endif
+#ifdef CONFIG_JFFS2_LZO
+ jffs2_lzo_init();
+#endif
/* Setting default compression mode */
#ifdef CONFIG_JFFS2_CMODE_NONE
jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;
@@ -450,6 +456,12 @@
int jffs2_compressors_exit(void)
{
/* Unregistering compressors */
+#ifdef CONFIG_JFFS2_LZO
+ jffs2_lzo_exit();
+#endif
+#ifdef CONFIG_JFFS2_LZARI
+ jffs2_lzari_exit();
+#endif
#ifdef CONFIG_JFFS2_RUBIN
jffs2_dynrubin_exit();
jffs2_rubinmips_exit();
Index: compr.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compr.h 25 May 2004 11:25:25 -0000 1.2
+++ compr.h 25 May 2004 11:31:52 -0000 1.3
@@ -29,6 +29,8 @@
#define JFFS2_RUBINMIPS_PRIORITY 10
#define JFFS2_DYNRUBIN_PRIORITY 20
+#define JFFS2_LZARI_PRIORITY 30
+#define JFFS2_LZO_PRIORITY 40
#define JFFS2_RTIME_PRIORITY 50
#define JFFS2_ZLIB_PRIORITY 60
@@ -108,6 +110,14 @@
#ifdef CONFIG_JFFS2_ZLIB
int jffs2_zlib_init(void);
void jffs2_zlib_exit(void);
+#endif
+#ifdef CONFIG_JFFS2_LZARI
+int jffs2_lzari_init(void);
+void jffs2_lzari_exit(void);
+#endif
+#ifdef CONFIG_JFFS2_LZO
+int jffs2_lzo_init(void);
+void jffs2_lzo_exit(void);
#endif
/* Prototypes from proc.c */
- Previous message: mtd/fs Config.in,1.2,1.3 Kconfig,1.2,1.3
- Next message: mtd/util Makefile,1.50,1.51 compr.c,1.1,1.2 compr.h,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the linux-mtd-cvs
mailing list