diff options
author | Daniel Hellstrom <daniel@gaisler.com> | 2015-02-06 09:27:08 +0100 |
---|---|---|
committer | Daniel Hellstrom <daniel@gaisler.com> | 2015-04-17 01:10:22 +0200 |
commit | d77b16d75b31819c080e67d9bc3d09693de11cd1 (patch) | |
tree | dad5763950737095c7f83b2cad388a4cb0881c5d /c/src/lib/libbsp/sparc/shared | |
parent | PCIF: fixed build warnings (diff) | |
download | rtems-d77b16d75b31819c080e67d9bc3d09693de11cd1.tar.bz2 |
GR-RASTA-SPW-ROUTER: fix build warnings
Diffstat (limited to 'c/src/lib/libbsp/sparc/shared')
-rw-r--r-- | c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h | 45 | ||||
-rw-r--r-- | c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c | 11 |
2 files changed, 49 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h b/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h new file mode 100644 index 0000000000..ba98957824 --- /dev/null +++ b/c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h @@ -0,0 +1,45 @@ +/* GR-RASTA-SPW-ROUTER PCI Peripheral driver + * + * COPYRIGHT (c) 2015. + * Cobham Gaisler. + * + * The license and distribution terms for this file may be + * found in found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + */ + +#ifndef __GR_RASTA_SPW_ROUTER_H__ +#define __GR_RASTA_SPW_ROUTER_H__ + +#include <drvmgr/drvmgr.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* An array of pointers to GR-RASTA-SPW-ROUTER resources. The resources will be + * used by the drivers controlling the cores on the GR-RASTA-SPW-ROUTER target + * AMBA bus. + * + * The gr_rasta_spw_router_resources is declared weak so that the user can + * override the default configuration. The array must be terminated with a + * NULL resource. + */ +extern struct drvmgr_bus_res *gr_rasta_spw_router_resources[]; + +/* Options to gr_rasta_spw_router_print function */ +#define RASTA_SPW_ROUTER_OPTIONS_AMBA 0x01 /* Print AMBA bus devices */ +#define RASTA_SPW_ROUTER_OPTIONS_IRQ 0x02 /* Print current IRQ setup */ + +/* Print information about GR-CPCI-LEON4-N2X PCI board */ +void gr_rasta_spw_router_print(int options); + +/* Register GR-RASTA-SPW-ROUTER driver to Driver Manager */ +void gr_rasta_spw_router_register_drv(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c index 027c1d4f82..3b40993c70 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c @@ -29,8 +29,7 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/pci_bus.h> #include <genirq.h> - -/*#include <gr_rasta_spw_router.h> */ +#include <gr_rasta_spw_router.h> /* Determines which PCI address the AHB masters will access, it should be * set so that the masters can access the CPU RAM. Default is base of CPU RAM, @@ -45,9 +44,6 @@ extern unsigned int _RAM_START; #define GRPCI2_BAR0_TO_AHB_MAP 0x04 /* Fixme */ #define GRPCI2_PCI_CONFIG 0x20 /* Fixme */ -#define RASTA_SPW_ROUTER_OPTIONS_AMBA 0x01 /* Print AMBA bus devices */ /* Fixme */ -#define RASTA_SPW_ROUTER_OPTIONS_IRQ 0x02 /* Print current IRQ setup */ /* Fixme */ - /* #define DEBUG 1 */ @@ -62,6 +58,7 @@ extern unsigned int _RAM_START; int gr_rasta_spw_router_init1(struct drvmgr_dev *dev); int gr_rasta_spw_router_init2(struct drvmgr_dev *dev); +void gr_rasta_spw_router_isr(void *arg); struct grpci2_regs { volatile unsigned int ctrl; @@ -235,7 +232,7 @@ void gr_rasta_spw_router_isr(void *arg) DBG("RASTA-SPW_ROUTER-IRQ: 0x%x\n", tmp); } -int gr_rasta_spw_router_hw_init(struct gr_rasta_spw_router_priv *priv) +static int gr_rasta_spw_router_hw_init(struct gr_rasta_spw_router_priv *priv) { int i; uint32_t data; @@ -372,7 +369,7 @@ int gr_rasta_spw_router_hw_init(struct gr_rasta_spw_router_priv *priv) return 0; } -int gr_rasta_spw_router_hw_init2(struct gr_rasta_spw_router_priv *priv) +static int gr_rasta_spw_router_hw_init2(struct gr_rasta_spw_router_priv *priv) { /* Enable DMA by enabling PCI target as master */ pci_master_enable(priv->pcidev); |