libbsp/powerpc/shared and motorola_powerpc: Fix warnings

This commit is contained in:
Joel Sherrill
2014-10-16 17:02:09 -05:00
parent 8e330bc054
commit 9ffca50244
6 changed files with 107 additions and 99 deletions

View File

@@ -71,46 +71,45 @@ polledIO_rel_CPPFLAGS = $(AM_CPPFLAGS) $(polledIO_CPPFLAGS)
polledIO_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) polledIO_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
# console # console
libbsp_a_SOURCES += \ libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
../../powerpc/shared/console/uart.c \ libbsp_a_SOURCES += ../../powerpc/shared/console/console.c
../../powerpc/shared/console/console.c \ libbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
../../powerpc/shared/console/inch.c \ libbsp_a_SOURCES += ../../powerpc/shared/console/keyboard.h
../../powerpc/shared/console/consoleIo.h \ libbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
../../powerpc/shared/console/keyboard.h \
../../powerpc/shared/console/uart.h
include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \ include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \
../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h
# irq # irq
libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c \ libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c
../../powerpc/shared/irq/openpic_i8259_irq.c \ libbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.h libbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.h
include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h include_bsp_HEADERS += ../../powerpc/shared/motorola/motorola.h
# motorola # motorola
libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h \ libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h
../../powerpc/shared/motorola/motorola.c libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c
include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h include_bsp_HEADERS += ../../powerpc/shared/openpic/openpic.h
# openpic # openpic
libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \ libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
../../powerpc/shared/openpic/openpic.c \ libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
../../powerpc/shared/openpic/openpic.h libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h include_bsp_HEADERS += ../../powerpc/shared/pci/pci.h
# pci # pci
libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \ libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
../../powerpc/shared/pci/detect_raven_bridge.c \ libbsp_a_SOURCES += ../../powerpc/shared/pci/detect_raven_bridge.c
../../powerpc/shared/pci/generic_clear_hberrs.c \ libbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h libbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.h
include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \ include_bsp_HEADERS += ../../powerpc/shared/residual/residual.h \
../../powerpc/shared/residual/pnp.h ../../powerpc/shared/residual/pnp.h
# residual # residual
libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h \ libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h
../../powerpc/shared/residual/residual.h \ libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.h
../../powerpc/shared/residual/residual.c libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
../../shared/vmeUniverse/vme_am_defs.h \ ../../shared/vmeUniverse/vme_am_defs.h \
@@ -120,14 +119,14 @@ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
../../shared/vmeUniverse/bspVmeDmaList.h\ ../../shared/vmeUniverse/bspVmeDmaList.h\
../../shared/vmeUniverse/VMEDMA.h ../../shared/vmeUniverse/VMEDMA.h
# vme # vme
libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c \ libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.c
../../shared/vmeUniverse/bspVmeDmaList.c \ libbsp_a_SOURCES += ../../shared/vmeUniverse/bspVmeDmaList.c
../../shared/vmeUniverse/vmeUniverse.h \ libbsp_a_SOURCES += ../../shared/vmeUniverse/vmeUniverse.h
../../shared/vmeUniverse/vme_am_defs.h \ libbsp_a_SOURCES += ../../shared/vmeUniverse/vme_am_defs.h
../../shared/vmeUniverse/VME.h \ libbsp_a_SOURCES += ../../shared/vmeUniverse/VME.h
../../powerpc/shared/vme/vmeconfig.c \ libbsp_a_SOURCES += ../../powerpc/shared/vme/vmeconfig.c
../../powerpc/shared/vme/vme_universe.c \ libbsp_a_SOURCES += ../../powerpc/shared/vme/vme_universe.c
../../powerpc/shared/vme/VMEConfig.h libbsp_a_SOURCES += ../../powerpc/shared/vme/VMEConfig.h
if QEMU if QEMU
if HAS_NETWORKING if HAS_NETWORKING

View File

@@ -1,7 +1,4 @@
/* /*
* bsp.h -- contain BSP API definition.
*
* Copyright (C) 1999 Eric Valette. valette@crf.canon.fr
* *
* The license and distribution terms for this file may be * The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at * found in the file LICENSE in this distribution or at
@@ -27,10 +24,6 @@
extern "C" { extern "C" {
#endif #endif
/*
* confdefs.h overrides for this BSP:
*/
/* /*
* diagram illustrating the role of the configuration * diagram illustrating the role of the configuration
* constants * constants
@@ -232,6 +225,18 @@ extern int BSP_connect_clock_handler (void);
*/ */
extern unsigned long _BSP_clear_hostbridge_errors(int enableMCP, int quiet); extern unsigned long _BSP_clear_hostbridge_errors(int enableMCP, int quiet);
/*
* Prototypes for methods called only from .S for dependency tracking
*/
char *save_boot_params(
void *r3,
void *r4,
void *r5,
char *cmdline_start,
char *cmdline_end
);
void zero_bss(void);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

View File

@@ -164,7 +164,7 @@ static unsigned char mcp750_openpic_initsenses[] = {
#endif #endif
#if BSP_ISA_IRQ_NUMBER > 0 && !defined(qemu) #if BSP_ISA_IRQ_NUMBER > 0 && !defined(qemu)
void VIA_isa_bridge_interrupts_setup(void) static void VIA_isa_bridge_interrupts_setup(void)
{ {
pci_isa_bridge_device pci_dev; pci_isa_bridge_device pci_dev;
uint32_t temp; uint32_t temp;

View File

@@ -60,7 +60,7 @@ typedef enum {
extern prep_t checkPrepBoardType(RESIDUAL *res); extern prep_t checkPrepBoardType(RESIDUAL *res);
extern prep_t currentPrepType; extern prep_t currentPrepType;
extern motorolaBoard getMotorolaBoard(); extern motorolaBoard getMotorolaBoard(void);
extern motorolaBoard currentBoard; extern motorolaBoard currentBoard;
extern const char* motorolaBoardToString(motorolaBoard); extern const char* motorolaBoardToString(motorolaBoard);
extern const struct _int_map *motorolaIntMap(motorolaBoard board); extern const struct _int_map *motorolaIntMap(motorolaBoard board);

View File

@@ -101,15 +101,16 @@ void _BSP_Fatal_error(unsigned int v)
*/ */
char *save_boot_params( char *save_boot_params(
RESIDUAL *r3, void *r3,
void *r4, void *r4,
void *r5, void *r5,
char *additional_boot_options char *cmdline_start,
char *cmdline_end
) )
{ {
residualCopy = *r3; residualCopy = *(RESIDUAL *)r3;
strncpy(loaderParam, additional_boot_options, MAX_LOADER_ADD_PARM); strncpy(loaderParam, cmdline_start, MAX_LOADER_ADD_PARM);
loaderParam[MAX_LOADER_ADD_PARM - 1] ='\0'; loaderParam[MAX_LOADER_ADD_PARM - 1] ='\0';
return loaderParam; return loaderParam;
} }

View File

@@ -227,4 +227,7 @@ const struct _int_map *bspmap; \
} \ } \
} while (0) } while (0)
extern int BSP_VMEInit(void);
extern int BSP_VMEIrqMgrInstall(void);
#endif #endif