From fb252a684bfd723041f98ff1201e8b1c033af278 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 13 Oct 2014 10:29:44 -0500 Subject: libbsp/powerpc/shared: Fix warnings --- c/src/lib/libbsp/powerpc/shared/pci/pci.h | 38 ++++++++++++++-------- .../libbsp/powerpc/shared/startup/pgtbl_activate.c | 4 ++- .../libbsp/powerpc/shared/startup/pgtbl_setup.c | 5 +-- c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c | 4 ++- 4 files changed, 33 insertions(+), 18 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/powerpc/shared/pci/pci.h b/c/src/lib/libbsp/powerpc/shared/pci/pci.h index 8b4ce85f94..42dc43875b 100644 --- a/c/src/lib/libbsp/powerpc/shared/pci/pci.h +++ b/c/src/lib/libbsp/powerpc/shared/pci/pci.h @@ -1,16 +1,18 @@ /* + * PCI defines and function prototypes * - * PCI defines and function prototypes - * Copyright 1994, Drew Eckhardt - * Copyright 1997, 1998 Martin Mares + * For more information, please consult the following manuals (look at + * http://www.pcisig.com/ for how to get them): * - * For more information, please consult the following manuals (look at - * http://www.pcisig.com/ for how to get them): - * - * PCI BIOS Specification - * PCI Local Bus Specification - * PCI to PCI Bridge Specification - * PCI System Design Guide + * PCI BIOS Specification + * PCI Local Bus Specification + * PCI to PCI Bridge Specification + * PCI System Design Guide + */ + +/* + * Copyright 1994, Drew Eckhardt + * Copyright 1997, 1998 Martin Mares */ #ifndef BSP_POWERPC_PCI_H @@ -21,19 +23,27 @@ struct _pin_routes { - int pin, int_name[4]; + int pin; + int int_name[4]; }; struct _int_map { - int bus, slot, opts; - struct _pin_routes pin_route[5]; + int bus; + int slot; + int opts; + struct _pin_routes pin_route[5]; }; /* If there's a conflict between a name in the routing table and * what's already set on the device, reprogram the device setting * to reflect int_name[0] for the routing table entry */ -#define PCI_FIXUP_OPT_OVERRIDE_NAME (1<<0) +#define PCI_FIXUP_OPT_OVERRIDE_NAME (1<<0) + +/* + * This is assumed to be provided by the BSP. + */ +void detect_host_bridge(void); void FixupPCI( const struct _int_map *, int (*swizzler)(int,int) ); diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c index 616be0bfb0..2455f1e06d 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c @@ -52,8 +52,10 @@ * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03 */ +void __BSP_default_pgtbl_activate(Triv121PgTbl pt); void -BSP_pgtbl_activate(Triv121PgTbl) __attribute__ (( weak, alias("__BSP_default_pgtbl_activate") )); +BSP_pgtbl_activate(Triv121PgTbl) + __attribute__ (( weak, alias("__BSP_default_pgtbl_activate") )); void __BSP_default_pgtbl_activate(Triv121PgTbl pt) diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c index 8a2a15e3f5..66bb8efb29 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c @@ -61,8 +61,9 @@ * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03 */ -Triv121PgTbl -BSP_pgtbl_setup(unsigned int *) __attribute__ (( weak, alias("__BSP_default_pgtbl_setup") )); +Triv121PgTbl __BSP_default_pgtbl_setup(unsigned int *pmemsize); +Triv121PgTbl BSP_pgtbl_setup(unsigned int *) + __attribute__ (( weak, alias("__BSP_default_pgtbl_setup") )); /* get those from the linker script. * NOTE THAT THE CORRECTNESS OF THE LINKER SCRIPT IS CRUCIAL diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c b/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c index d5cdfd3c21..c128d75f3c 100644 --- a/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c +++ b/c/src/lib/libbsp/powerpc/shared/vme/vmeconfig.c @@ -69,7 +69,9 @@ extern int BSP_VMEIrqMgrInstall(void); * at all :-). */ -void BSP_vme_config(void) __attribute__ (( weak, alias("__BSP_default_vme_config") )); +void __BSP_default_vme_config(void); +void BSP_vme_config(void) + __attribute__ (( weak, alias("__BSP_default_vme_config") )); void __BSP_default_vme_config(void) -- cgit v1.2.3