bsp/beatnik: Fix warnings

This commit is contained in:
Sebastian Huber committed 2018-11-09 09:42:31 +01:00
1 parent 1e039fb37a
commit efdb4a767a
7 files changed
+94 -103

No files matched your search

+3
View File
@@ -157,6 +157,9 @@ int BSP_i2c_initialize(void);
/* Networking; */
#if defined(RTEMS_NETWORKING)
#include <bsp/bsp_bsdnet_attach.h>
int rtems_em_attach(struct rtems_bsdnet_ifconfig *, int);
int rtems_dec21140_driver_attach(struct rtems_bsdnet_ifconfig *, int);
int rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *, int);
#endif
/* NOT FOR PUBLIC USE BELOW HERE */
@@ -243,6 +243,10 @@ BSP_mve_stop_hw(struct mveth_private *mp);
int
BSP_mve_detach(struct mveth_private *mp);
int
BSP_mve_send_buf_raw(struct mveth_private *mp, void *head_p, int h_len,
void *data_p, int d_len);
/*
* Enqueue a mbuf chain or a raw data buffer for transmission;
* RETURN: #bytes sent or -1 if there are not enough free descriptors
File diff suppressed because it is too large. Load diff
+6
View File
@@ -229,6 +229,8 @@ STATIC void gfe_mii_statchg (struct device *);
STATIC void gfe_tick(void *arg);
STATIC void gfe_tx_restart(void *);
STATIC void gfe_assign_desc(volatile struct gt_eth_desc *, struct mbuf *,
uint32_t);
STATIC int gfe_tx_enqueue(struct gfe_softc *, enum gfe_txprio);
STATIC uint32_t gfe_tx_done(struct gfe_softc *, enum gfe_txprio, uint32_t);
STATIC void gfe_tx_cleanup(struct gfe_softc *, enum gfe_txprio, int);
@@ -2395,7 +2397,9 @@ gfe_hash_entry_op(struct gfe_softc *sc, enum gfe_hash_op op,
uint64_t *maybe_he_p = NULL;
int limit;
int hash;
#ifndef __rtems__
int maybe_hash = 0;
#endif /* __rtems__ */
GE_FUNC_ENTER(sc, "gfe_hash_entry_op");
@@ -2467,7 +2471,9 @@ gfe_hash_entry_op(struct gfe_softc *sc, enum gfe_hash_op op,
*/
if (maybe_he_p == NULL && (thishe & HSH_S)) {
maybe_he_p = he_p;
#ifndef __rtems__
maybe_hash = hash;
#endif /* __rtems__ */
}
hash = (hash + 1) & (sc->sc_hashmask / sizeof(he));
@@ -255,8 +255,6 @@ register u_int32_t rval;
#define __FBSDID(arg)
#endif
#define _KERNEL
#define device_printf(device,format,args...) printk(format,## args)
static inline u_int8_t bus_space_do_read_1(u_long handle, unsigned reg)
+1
View File
@@ -1,3 +1,4 @@
#include <sys/param.h>
#include <rtems.h>
#include <libcpu/mmu.h>
#include <rtems/bspIo.h>
+1 -6
View File
@@ -1913,7 +1913,7 @@ rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
struct ifnet *ifp;
struct dc_type *t;
uint32_t revision;
int error = 0, mac_offset;
int mac_offset;
uint32_t value;
/*
@@ -1976,13 +1976,11 @@ rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
#ifdef DC_USEIOSPACE
if (!(command & PCI_COMMAND_IO)) {
printk("dc%d: failed to enable I/O ports!\n", sc->dc_unit);
error = ENXIO;
goto fail;
}
#else
if (!(command & PCI_COMMAND_MEMORY)) {
printk("dc%d: failed to enable memory mapping!\n", sc->dc_unit);
error = ENXIO;
goto fail;
}
#endif
@@ -1994,7 +1992,6 @@ rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
if (sc->dc_res == NULL) {
printk("dc%d: couldn't map ports/memory\n", unit);
error = ENXIO;
goto fail;
}
sc->dc_btag = rman_get_bustag(sc->dc_res);
@@ -2038,7 +2035,6 @@ rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
if (sc->dc_irq == NULL) {
printk("dc%d: couldn't map interrupt\n", unit);
bus_release_resource(dev, DC_RES, DC_RID, sc->dc_res);
error = ENXIO;
goto fail;
}
@@ -2270,7 +2266,6 @@ rtems_dc_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
bus_release_resource(dev, SYS_RES_IRQ, 0, sc->dc_irq);
bus_release_resource(dev, DC_RES, DC_RID, sc->dc_res);
#endif
error = ENXIO;
goto fail;
}