RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

GR-RASTA-SPW-ROUTER: fix build warnings

Browse Source
This commit is contained in:
Daniel Hellstrom
2015-02-11 12:39:40 +01:00
parent 960aebfe1e
commit 90fd587d21
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/sparc/shared/include/gr_rasta_spw_router.h
View File

@@ -32,9 +32,12 @@ extern struct drvmgr_bus_res *gr_rasta_spw_router_resources[];
#define RASTA_SPW_ROUTER_OPTIONS_AMBA 0x01 /* Print AMBA bus devices */ #define RASTA_SPW_ROUTER_OPTIONS_AMBA 0x01 /* Print AMBA bus devices */
#define RASTA_SPW_ROUTER_OPTIONS_IRQ 0x02 /* Print current IRQ setup */ #define RASTA_SPW_ROUTER_OPTIONS_IRQ 0x02 /* Print current IRQ setup */
/* Print information about GR-CPCI-LEON4-N2X PCI board */ /* Print information about all GR-CPCI-LEON4-N2X PCI boards */
void gr_rasta_spw_router_print(int options); void gr_rasta_spw_router_print(int options);
/* Print information about one GR-CPCI-LEON4-N2X PCI board */
void gr_rasta_spw_router_print_dev(struct drvmgr_dev *dev, int options);
/* Register GR-RASTA-SPW-ROUTER driver to Driver Manager */ /* Register GR-RASTA-SPW-ROUTER driver to Driver Manager */
void gr_rasta_spw_router_register_drv(void); void gr_rasta_spw_router_register_drv(void);

17
c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c
View File

@@ -28,6 +28,7 @@
#include <drvmgr/drvmgr.h> #include <drvmgr/drvmgr.h>
#include <drvmgr/ambapp_bus.h> #include <drvmgr/ambapp_bus.h>
#include <drvmgr/pci_bus.h> #include <drvmgr/pci_bus.h>
#include <drvmgr/bspcommon.h>
#include <genirq.h> #include <genirq.h>
#include <gr_rasta_spw_router.h> #include <gr_rasta_spw_router.h>
@@ -196,7 +197,6 @@ struct drvmgr_bus_res *gr_rasta_spw_router_resources[] __attribute__((weak)) =
{ {
NULL NULL
}; };
int gr_rasta_spw_router_resources_cnt = 0;
void gr_rasta_spw_router_register_drv(void) void gr_rasta_spw_router_register_drv(void)
{ {
@@ -239,7 +239,6 @@ static int gr_rasta_spw_router_hw_init(struct gr_rasta_spw_router_priv *priv)
unsigned int ctrl; unsigned int ctrl;
uint8_t tmp2; uint8_t tmp2;
struct ambapp_dev *tmp; struct ambapp_dev *tmp;
int status;
struct ambapp_ahb_info *ahb; struct ambapp_ahb_info *ahb;
uint8_t cap_ptr; uint8_t cap_ptr;
pci_dev_t pcidev = priv->pcidev; pci_dev_t pcidev = priv->pcidev;
@@ -307,7 +306,7 @@ static int gr_rasta_spw_router_hw_init(struct gr_rasta_spw_router_priv *priv)
ambapp_freq_init(&priv->abus, NULL, priv->version->amba_freq_hz); ambapp_freq_init(&priv->abus, NULL, priv->version->amba_freq_hz);
/* Find IRQ controller, Clear all current IRQs */ /* Find IRQ controller, Clear all current IRQs */
tmp = ambapp_for_each(&priv->abus, tmp = (struct ambapp_dev *)ambapp_for_each(&priv->abus,
(OPTIONS_ALL|OPTIONS_APB_SLVS), (OPTIONS_ALL|OPTIONS_APB_SLVS),
VENDOR_GAISLER, GAISLER_IRQMP, VENDOR_GAISLER, GAISLER_IRQMP,
ambapp_find_by_idx, NULL); ambapp_find_by_idx, NULL);
@@ -327,7 +326,7 @@ static int gr_rasta_spw_router_hw_init(struct gr_rasta_spw_router_priv *priv)
priv->bus_maps_down[1].size = 0; priv->bus_maps_down[1].size = 0;
/* Find GRPCI2 controller AHB Slave interface */ /* Find GRPCI2 controller AHB Slave interface */
tmp = (void *)ambapp_for_each(&priv->abus, tmp = (struct ambapp_dev *)ambapp_for_each(&priv->abus,
(OPTIONS_ALL|OPTIONS_AHB_SLVS), (OPTIONS_ALL|OPTIONS_AHB_SLVS),
VENDOR_GAISLER, GAISLER_GRPCI2, VENDOR_GAISLER, GAISLER_GRPCI2,
ambapp_find_by_idx, NULL); ambapp_find_by_idx, NULL);
@@ -343,7 +342,7 @@ static int gr_rasta_spw_router_hw_init(struct gr_rasta_spw_router_priv *priv)
priv->bus_maps_up[1].size = 0; priv->bus_maps_up[1].size = 0;
/* Find GRPCI2 controller APB Slave interface */ /* Find GRPCI2 controller APB Slave interface */
tmp = (void *)ambapp_for_each(&priv->abus, tmp = (struct ambapp_dev *)ambapp_for_each(&priv->abus,
(OPTIONS_ALL|OPTIONS_APB_SLVS), (OPTIONS_ALL|OPTIONS_APB_SLVS),
VENDOR_GAISLER, GAISLER_GRPCI2, VENDOR_GAISLER, GAISLER_GRPCI2,
ambapp_find_by_idx, NULL); ambapp_find_by_idx, NULL);
@@ -387,6 +386,7 @@ int gr_rasta_spw_router_init1(struct drvmgr_dev *dev)
int status; int status;
uint32_t bar0, bar0_size; uint32_t bar0, bar0_size;
union drvmgr_key_value *value; union drvmgr_key_value *value;
int resources_cnt;
priv = dev->priv; priv = dev->priv;
if (!priv) if (!priv)
@@ -397,10 +397,7 @@ int gr_rasta_spw_router_init1(struct drvmgr_dev *dev)
priv->dev = dev; priv->dev = dev;
/* Determine number of configurations */ /* Determine number of configurations */
if ( gr_rasta_spw_router_resources_cnt == 0 ) { resources_cnt = get_resarray_count(gr_rasta_spw_router_resources);
while ( gr_rasta_spw_router_resources[gr_rasta_spw_router_resources_cnt] )
gr_rasta_spw_router_resources_cnt++;
}
/* Generate Device prefix */ /* Generate Device prefix */
@@ -454,7 +451,7 @@ int gr_rasta_spw_router_init1(struct drvmgr_dev *dev)
priv->config.ops = &ambapp_rasta_spw_router_ops; priv->config.ops = &ambapp_rasta_spw_router_ops;
priv->config.maps_up = &priv->bus_maps_up[0]; priv->config.maps_up = &priv->bus_maps_up[0];
priv->config.maps_down = &priv->bus_maps_down[0]; priv->config.maps_down = &priv->bus_maps_down[0];
if ( priv->dev->minor_drv < gr_rasta_spw_router_resources_cnt ) { if ( priv->dev->minor_drv < resources_cnt ) {
priv->config.resources = gr_rasta_spw_router_resources[priv->dev->minor_drv]; priv->config.resources = gr_rasta_spw_router_resources[priv->dev->minor_drv];
} else { } else {
priv->config.resources = NULL; priv->config.resources = NULL;