rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-05-14 07:19:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

if_atsam: Fix warnings

Browse Source 
Update #4652.
This commit is contained in:
Sebastian Huber 2022-05-05 22:12:31 +02:00
parent 435b298b0f
commit 2556c4c336
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rtemsbsd/sys/dev/atsam/if_atsam.c
View File

@ -66,6 +66,7 @@
#include <rtems/bsd/local/miibus_if.h> #include <rtems/bsd/local/miibus_if.h>
#include <rtems/bsd/if_atsam.h> #include <rtems/bsd/if_atsam.h>
#include <rtems/bsd/bsd.h>
/* /*
* Number of interfaces supported by the driver * Number of interfaces supported by the driver
@ -356,11 +357,10 @@ if_atsam_miibus_readreg(device_t dev, int phy, int reg)
static int static int
if_atsam_miibus_writereg(device_t dev, int phy, int reg, int data) if_atsam_miibus_writereg(device_t dev, int phy, int reg, int data)
{ {
uint8_t err;
if_atsam_softc *sc = device_get_softc(dev); if_atsam_softc *sc = device_get_softc(dev);
IF_ATSAM_LOCK(sc); IF_ATSAM_LOCK(sc);
err = if_atsam_write_phy(sc->Gmac_inst.gGmacd.pHw, (void)if_atsam_write_phy(sc->Gmac_inst.gGmacd.pHw,
(uint8_t)phy, (uint8_t)reg, data, sc->Gmac_inst.retries); (uint8_t)phy, (uint8_t)reg, data, sc->Gmac_inst.retries);
IF_ATSAM_UNLOCK(sc); IF_ATSAM_UNLOCK(sc);
@ -455,7 +455,8 @@ static void if_atsam_interrupt_handler(void *arg)
} }
} }
static void rx_update_mbuf(struct mbuf *m, sGmacRxDescriptor *buffer_desc) static void rx_update_mbuf(struct mbuf *m,
volatile sGmacRxDescriptor *buffer_desc)
{ {
int frame_len; int frame_len;
@ -488,13 +489,11 @@ static void if_atsam_rx_daemon(void *arg)
{ {
if_atsam_softc *sc = (if_atsam_softc *)arg; if_atsam_softc *sc = (if_atsam_softc *)arg;
struct ifnet *ifp = sc->ifp; struct ifnet *ifp = sc->ifp;
rtems_event_set events = 0;
void *rx_bd_base; void *rx_bd_base;
struct mbuf *m; struct mbuf *m;
struct mbuf *n; struct mbuf *n;
volatile sGmacRxDescriptor *buffer_desc; volatile sGmacRxDescriptor *buffer_desc;
uint32_t tmp_rx_bd_address; uint32_t tmp_rx_bd_address;
size_t i;
Gmac *pHw = sc->Gmac_inst.gGmacd.pHw; Gmac *pHw = sc->Gmac_inst.gGmacd.pHw;
IF_ATSAM_LOCK(sc); IF_ATSAM_LOCK(sc);
@ -759,7 +758,6 @@ static bool if_atsam_send_packet(if_atsam_softc *sc, struct mbuf *m)
static void if_atsam_tx_daemon(void *arg) static void if_atsam_tx_daemon(void *arg)
{ {
if_atsam_softc *sc = (if_atsam_softc *)arg; if_atsam_softc *sc = (if_atsam_softc *)arg;
rtems_event_set events = 0;
sGmacTxDescriptor *buffer_desc; sGmacTxDescriptor *buffer_desc;
int bd_number; int bd_number;
void *tx_bd_base; void *tx_bd_base;
@ -986,7 +984,6 @@ static void if_atsam_init(void *arg)
if_atsam_softc *sc = (if_atsam_softc *)arg; if_atsam_softc *sc = (if_atsam_softc *)arg;
struct ifnet *ifp = sc->ifp; struct ifnet *ifp = sc->ifp;
uint32_t dmac_cfg = 0; uint32_t dmac_cfg = 0;
uint32_t gmii_val = 0;
if (ifp->if_flags & IFF_DRV_RUNNING) { if (ifp->if_flags & IFF_DRV_RUNNING) {
return; return;
@ -1070,7 +1067,7 @@ if_atsam_poll_hw_stats(struct if_atsam_softc *sc)
Gmac *pHw = sc->Gmac_inst.gGmacd.pHw; Gmac *pHw = sc->Gmac_inst.gGmacd.pHw;
octets = pHw->GMAC_OTLO; octets = pHw->GMAC_OTLO;
octets |= pHw->GMAC_OTHI << 32; octets |= (uint64_t)pHw->GMAC_OTHI << 32;
sc->stats.octets_transm += octets; sc->stats.octets_transm += octets;
sc->stats.frames_transm += pHw->GMAC_FT; sc->stats.frames_transm += pHw->GMAC_FT;
sc->stats.broadcast_frames_transm += pHw->GMAC_BCFT; sc->stats.broadcast_frames_transm += pHw->GMAC_BCFT;
@ -1092,7 +1089,7 @@ if_atsam_poll_hw_stats(struct if_atsam_softc *sc)
sc->stats.carrier_sense_errors += pHw->GMAC_CSE; sc->stats.carrier_sense_errors += pHw->GMAC_CSE;
octets = pHw->GMAC_ORLO; octets = pHw->GMAC_ORLO;
octets |= pHw->GMAC_ORHI << 32; octets |= (uint64_t)pHw->GMAC_ORHI << 32;
sc->stats.octets_rec += octets; sc->stats.octets_rec += octets;
sc->stats.frames_rec += pHw->GMAC_FR; sc->stats.frames_rec += pHw->GMAC_FR;
sc->stats.broadcast_frames_rec += pHw->GMAC_BCFR; sc->stats.broadcast_frames_rec += pHw->GMAC_BCFR;
@ -1381,7 +1378,6 @@ if_atsam_ioctl(struct ifnet *ifp, ioctl_command_t command, caddr_t data)
struct ifreq *ifr = (struct ifreq *)data; struct ifreq *ifr = (struct ifreq *)data;
int rv = 0; int rv = 0;
bool prom_enable; bool prom_enable;
struct mii_data *mii;
switch (command) { switch (command) {
case SIOCGIFMEDIA: case SIOCGIFMEDIA:
@ -1416,7 +1412,6 @@ static int if_atsam_driver_attach(device_t dev)
if_atsam_softc *sc; if_atsam_softc *sc;
struct ifnet *ifp; struct ifnet *ifp;
int unit; int unit;
char *unitName;
uint8_t eaddr[ETHER_ADDR_LEN]; uint8_t eaddr[ETHER_ADDR_LEN];
sc = device_get_softc(dev); sc = device_get_softc(dev);