From f05b2ac0bc4626e854afc6e6a5d1b88071adbd7c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 21 Apr 2004 16:01:48 +0000 Subject: Remove duplicate white lines. --- .../lib/libbsp/powerpc/shared/bootloader/bootldr.h | 1 - c/src/lib/libbsp/powerpc/shared/bootloader/em86.c | 5 - .../libbsp/powerpc/shared/bootloader/em86real.S | 5 - c/src/lib/libbsp/powerpc/shared/bootloader/head.S | 9 -- c/src/lib/libbsp/powerpc/shared/bootloader/lib.c | 1 - c/src/lib/libbsp/powerpc/shared/bootloader/misc.c | 6 - c/src/lib/libbsp/powerpc/shared/bootloader/mm.c | 3 - c/src/lib/libbsp/powerpc/shared/bootloader/pci.c | 134 --------------------- c/src/lib/libbsp/powerpc/shared/bootloader/pci.h | 1 - c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c | 39 ------ c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h | 2 - 11 files changed, 206 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/shared/bootloader') diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h b/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h index 594737efea..bf83667afe 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h @@ -173,7 +173,6 @@ extern void * codemove(void *, const void *, size_t, unsigned long); #define isa_io_base (bd->io_base) - void * __palloc(u_long, int); void pfree(void *); diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c b/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c index 1ca667a82f..f600ec7b52 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c @@ -32,7 +32,6 @@ #include #endif - /* Code options, put them on the compiler command line */ /* #define EIP_STATS */ /* EIP based profiling */ /* #undef EIP_STATS */ @@ -78,7 +77,6 @@ typedef struct _x86 { x86 v86_private __attribute__((aligned(32))); - /* Emulator is in another source file */ extern void em86_enter(x86 * p); @@ -461,7 +459,6 @@ void cleanup_v86_mess(void) { p->ioperm=0; } - int init_v86(void) { x86 *p = (x86 *) bd->v86_private; @@ -502,7 +499,6 @@ void em86_main(struct pci_dev *dev){ #define IOMASK 0 #endif - #ifndef __BOOT__ int i; /* Allow or disable access to all ports */ @@ -550,7 +546,6 @@ void em86_main(struct pci_dev *dev){ p->rom = palloc(length*512); if (!p->rom) return; - for(dst=(u_int *) p->rom, src=(volatile u_int *)(ptr_mem_map->isa_mem_base+0xc0000), left = length*512/sizeof(u_int); diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S b/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S index ad38fb24fb..e5560f4879 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/em86real.S @@ -193,7 +193,6 @@ * */ - /* Now the details of flag evaluation with the necessary macros */ /* Alignment check is toggable so the system believes it is a 486, but @@ -1721,7 +1720,6 @@ outl_eax_dx: li r4,DX eieio NEXT - /* Macro used for add and sub */ #define ARITH(op,fl) \ op##b_reg_mem: lbzx op1,MEM; SET_FLAGS(fl(B)); lbzx op2,REG; \ @@ -2612,7 +2610,6 @@ _finish_strw: li r4,SI sthbrx r3,state,r4 # update cx NEXT - lodsb_a16: bl _setup_stringw 1: lbzx r0,STRINGSRC # [rep] lodsb add offset,offset,r7 @@ -3878,7 +3875,6 @@ ldlptrw: lhzux r7,MEM lwz ssb,ssbase(state) blr - /* Intructions that may modify the current code segment: the next optimization * might be to avoid calling C code when the code segment does not change. But * it's probably not worth the effort. @@ -4532,7 +4528,6 @@ grp3##bwl: ENTRY(test##bwl##_imm,t); OP(ud); \ grp3table(w,3) grp3table(l,3) - grp4b: BOP(incb); BOP(decb); \ OP(ud); OP(ud); \ OP(ud); OP(ud); \ diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S index cb6d9134fc..0d82791524 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/head.S +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/head.S @@ -38,9 +38,6 @@ li r10,0x26 ; \ sc - - - #define MONITOR_ENTER \ mfmsr r10 ; \ ori r10,r10,MSR_IP ; \ @@ -48,8 +45,6 @@ li r10,0x63 ; \ sc - - START_GOT GOT_ENTRY(_GOT2_TABLE_) GOT_ENTRY(_FIXUP_TABLE_) @@ -98,7 +93,6 @@ start: cmplwi cr2,r0,1 beq 2,2f - /* * commented out, 11/7/2002, gregm. This instruction sequence seems to * be pathological on the 603e. @@ -113,7 +107,6 @@ start: #endif */ - 2: bl reloc /* save all the parameters and the orginal msr/hid0/r31 */ @@ -314,8 +307,6 @@ moved: lwz r1,stack(bd) 1: bctr #endif - - /* relocation function, r30 must point to got2+0x8000 */ reloc: /* Adjust got2 pointers, no need to check for 0, this code already puts diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c b/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c index ae6cf1fafc..ce610fab04 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/lib.c @@ -15,7 +15,6 @@ * $Id$ */ - void* memset(void *p, int c, unsigned int n) { char *q =p; diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c index 6b4718e7ea..373b13bb45 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c @@ -33,7 +33,6 @@ struct wait_queue; struct buffer_head; typedef struct { int counter; } atomic_t; - typedef struct page { /* these must be first (free area handling) */ struct page *next; @@ -48,7 +47,6 @@ typedef struct page { struct buffer_head * buffers; } mem_map_t; - extern opaque mm_private, pci_private, v86_private, console_private; #define CONSOLE_ON_SERIAL "console=ttyS0" @@ -74,7 +72,6 @@ static void exit(void) { while(1); } - void hang(const char *s, u_long x, ctxt *p) { u_long *r1; #ifdef DEBUG @@ -91,7 +88,6 @@ void hang(const char *s, u_long x, ctxt *p) { exit(); }; - void *zalloc(void *x, unsigned items, unsigned size) { void *p = salloc(items*size); @@ -115,7 +111,6 @@ void zfree(void *x, void *addr, unsigned nb) #define DEFLATED 8 - void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp) { z_stream s; @@ -422,7 +417,6 @@ setup_hw(void) *cp = 0; } - /* Functions to deal with the residual data */ static int same_DevID(unsigned short vendor, unsigned short Number, diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c b/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c index 4371ae6a0d..3cef24a30c 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/mm.c @@ -129,7 +129,6 @@ void print_maps(map *, const char *); * designed to properly handle MMU interrupts to fill the hash table. */ - void _handler(int vec, ctxt *p) { map *area; struct _mm_private *mm = (struct _mm_private *) bd->mm_private; @@ -261,7 +260,6 @@ int insert_map(map **head, map *p) { return 0; } - /* Removal from linked list */ static @@ -421,7 +419,6 @@ MEM_MAP seg_fix[] = { { 0x0480, 0x80800, 0x00800 }, { 0x0440, 0x80000, 0x00800 } }; - /* The Motorola NT firmware does not set up all required info in the residual * data. This routine changes some things in a way that the bootloader and * linux are happy. diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c index 8f17d06b46..dfa31a2a16 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c @@ -15,7 +15,6 @@ * $Id$ */ - #include #include #include @@ -27,16 +26,13 @@ #include - typedef unsigned int u32; - /* #define DEBUG #define PCI_DEBUG */ - /* Used to reorganize PCI space on stupid machines which spread resources * across a wide address space. This is bad when P2P bridges are present * or when it limits the mappings that a resource hog like a PCI<->VME @@ -166,19 +162,15 @@ static struct blacklist_entry blacklist[] = { {0xffff, 0, 0, 0} }; - /* This function filters resources and then inserts them into a list of * configurable pci resources. */ - #define AREA(r) \ (((r->type&PCI_BASE_ADDRESS_SPACE)==PCI_BASE_ADDRESS_SPACE_IO) ? PCI_AREA_IO :\ ((r->type&PCI_BASE_ADDRESS_MEM_PREFETCH) ? PCI_AREA_PREFETCHABLE :\ PCI_AREA_MEMORY)) - - static int insert_before(pci_resource *e, pci_resource *t) { if (e->dev->bus->number != t->dev->bus->number) return e->dev->bus->number > t->dev->bus->number; @@ -186,10 +178,6 @@ static int insert_before(pci_resource *e, pci_resource *t) { return (e->size > t->size); } - - - - static void insert_resource(pci_resource *r) { struct blacklist_entry *b; pci_resource *p; @@ -280,10 +268,6 @@ static void insert_resource(pci_resource *r) { } } - - - - /* This version only works for bus 0. I don't have any P2P bridges to test * a more sophisticated version which has therefore not been implemented. * Prefetchable memory is not yet handled correctly either. @@ -323,11 +307,6 @@ static u_long find_range(u_char bus, u_char type, return total; } - - - - - static inline void init_free_area(pci_area_head *h, u_long start, u_long end, u_int mask, int high) { pci_area *p; @@ -342,11 +321,6 @@ static inline void init_free_area(pci_area_head *h, u_long start, h->high = high; } - - - - - static void insert_area(pci_area_head *h, pci_area *p) { pci_area *q = h->head; if (!p) return; @@ -371,10 +345,6 @@ static void insert_area(pci_area_head *h, pci_area *p) { } } - - - - static void remove_area(pci_area_head *h, pci_area *p) { @@ -390,11 +360,6 @@ void remove_area(pci_area_head *h, pci_area *p) if (q) q->next=p->next; } - - - - - static pci_area * alloc_area(pci_area_head *h, struct pci_bus *bus, u_long required, u_long mask, u_int flags) { pci_area *p; @@ -460,10 +425,6 @@ static pci_area * alloc_area(pci_area_head *h, struct pci_bus *bus, return new; } - - - - static inline void alloc_space(pci_area *p, pci_resource *r) { @@ -476,10 +437,6 @@ void alloc_space(pci_area *p, pci_resource *r) } } - - - - static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h) { pci_resource *first, *past, *r; @@ -500,12 +457,6 @@ static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h) } } - - - - - - #define BUS0_IO_START 0x10000 #define BUS0_IO_END 0x1ffff #define BUS0_MEM_START 0x1000000 @@ -516,10 +467,6 @@ static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h) #define BUSREST_MEM_START 0xb000000 #define BUSREST_MEM_END 0x10000000 - - - - static void reconfigure_pci(void) { pci_resource *r; struct pci_dev *dev; @@ -535,7 +482,6 @@ static void reconfigure_pci(void) { init_free_area(&pci->io, BUS0_IO_START, BUS0_IO_END, 0xfff, 0); init_free_area(&pci->mem, BUS0_MEM_START, BUS0_MEM_END, 0xfffff, 0); - /* First reconfigure the I/O space, this will be more * complex when there is more than 1 bus. And 64 bits * devices are another kind of problems. @@ -586,11 +532,6 @@ static void reconfigure_pci(void) { } } - - - - - static int indirect_pci_read_config_byte(unsigned char bus, unsigned char dev_fn, unsigned char offset, unsigned char *val) { @@ -660,7 +601,6 @@ static const struct pci_config_access_functions indirect_functions = { indirect_pci_write_config_dword }; - static int direct_pci_read_config_byte(unsigned char bus, unsigned char dev_fn, unsigned char offset, unsigned char *val) { @@ -750,11 +690,6 @@ static const struct pci_config_access_functions direct_functions = { direct_pci_write_config_dword }; - - - - - void pci_read_bases(struct pci_dev *dev, unsigned int howmany) { unsigned int reg, nextreg; @@ -821,13 +756,6 @@ void pci_read_bases(struct pci_dev *dev, unsigned int howmany) } } - - - - - - - u_int pci_scan_bus(struct pci_bus *bus) { unsigned int devfn, l, max, class; @@ -1018,15 +946,6 @@ u_int pci_scan_bus(struct pci_bus *bus) return max; } - - - - - - - - - #if 0 void @@ -1043,11 +962,6 @@ pci_fixup(void) } } - - - - - static void print_pci_info() { pci_resource *r; @@ -1102,17 +1016,6 @@ static void print_pci_info() #endif - - - - - - - - - - - static struct _addr_start { uint32_t start_pcimem; @@ -1120,10 +1023,6 @@ static struct _addr_start uint32_t start_prefetch; } astart; - - - - static pci_resource *enum_device_resources( struct pci_dev *pdev, int i ) { pci_resource *r; @@ -1138,21 +1037,12 @@ static pci_resource *enum_device_resources( struct pci_dev *pdev, int i ) return r; } - - - - - - - - static void recursive_bus_reconfigure( struct pci_bus *pbus ) { struct pci_dev *pdev; struct pci_bus *childbus; int isroot = 0; - if( !pbus ) { /* start with the root bus */ @@ -1164,13 +1054,11 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) isroot = -1; } - #define WRITE_BRIDGE_IO #define WRITE_BRIDGE_MEM #define WRITE_BRIDGE_PF #define WRITE_BRIDGE_ENABLE - /* ** Run thru the p2p bridges on this bus and recurse into subordinate busses */ @@ -1198,8 +1086,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) childbus->subordinate ); #endif - - /* **use the current values & the saved ones to figure out ** the address spaces for the bridge @@ -1230,9 +1116,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) pcibios_write_config_byte(pdev->bus->number, pdev->devfn, PCI_IO_LIMIT, limit8 ); #endif - - - if( addrhold.start_pcimem == astart.start_pcimem ) { limit16 = 0; @@ -1252,8 +1135,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_MEMORY_LIMIT, limit16 ); #endif - - if( astart.start_prefetch == addrhold.start_prefetch ) { limit16 = 0; @@ -1289,11 +1170,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) } } - - - - - if( !isroot ) { #ifdef PCI_DEBUG @@ -1370,15 +1246,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus ) } - - - - - - - - - void pci_init(void) { PPC_DEVICE *hostbridge; @@ -1439,5 +1306,4 @@ void pci_init(void) print_pci_resources("Allocated PCI resources:\n"); } - /* eof */ diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h index 3884760c8b..619497d5b7 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h @@ -1155,5 +1155,4 @@ extern struct pci_dev *pci_devices; /* list of all devices */ #define PCIBIOS_SET_FAILED 0x88 #define PCIBIOS_BUFFER_TOO_SMALL 0x89 - #endif /* BOOTLOADER_PCI_H */ diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c b/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c index 70e97abb6e..2eb7c1b777 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.c @@ -105,7 +105,6 @@ extern char *z_errmsg[]; /* indexed by 1-zlib_error */ # define Tracecv(c,x) #endif - typedef uLong (*check_func) OF((uLong check, Bytef *buf, uInt len)); /* voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); */ @@ -229,7 +228,6 @@ local int inflate_trees_free OF(( inflate_huft *, /* tables to free */ z_stream *)); /* for zfree function */ - /*+++++*/ /* infcodes.h -- header to use infcodes.c * Copyright (C) 1995 Mark Adler @@ -258,7 +256,6 @@ local void inflate_codes_free OF(( inflate_codes_statef *, z_stream *)); - /*+++++*/ /* inflate.c -- zlib interface to inflate modules * Copyright (C) 1995 Mark Adler @@ -299,7 +296,6 @@ struct internal_state { }; - int inflateReset(z) z_stream *z; { @@ -315,7 +311,6 @@ z_stream *z; return Z_OK; } - int inflateEnd(z) z_stream *z; { @@ -331,7 +326,6 @@ z_stream *z; return Z_OK; } - int inflateInit2(z, w) z_stream *z; int w; @@ -377,14 +371,12 @@ int w; return Z_OK; } - int inflateInit(z) z_stream *z; { return inflateInit2(z, DEF_WBITS); } - #define NEEDBYTE {if(z->avail_in==0)goto empty;r=Z_OK;} #define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++) @@ -513,7 +505,6 @@ z_stream *z; return inflate_addhistory(z->state->blocks, z); } - int inflateSync(z) z_stream *z; { @@ -625,7 +616,6 @@ struct inflate_blocks_state { }; - /* defines for inflate input/output */ /* update pointers and return */ #define UPDBITS {s->bitb=b;s->bitk=k;} @@ -681,7 +671,6 @@ local int inflate_fast OF(( inflate_blocks_statef *, z_stream *)); - /*+++++*/ /* infblock.c -- interpret and process block types to last block * Copyright (C) 1995 Mark Adler @@ -737,7 +726,6 @@ local uInt border[] = { /* Order of the bit length code lengths */ the two sets of lengths. */ - local void inflate_blocks_reset(s, z, c) inflate_blocks_statef *s; z_stream *z; @@ -762,7 +750,6 @@ uLongf *c; Trace("inflate: blocks reset\n"); } - local inflate_blocks_statef *inflate_blocks_new(z, c, w) z_stream *z; check_func c; @@ -786,7 +773,6 @@ uInt w; return s; } - local int inflate_blocks(s, z, r) inflate_blocks_statef *s; z_stream *z; @@ -1049,7 +1035,6 @@ int r; } } - local int inflate_blocks_free(s, z, c) inflate_blocks_statef *s; z_stream *z; @@ -1115,7 +1100,6 @@ z_stream *z; return Z_OK; } - /* * At the end of a Deflate-compressed PPP packet, we expect to have seen * a `stored' block type value but not the (zero) length bytes. @@ -1129,7 +1113,6 @@ local int inflate_packet_flush(s) return Z_OK; } - /*+++++*/ /* inftrees.c -- generate Huffman trees for efficient decoding * Copyright (C) 1995 Mark Adler @@ -1142,7 +1125,6 @@ local int inflate_packet_flush(s) #define exop word.what.Exop #define bits word.what.Bits - local int huft_build OF(( uIntf *, /* code lengths in bits */ uInt, /* number of codes */ @@ -1212,7 +1194,6 @@ local uInt cpdext[] = { /* Extra bits for distance codes */ possibly even between compilers. Your mileage may vary. */ - /* If BMAX needs to be larger than 16, then h and x[] should be uLong. */ #define BMAX 15 /* maximum bit length of any code */ #define N_MAX 288 /* maximum number of codes in any set */ @@ -1257,7 +1238,6 @@ z_stream *zs; /* for zalloc function */ int y; /* number of dummy codes added */ uInt z; /* number of entries in current table */ - /* Generate counts for each bit length */ p = c; #define C0 *p++ = 0; @@ -1275,7 +1255,6 @@ z_stream *zs; /* for zalloc function */ return Z_OK; } - /* Find minimum and maximum length, bound *m by those */ l = *m; for (j = 1; j <= BMAX; j++) @@ -1292,7 +1271,6 @@ z_stream *zs; /* for zalloc function */ l = i; *m = l; - /* Adjust last length count to fill out codes, if needed */ for (y = 1 << j; j < i; j++, y <<= 1) if ((y -= c[j]) < 0) @@ -1301,7 +1279,6 @@ z_stream *zs; /* for zalloc function */ return Z_DATA_ERROR; c[i] += y; - /* Generate starting offsets into the value table for each length */ x[1] = j = 0; p = c + 1; xp = x + 2; @@ -1309,7 +1286,6 @@ z_stream *zs; /* for zalloc function */ *xp++ = (j += *p++); } - /* Make a table of values in order of bit lengths */ p = b; i = 0; do { @@ -1317,7 +1293,6 @@ z_stream *zs; /* for zalloc function */ v[x[j]++] = i; } while (++i < n); - /* Generate the Huffman codes and for each, make the table entries */ x[0] = i = 0; /* first Huffman code is zero */ p = v; /* grab values in bit order */ @@ -1418,12 +1393,10 @@ z_stream *zs; /* for zalloc function */ } } - /* Return Z_BUF_ERROR if we were given an incomplete table */ return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK; } - local int inflate_trees_bits(c, bb, tb, z) uIntf *c; /* 19 code lengths */ uIntf *bb; /* bits tree desired/actual depth */ @@ -1444,7 +1417,6 @@ z_stream *z; /* for zfree function */ return r; } - local int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, z) uInt nl; /* number of literal/length codes */ uInt nd; /* number of distance codes */ @@ -1494,7 +1466,6 @@ z_stream *z; /* for zfree function */ return Z_OK; } - /* build fixed tables only once--keep them here */ local int fixed_lock = 0; local int fixed_built = 0; @@ -1506,7 +1477,6 @@ local uInt fixed_bd; local inflate_huft *fixed_tl; local inflate_huft *fixed_td; - local voidpf falloc(q, n, s) voidpf q; /* opaque pointer (not used) */ uInt n; /* number of items */ @@ -1519,7 +1489,6 @@ uInt s; /* size of item */ return (voidpf)(fixed_mem + fixed_left); } - local void ffree(q, p, n) voidpf q; voidpf p; @@ -1529,7 +1498,6 @@ uInt n; if (q) q = p; /* to make some compilers happy */ } - local int inflate_trees_fixed(bl, bd, tl, td) uIntf *bl; /* literal desired/actual bit depth */ uIntf *bd; /* distance desired/actual bit depth */ @@ -1579,7 +1547,6 @@ inflate_huft * FAR *td; /* distance tree result */ return Z_OK; } - local int inflate_trees_free(t, z) inflate_huft *t; /* table to free */ z_stream *z; /* for zfree function */ @@ -1651,7 +1618,6 @@ struct inflate_codes_state { }; - local inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z) uInt bl, bd; inflate_huft *tl, *td; @@ -1672,7 +1638,6 @@ z_stream *z; return c; } - local int inflate_codes(s, z, r) inflate_blocks_statef *s; z_stream *z; @@ -1832,7 +1797,6 @@ int r; } } - local void inflate_codes_free(c, z) inflate_codes_statef *c; z_stream *z; @@ -1913,7 +1877,6 @@ int r; return r; } - /*+++++*/ /* inffast.c -- process literals and length/distance pairs fast * Copyright (C) 1995 Mark Adler @@ -2074,7 +2037,6 @@ z_stream *z; return Z_OK; } - /*+++++*/ /* zutil.c -- target dependent utility functions for the compression library * Copyright (C) 1995 Jean-loup Gailly. @@ -2095,7 +2057,6 @@ char *z_errmsg[] = { "buffer error", /* Z_BUF_ERROR (-5) */ ""}; - /*+++++*/ /* adler32.c -- compute the Adler-32 checksum of a data stream * Copyright (C) 1995 Mark Adler diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h b/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h index 11b040595c..cce54696dc 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/zlib.h @@ -274,7 +274,6 @@ extern int inflateInit OF((z_stream *strm)); inflate(). */ - extern int inflate OF((z_stream *strm, int flush)); /* Performs one or both of the following actions: @@ -325,7 +324,6 @@ extern int inflate OF((z_stream *strm, int flush)); when Z_FINISH is used. In the Z_DATA_ERROR case, the application may then call inflateSync to look for a good compression block. */ - extern int inflateEnd OF((z_stream *strm)); /* All dynamically allocated data structures for this stream are freed. -- cgit v1.2.3