From 07cc0999413481568b38b8d0e5f3d7514d9540b0 Mon Sep 17 00:00:00 2001 From: wdenk Date: Thu, 5 May 2005 00:04:14 +0000 Subject: Major upate of JFFS2 code; now in sync with snapshot of MTD CVS of March 13, 2005); new configuration options CONFIG_JFFS2_LZO and CONFIG_JFFS2_LZARI are added. Both are undefined by default. --- include/jffs2/jffs2.h | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'include/jffs2') diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index dee43a6d31..2fec488d1a 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -65,7 +65,9 @@ #define JFFS2_COMPR_COPY 0x04 #define JFFS2_COMPR_DYNRUBIN 0x05 #define JFFS2_COMPR_ZLIB 0x06 -#define JFFS2_NUM_COMPR 7 +#define JFFS2_COMPR_LZO 0x07 +#define JFFS2_COMPR_LZARI 0x08 +#define JFFS2_NUM_COMPR 9 /* Compatibility flags. */ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ @@ -193,14 +195,22 @@ u32 jffs2_1pass_ls(struct part_info *part,const char *fname); u32 jffs2_1pass_load(char *dest, struct part_info *part,const char *fname); u32 jffs2_1pass_info(struct part_info *part); -void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out, u32 - srclen, u32 destlen); -void rubin_do_decompress(unsigned char *bits, unsigned char *in, unsigned char - *page_out, __u32 destlen); +void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out, + u32 srclen, u32 destlen); +void rubin_do_decompress(unsigned char *bits, unsigned char *in, + unsigned char *page_out, __u32 destlen); void dynrubin_decompress(unsigned char *data_in, unsigned char *cpage_out, - unsigned long sourcelen, unsigned long dstlen); + unsigned long sourcelen, unsigned long dstlen); long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, - __u32 srclen, __u32 destlen); + __u32 srclen, __u32 destlen); +#if defined(CONFIG_JFFS2_LZARI) +int lzari_decompress(unsigned char *data_in, unsigned char *cpage_out, + u32 srclen, u32 destlen); +#endif +#if defined(CONFIG_JFFS2_LZO) +int lzo_decompress(unsigned char *data_in, unsigned char *cpage_out, + u32 srclen, u32 destlen); +#endif char *mkmodestr(unsigned long mode, char *str); #endif /* __LINUX_JFFS2_H__ */ -- cgit v1.2.1