[U-Boot] [PATCH] move prototype for gunzip() to common.h
Prototype for gunzip was only in lib_generic/gunzip.c and thus repeated in every file using it. This patch moves the prototype to common.h and removes all prototypes distributed anywhere else.
Singed-off-by: Wolfgang Wegner w.wegner@astro-kom.de --- board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/dave/PPChameleonEVB/PPChameleonEVB.c | 3 --- board/esd/apc405/apc405.c | 3 --- board/esd/ash405/ash405.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/hh405/hh405.c | 4 ---- board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 3 --- board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 4 ---- board/esd/wuh405/wuh405.c | 4 ---- board/mpl/common/common_util.c | 1 - board/prodrive/pdnb3/pdnb3.c | 1 - common/cmd_bmp.c | 2 -- common/cmd_bootm.c | 1 - common/cmd_license.c | 1 - common/cmd_mem.c | 2 -- drivers/video/cfb_console.c | 2 -- include/common.h | 3 +++ lib_generic/gunzip.c | 1 - 23 files changed, 3 insertions(+), 47 deletions(-)
diff --git a/board/bf527-ezkit/video.c b/board/bf527-ezkit/video.c index 0b6b7b2..57652be 100644 --- a/board/bf527-ezkit/video.c +++ b/board/bf527-ezkit/video.c @@ -16,8 +16,6 @@ #include <linux/types.h> #include <stdio_dev.h>
-int gunzip(void *, int, unsigned char *, unsigned long *); - #define DMA_SIZE16 2
#include <asm/mach-common/bits/ppi.h> diff --git a/board/bf533-stamp/video.c b/board/bf533-stamp/video.c index 28ffa61..939bd35 100644 --- a/board/bf533-stamp/video.c +++ b/board/bf533-stamp/video.c @@ -20,8 +20,6 @@ #include <linux/types.h> #include <stdio_dev.h>
-int gunzip(void *, int, unsigned char *, unsigned long *); - #define DMA_SIZE16 2
#include <asm/mach-common/bits/ppi.h> diff --git a/board/bf548-ezkit/video.c b/board/bf548-ezkit/video.c index f4f1bec..10b08e2 100644 --- a/board/bf548-ezkit/video.c +++ b/board/bf548-ezkit/video.c @@ -16,8 +16,6 @@ #include <linux/types.h> #include <stdio_dev.h>
-int gunzip(void *, int, unsigned char *, unsigned long *); - #define DMA_SIZE16 2
#include <asm/mach-common/bits/eppi.h> diff --git a/board/cm-bf548/video.c b/board/cm-bf548/video.c index 0787342..4097f09 100644 --- a/board/cm-bf548/video.c +++ b/board/cm-bf548/video.c @@ -16,8 +16,6 @@ #include <linux/types.h> #include <stdio_dev.h>
-int gunzip(void *, int, unsigned char *, unsigned long *); - #ifdef CONFIG_VIDEO
#define DMA_SIZE16 2 diff --git a/board/dave/PPChameleonEVB/PPChameleonEVB.c b/board/dave/PPChameleonEVB/PPChameleonEVB.c index 06de6e0..6bc70ef 100644 --- a/board/dave/PPChameleonEVB/PPChameleonEVB.c +++ b/board/dave/PPChameleonEVB/PPChameleonEVB.c @@ -33,9 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* ------------------------------------------------------------------------- */
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - int board_early_init_f (void) { out32(GPIO0_OR, CONFIG_SYS_NAND0_CE); /* set initial outputs */ diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c index 409a054..72c0907 100644 --- a/board/esd/apc405/apc405.c +++ b/board/esd/apc405/apc405.c @@ -54,9 +54,6 @@ const unsigned char fpgadata[] = */ #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - #ifdef CONFIG_LCD_USED /* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp[] = diff --git a/board/esd/ash405/ash405.c b/board/esd/ash405/ash405.c index 5f0e67c..0615959 100644 --- a/board/esd/ash405/ash405.c +++ b/board/esd/ash405/ash405.c @@ -48,10 +48,6 @@ const unsigned char fpgadata[] = #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - - int board_early_init_f (void) { /* diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c index c29c876..24db883 100644 --- a/board/esd/cpci405/cpci405.c +++ b/board/esd/cpci405/cpci405.c @@ -89,7 +89,6 @@ int N_AU_IMAGES = (sizeof(au_image) / sizeof(au_image[0]));
/* Prototypes */ int cpci405_version(void); -int gunzip(void *, int, unsigned char *, unsigned long *); void lxt971_no_sleep(void);
int board_early_init_f(void) diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c index 132531b..4251d51 100644 --- a/board/esd/hh405/hh405.c +++ b/board/esd/hh405/hh405.c @@ -251,10 +251,6 @@ const unsigned char fpgadata[] = #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - - /* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp_320[] = { diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c index 34a1632..5364857 100644 --- a/board/esd/pci405/pci405.c +++ b/board/esd/pci405/pci405.c @@ -34,7 +34,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); unsigned long fpga_done_state(void); unsigned long fpga_init_state(void); diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c index c733587..93d30fa 100644 --- a/board/esd/plu405/plu405.c +++ b/board/esd/plu405/plu405.c @@ -90,9 +90,6 @@ void init_coupler(u32 addr) out_8(&ctrl->cr, CR_RR); }
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - int board_early_init_f(void) { /* diff --git a/board/esd/tasreg/tasreg.c b/board/esd/tasreg/tasreg.c index 1844442..bd9fb2f 100644 --- a/board/esd/tasreg/tasreg.c +++ b/board/esd/tasreg/tasreg.c @@ -29,7 +29,6 @@
/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len); int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len); diff --git a/board/esd/voh405/voh405.c b/board/esd/voh405/voh405.c index 3f81665..a5600de 100644 --- a/board/esd/voh405/voh405.c +++ b/board/esd/voh405/voh405.c @@ -48,10 +48,6 @@ const unsigned char fpgadata[] = #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - - /* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp_320[] = { diff --git a/board/esd/wuh405/wuh405.c b/board/esd/wuh405/wuh405.c index f2591d5..01966ee 100644 --- a/board/esd/wuh405/wuh405.c +++ b/board/esd/wuh405/wuh405.c @@ -46,10 +46,6 @@ const unsigned char fpgadata[] = #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - - int board_early_init_f (void) { /* diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index 61af4ae..32bf244 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -48,7 +48,6 @@ DECLARE_GLOBAL_DATA_PTR; #define FIRM_START 0xFFF00000 #endif
-extern int gunzip(void *, int, uchar *, unsigned long *); extern int mem_test(ulong start, ulong ramsize, int quiet);
#define I2C_BACKUP_ADDR 0x7C00 /* 0x200 bytes for backup */ diff --git a/board/prodrive/pdnb3/pdnb3.c b/board/prodrive/pdnb3/pdnb3.c index c323456..69f8f9b 100644 --- a/board/prodrive/pdnb3/pdnb3.c +++ b/board/prodrive/pdnb3/pdnb3.c @@ -29,7 +29,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
/* predefine these here for FPGA programming (before including fpga.c) */ diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index faa10a4..74ab24c 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -35,8 +35,6 @@ static int bmp_info (ulong addr); static int bmp_display (ulong addr, int x, int y);
-int gunzip(void *, int, unsigned char *, unsigned long *); - /* * Allocate and decompress a BMP image using gunzip(). * diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 401bf27..fb34432 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -59,7 +59,6 @@
DECLARE_GLOBAL_DATA_PTR;
-extern int gunzip (void *dst, int dstlen, unsigned char *src, unsigned long *lenp); #ifndef CONFIG_SYS_BOOTM_LEN #define CONFIG_SYS_BOOTM_LEN 0x800000 /* use 8MByte as default max gunzip size */ #endif diff --git a/common/cmd_license.c b/common/cmd_license.c index c6f272a..85a4871 100644 --- a/common/cmd_license.c +++ b/common/cmd_license.c @@ -29,7 +29,6 @@ #include <command.h> #include <malloc.h> #include <license.h> -int gunzip(void *, int, unsigned char *, unsigned long *);
int do_license(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { diff --git a/common/cmd_mem.c b/common/cmd_mem.c index a34b342..1839330 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -1225,8 +1225,6 @@ int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif
#ifdef CONFIG_CMD_UNZIP -int gunzip (void *, int, unsigned char *, unsigned long *); - int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { unsigned long src, dst; diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index fbc4df9..3fcb701 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -401,8 +401,6 @@ static const int video_font_draw_table32[16][4] = { { 0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00ffffff } };
-int gunzip(void *, int, unsigned char *, unsigned long *); - /******************************************************************************/
static void video_drawchars (int xx, int yy, unsigned char *s, int count) diff --git a/include/common.h b/include/common.h index f7c93bf..4267e75 100644 --- a/include/common.h +++ b/include/common.h @@ -608,6 +608,9 @@ ulong usec2ticks (unsigned long usec); ulong ticks2usec (unsigned long ticks); int init_timebase (void);
+/* lib_generic/gunzip.c */ +int gunzip(void *, int, unsigned char *, unsigned long *); + /* lib_generic/vsprintf.c */ ulong simple_strtoul(const char *cp,char **endp,unsigned int base); #ifdef CONFIG_SYS_64BIT_VSPRINTF diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index d59a448..76a5c15 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -36,7 +36,6 @@ #define RESERVED 0xe0 #define DEFLATED 8
-int gunzip(void *, int, unsigned char *, unsigned long *); void *zalloc(void *, unsigned, unsigned); void zfree(void *, void *, unsigned); int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
Hi,
sorry I did not know where to put additional comments...
I tested this patch for compile-cleanness with a powerpc toolchain (CodeSourcery freescale-4.4-78-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2 to be exact). The warnings and errors were not significantly different with and without this patch - there is no single board in MAKEALL that is compiled without warnings using this toolchain, so it was a bit difficult to compare.
Best regards, Wolfgang
Dear Wolfgang Wegner,
In message 20091208172555.GF16545@leila.ping.de you wrote:
sorry I did not know where to put additional comments...
Comments go below the "---" line, i. e.:
... Singed-off-by: Wolfgang Wegner w.wegner@astro-kom.de --- ===>> Add comments here.
board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- ...
Best regards,
Wolfgang Denk
Wolfgang Denk wrote:
Dear Wolfgang Wegner,
In message 20091208172555.GF16545@leila.ping.de you wrote:
sorry I did not know where to put additional comments...
Comments go below the "---" line, i. e.:
... Singed-off-by: Wolfgang Wegner w.wegner@astro-kom.de
^^^^^^
...and a typo s/Singed/Signed/
(Singed is what happens to the hair on your hand when the hamburger grease flares up when you flip them. :-)
gvb
[snip]
On Wed, Dec 09, 2009 at 07:46:14AM -0500, Jerry Van Baren wrote:
Wolfgang Denk wrote:
Dear Wolfgang Wegner,
In message 20091208172555.GF16545@leila.ping.de you wrote:
sorry I did not know where to put additional comments...
Comments go below the "---" line, i. e.:
... Singed-off-by: Wolfgang Wegner w.wegner@astro-kom.de
^^^^^^...and a typo s/Singed/Signed/
thank you for comments and corrections, and sorry for initially patching against the wrong code base. Somehow I had messed up what I rememberd about git branching.
Patch is updated and testing in progress - MAKEALL takes some time even here on a reasonable fast machine... In the new version, I also moved the zunzip prototype which seemingly was unused outside of gunzip.c in the master branch but now used in ubifs in next.
Regards, Wolfgang
Dear Wolfgang Wegner,
In message 1260292862-30403-1-git-send-email-w.wegner@astro-kom.de you wrote:
Prototype for gunzip was only in lib_generic/gunzip.c and thus repeated in every file using it. This patch moves the prototype to common.h and removes all prototypes distributed anywhere else.
Singed-off-by: Wolfgang Wegner w.wegner@astro-kom.de
board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/dave/PPChameleonEVB/PPChameleonEVB.c | 3 --- board/esd/apc405/apc405.c | 3 --- board/esd/ash405/ash405.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/hh405/hh405.c | 4 ---- board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 3 --- board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 4 ---- board/esd/wuh405/wuh405.c | 4 ---- board/mpl/common/common_util.c | 1 - board/prodrive/pdnb3/pdnb3.c | 1 - common/cmd_bmp.c | 2 -- common/cmd_bootm.c | 1 - common/cmd_license.c | 1 - common/cmd_mem.c | 2 -- drivers/video/cfb_console.c | 2 -- include/common.h | 3 +++ lib_generic/gunzip.c | 1 - 23 files changed, 3 insertions(+), 47 deletions(-)
Hm, this doesn't apply any more:
Applying: move prototype for gunzip() to common.h error: patch failed: board/esd/plu405/plu405.c:90 error: board/esd/plu405/plu405.c: patch does not apply error: patch failed: include/common.h:608 error: include/common.h: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging board/esd/plu405/plu405.c CONFLICT (content): Merge conflict in board/esd/plu405/plu405.c Auto-merging common/cmd_bootm.c Auto-merging drivers/video/cfb_console.c Auto-merging include/common.h CONFLICT (content): Merge conflict in include/common.h Failed to merge in the changes. Patch failed at 0001 move prototype for gunzip() to common.h
Please rebase against the "next" branch and resubmit. Thanks in advance.
Best regards,
Wolfgang Denk
Prototype for gunzip/zunzip was only in lib_generic/gunzip.c and thus repeated in every file using it. This patch moves the prototypes to common.h and removes all prototypes distributed anywhere else.
Signed-off-by: Wolfgang Wegner w.wegner@astro-kom.de --- Tested to be compile-clean for PowerPC using CodeSourcery toolchain freescale-4.4-78-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/dave/PPChameleonEVB/PPChameleonEVB.c | 3 --- board/esd/apc405/apc405.c | 3 --- board/esd/ash405/ash405.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/hh405/hh405.c | 4 ---- board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 3 --- board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 4 ---- board/esd/wuh405/wuh405.c | 4 ---- board/mpl/common/common_util.c | 1 - board/prodrive/pdnb3/pdnb3.c | 1 - common/cmd_bmp.c | 2 -- common/cmd_bootm.c | 1 - common/cmd_license.c | 1 - common/cmd_mem.c | 2 -- drivers/video/cfb_console.c | 2 -- fs/ubifs/ubifs.h | 3 --- include/common.h | 5 +++++ lib_generic/gunzip.c | 3 --- 24 files changed, 5 insertions(+), 52 deletions(-)
diff --git a/board/bf527-ezkit/video.c b/board/bf527-ezkit/video.c index 0b6b7b2..57652be 100644 --- a/board/bf527-ezkit/video.c +++ b/board/bf527-ezkit/video.c @@ -16,8 +16,6 @@ #include <linux/types.h> #include <stdio_dev.h>
-int gunzip(void *, int, unsigned char *, unsigned long *); - #define DMA_SIZE16 2
#include <asm/mach-common/bits/ppi.h> diff --git a/board/bf533-stamp/video.c b/board/bf533-stamp/video.c index 28ffa61..939bd35 100644 --- a/board/bf533-stamp/video.c +++ b/board/bf533-stamp/video.c @@ -20,8 +20,6 @@ #include <linux/types.h> #include <stdio_dev.h>
-int gunzip(void *, int, unsigned char *, unsigned long *); - #define DMA_SIZE16 2
#include <asm/mach-common/bits/ppi.h> diff --git a/board/bf548-ezkit/video.c b/board/bf548-ezkit/video.c index f4f1bec..10b08e2 100644 --- a/board/bf548-ezkit/video.c +++ b/board/bf548-ezkit/video.c @@ -16,8 +16,6 @@ #include <linux/types.h> #include <stdio_dev.h>
-int gunzip(void *, int, unsigned char *, unsigned long *); - #define DMA_SIZE16 2
#include <asm/mach-common/bits/eppi.h> diff --git a/board/cm-bf548/video.c b/board/cm-bf548/video.c index 0787342..4097f09 100644 --- a/board/cm-bf548/video.c +++ b/board/cm-bf548/video.c @@ -16,8 +16,6 @@ #include <linux/types.h> #include <stdio_dev.h>
-int gunzip(void *, int, unsigned char *, unsigned long *); - #ifdef CONFIG_VIDEO
#define DMA_SIZE16 2 diff --git a/board/dave/PPChameleonEVB/PPChameleonEVB.c b/board/dave/PPChameleonEVB/PPChameleonEVB.c index 06de6e0..6bc70ef 100644 --- a/board/dave/PPChameleonEVB/PPChameleonEVB.c +++ b/board/dave/PPChameleonEVB/PPChameleonEVB.c @@ -33,9 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* ------------------------------------------------------------------------- */
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - int board_early_init_f (void) { out32(GPIO0_OR, CONFIG_SYS_NAND0_CE); /* set initial outputs */ diff --git a/board/esd/apc405/apc405.c b/board/esd/apc405/apc405.c index 409a054..72c0907 100644 --- a/board/esd/apc405/apc405.c +++ b/board/esd/apc405/apc405.c @@ -54,9 +54,6 @@ const unsigned char fpgadata[] = */ #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - #ifdef CONFIG_LCD_USED /* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp[] = diff --git a/board/esd/ash405/ash405.c b/board/esd/ash405/ash405.c index 5f0e67c..0615959 100644 --- a/board/esd/ash405/ash405.c +++ b/board/esd/ash405/ash405.c @@ -48,10 +48,6 @@ const unsigned char fpgadata[] = #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - - int board_early_init_f (void) { /* diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c index c29c876..24db883 100644 --- a/board/esd/cpci405/cpci405.c +++ b/board/esd/cpci405/cpci405.c @@ -89,7 +89,6 @@ int N_AU_IMAGES = (sizeof(au_image) / sizeof(au_image[0]));
/* Prototypes */ int cpci405_version(void); -int gunzip(void *, int, unsigned char *, unsigned long *); void lxt971_no_sleep(void);
int board_early_init_f(void) diff --git a/board/esd/hh405/hh405.c b/board/esd/hh405/hh405.c index 132531b..4251d51 100644 --- a/board/esd/hh405/hh405.c +++ b/board/esd/hh405/hh405.c @@ -251,10 +251,6 @@ const unsigned char fpgadata[] = #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - - /* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp_320[] = { diff --git a/board/esd/pci405/pci405.c b/board/esd/pci405/pci405.c index 34a1632..5364857 100644 --- a/board/esd/pci405/pci405.c +++ b/board/esd/pci405/pci405.c @@ -34,7 +34,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); unsigned long fpga_done_state(void); unsigned long fpga_init_state(void); diff --git a/board/esd/plu405/plu405.c b/board/esd/plu405/plu405.c index fcffdf6..e385a78 100644 --- a/board/esd/plu405/plu405.c +++ b/board/esd/plu405/plu405.c @@ -46,9 +46,6 @@ const unsigned char fpgadata[] = */ #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - int board_early_init_f(void) { /* diff --git a/board/esd/tasreg/tasreg.c b/board/esd/tasreg/tasreg.c index 1844442..bd9fb2f 100644 --- a/board/esd/tasreg/tasreg.c +++ b/board/esd/tasreg/tasreg.c @@ -29,7 +29,6 @@
/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len); int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len); diff --git a/board/esd/voh405/voh405.c b/board/esd/voh405/voh405.c index 3f81665..a5600de 100644 --- a/board/esd/voh405/voh405.c +++ b/board/esd/voh405/voh405.c @@ -48,10 +48,6 @@ const unsigned char fpgadata[] = #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - - /* logo bitmap data - gzip compressed and generated by bin2c */ unsigned char logo_bmp_320[] = { diff --git a/board/esd/wuh405/wuh405.c b/board/esd/wuh405/wuh405.c index f2591d5..01966ee 100644 --- a/board/esd/wuh405/wuh405.c +++ b/board/esd/wuh405/wuh405.c @@ -46,10 +46,6 @@ const unsigned char fpgadata[] = #include "../common/fpga.c"
-/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); - - int board_early_init_f (void) { /* diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index 61af4ae..32bf244 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -48,7 +48,6 @@ DECLARE_GLOBAL_DATA_PTR; #define FIRM_START 0xFFF00000 #endif
-extern int gunzip(void *, int, uchar *, unsigned long *); extern int mem_test(ulong start, ulong ramsize, int quiet);
#define I2C_BACKUP_ADDR 0x7C00 /* 0x200 bytes for backup */ diff --git a/board/prodrive/pdnb3/pdnb3.c b/board/prodrive/pdnb3/pdnb3.c index c323456..69f8f9b 100644 --- a/board/prodrive/pdnb3/pdnb3.c +++ b/board/prodrive/pdnb3/pdnb3.c @@ -29,7 +29,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* Prototypes */ -int gunzip(void *, int, unsigned char *, unsigned long *); int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
/* predefine these here for FPGA programming (before including fpga.c) */ diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index faa10a4..74ab24c 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -35,8 +35,6 @@ static int bmp_info (ulong addr); static int bmp_display (ulong addr, int x, int y);
-int gunzip(void *, int, unsigned char *, unsigned long *); - /* * Allocate and decompress a BMP image using gunzip(). * diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index efd6aec..94ddac3 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -63,7 +63,6 @@
DECLARE_GLOBAL_DATA_PTR;
-extern int gunzip (void *dst, int dstlen, unsigned char *src, unsigned long *lenp); #ifndef CONFIG_SYS_BOOTM_LEN #define CONFIG_SYS_BOOTM_LEN 0x800000 /* use 8MByte as default max gunzip size */ #endif diff --git a/common/cmd_license.c b/common/cmd_license.c index c6f272a..85a4871 100644 --- a/common/cmd_license.c +++ b/common/cmd_license.c @@ -29,7 +29,6 @@ #include <command.h> #include <malloc.h> #include <license.h> -int gunzip(void *, int, unsigned char *, unsigned long *);
int do_license(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { diff --git a/common/cmd_mem.c b/common/cmd_mem.c index a34b342..1839330 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -1225,8 +1225,6 @@ int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #endif
#ifdef CONFIG_CMD_UNZIP -int gunzip (void *, int, unsigned char *, unsigned long *); - int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { unsigned long src, dst; diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 16d6689..c07a26e 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -403,8 +403,6 @@ static const int video_font_draw_table32[16][4] = { { 0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00ffffff } };
-int gunzip(void *, int, unsigned char *, unsigned long *); - /******************************************************************************/
static void video_drawchars (int xx, int yy, unsigned char *s, int count) diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 06772af..0af471a 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -2140,7 +2140,4 @@ int ubifs_decompress(const void *buf, int len, void *out, int *out_len, /* todo: Move these to a common U-Boot header */ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len); - -int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, - int stoponerr, int offset); #endif /* !__UBIFS_H__ */ diff --git a/include/common.h b/include/common.h index 00b5434..07897f6 100644 --- a/include/common.h +++ b/include/common.h @@ -612,6 +612,11 @@ ulong usec2ticks (unsigned long usec); ulong ticks2usec (unsigned long ticks); int init_timebase (void);
+/* lib_generic/gunzip.c */ +int gunzip(void *, int, unsigned char *, unsigned long *); +int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, + int stoponerr, int offset); + /* lib_generic/time.c */ void udelay (unsigned long);
diff --git a/lib_generic/gunzip.c b/lib_generic/gunzip.c index d59a448..d2b7ad4 100644 --- a/lib_generic/gunzip.c +++ b/lib_generic/gunzip.c @@ -36,11 +36,8 @@ #define RESERVED 0xe0 #define DEFLATED 8
-int gunzip(void *, int, unsigned char *, unsigned long *); void *zalloc(void *, unsigned, unsigned); void zfree(void *, void *, unsigned); -int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp, - int stoponerr, int offset);
void *zalloc(void *x, unsigned items, unsigned size) {
Dear Wolfgang Wegner,
In message 1260368207-2637-1-git-send-email-w.wegner@astro-kom.de you wrote:
Prototype for gunzip/zunzip was only in lib_generic/gunzip.c and thus repeated in every file using it. This patch moves the prototypes to common.h and removes all prototypes distributed anywhere else.
Signed-off-by: Wolfgang Wegner w.wegner@astro-kom.de
Tested to be compile-clean for PowerPC using CodeSourcery toolchain freescale-4.4-78-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
board/bf527-ezkit/video.c | 2 -- board/bf533-stamp/video.c | 2 -- board/bf548-ezkit/video.c | 2 -- board/cm-bf548/video.c | 2 -- board/dave/PPChameleonEVB/PPChameleonEVB.c | 3 --- board/esd/apc405/apc405.c | 3 --- board/esd/ash405/ash405.c | 4 ---- board/esd/cpci405/cpci405.c | 1 - board/esd/hh405/hh405.c | 4 ---- board/esd/pci405/pci405.c | 1 - board/esd/plu405/plu405.c | 3 --- board/esd/tasreg/tasreg.c | 1 - board/esd/voh405/voh405.c | 4 ---- board/esd/wuh405/wuh405.c | 4 ---- board/mpl/common/common_util.c | 1 - board/prodrive/pdnb3/pdnb3.c | 1 - common/cmd_bmp.c | 2 -- common/cmd_bootm.c | 1 - common/cmd_license.c | 1 - common/cmd_mem.c | 2 -- drivers/video/cfb_console.c | 2 -- fs/ubifs/ubifs.h | 3 --- include/common.h | 5 +++++ lib_generic/gunzip.c | 3 --- 24 files changed, 5 insertions(+), 52 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
participants (4)
-
Jerry Van Baren -
Wolfgang Denk -
Wolfgang Wegner -
wolfgang＠leila.ping.de