Module Name: src
Committed By: msaitoh
Date: Wed May 29 06:17:28 UTC 2019
Modified Files:
src/sys/arch/arm/omap: if_cpsw.c
src/sys/arch/arm/ti: if_cpsw.c
src/sys/arch/mips/ralink: ralink_eth.c
src/sys/arch/newsmips/apbus: if_tlp_ap.c
src/sys/dev/ic: ax88190.c dl10019.c elink3.c
src/sys/dev/pci: if_tlp_pci.c
Log Message:
No functional change:
- Simplify MII structure initialization and reference.
- KNF
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/omap/if_cpsw.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ti/if_cpsw.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mips/ralink/ralink_eth.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/newsmips/apbus/if_tlp_ap.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/ax88190.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/dl10019.c
cvs rdiff -u -r1.148 -r1.149 src/sys/dev/ic/elink3.c
cvs rdiff -u -r1.125 -r1.126 src/sys/dev/pci/if_tlp_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/if_cpsw.c
diff -u src/sys/arch/arm/omap/if_cpsw.c:1.24 src/sys/arch/arm/omap/if_cpsw.c:1.25
--- src/sys/arch/arm/omap/if_cpsw.c:1.24 Wed May 29 05:05:24 2019
+++ src/sys/arch/arm/omap/if_cpsw.c Wed May 29 06:17:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.24 2019/05/29 05:05:24 msaitoh Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.25 2019/05/29 06:17:27 msaitoh Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.24 2019/05/29 05:05:24 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.25 2019/05/29 06:17:27 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -394,6 +394,7 @@ cpsw_attach(device_t parent, device_t se
prop_dictionary_t dict = device_properties(self);
struct ethercom * const ec = &sc->sc_ec;
struct ifnet * const ifp = &ec->ec_if;
+ struct mii_data * const mii = &sc->sc_mii;
int error;
u_int i;
@@ -508,7 +509,7 @@ cpsw_attach(device_t parent, device_t se
bus_dmamap_create(sc->sc_bdt, ETHER_MIN_LEN, 1, ETHER_MIN_LEN, 0,
BUS_DMA_WAITOK, &sc->sc_txpad_dm);
bus_dmamap_load(sc->sc_bdt, sc->sc_txpad_dm, sc->sc_txpad,
- ETHER_MIN_LEN, NULL, BUS_DMA_WAITOK|BUS_DMA_WRITE);
+ ETHER_MIN_LEN, NULL, BUS_DMA_WAITOK | BUS_DMA_WRITE);
bus_dmamap_sync(sc->sc_bdt, sc->sc_txpad_dm, 0, ETHER_MIN_LEN,
BUS_DMASYNC_PREWRITE);
@@ -528,14 +529,13 @@ cpsw_attach(device_t parent, device_t se
cpsw_stop(ifp, 0);
- sc->sc_mii.mii_ifp = ifp;
- sc->sc_mii.mii_readreg = cpsw_mii_readreg;
- sc->sc_mii.mii_writereg = cpsw_mii_writereg;
- sc->sc_mii.mii_statchg = cpsw_mii_statchg;
-
- sc->sc_ec.ec_mii = &sc->sc_mii;
- ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange,
- ether_mediastatus);
+ mii->mii_ifp = ifp;
+ mii->mii_readreg = cpsw_mii_readreg;
+ mii->mii_writereg = cpsw_mii_writereg;
+ mii->mii_statchg = cpsw_mii_statchg;
+
+ sc->sc_ec.ec_mii = mii;
+ ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus);
/* Initialize MDIO */
cpsw_write_4(sc, MDIOCONTROL,
@@ -543,13 +543,12 @@ cpsw_attach(device_t parent, device_t se
/* Clear ALE */
cpsw_write_4(sc, CPSW_ALE_CONTROL, ALECTL_CLEAR_TABLE);
- mii_attach(self, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, 0, 0);
- if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
+ mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, 0, 0);
+ if (LIST_FIRST(&mii->mii_phys) == NULL) {
aprint_error_dev(self, "no PHY found!\n");
sc->sc_phy_has_1000t = false;
- ifmedia_add(&sc->sc_mii.mii_media,
- IFM_ETHER|IFM_MANUAL, 0, NULL);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL);
} else {
sc->sc_phy_has_1000t = cpsw_phy_has_1000t(sc);
if (sc->sc_phy_has_1000t) {
@@ -564,7 +563,7 @@ cpsw_attach(device_t parent, device_t se
GMIISEL_GMII1_SEL(RGMII_MODE));
}
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
}
if_attach(ifp);
@@ -597,7 +596,7 @@ cpsw_start(struct ifnet *ifp)
KERNHIST_FUNC(__func__);
KERNHIST_CALLED_5(cpswhist, (uintptr_t)sc, 0, 0, 0);
- if (__predict_false((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) !=
+ if (__predict_false((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) !=
IFF_RUNNING)) {
return;
}
@@ -838,7 +837,7 @@ cpsw_new_rxbuf(struct cpsw_softc * const
rdp->rx_mb[i] = m;
error = bus_dmamap_load_mbuf(sc->sc_bdt, rdp->rx_dm[i], rdp->rx_mb[i],
- BUS_DMA_READ|BUS_DMA_NOWAIT);
+ BUS_DMA_READ | BUS_DMA_NOWAIT);
if (error) {
device_printf(sc->sc_dev, "can't load rx DMA map %d: %d\n",
i, error);
@@ -1076,7 +1075,7 @@ cpsw_stop(struct ifnet *ifp, int disable
rdp->tx_mb[i] = NULL;
}
- ifp->if_flags &= ~(IFF_RUNNING|IFF_OACTIVE);
+ ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
ifp->if_timer = 0;
if (!disable)
@@ -1152,8 +1151,8 @@ cpsw_rxintr(void *arg)
return 1;
}
- if ((dw[3] & (CPDMA_BD_SOP|CPDMA_BD_EOP)) !=
- (CPDMA_BD_SOP|CPDMA_BD_EOP)) {
+ if ((dw[3] & (CPDMA_BD_SOP | CPDMA_BD_EOP)) !=
+ (CPDMA_BD_SOP | CPDMA_BD_EOP)) {
//Debugger();
}
Index: src/sys/arch/arm/ti/if_cpsw.c
diff -u src/sys/arch/arm/ti/if_cpsw.c:1.5 src/sys/arch/arm/ti/if_cpsw.c:1.6
--- src/sys/arch/arm/ti/if_cpsw.c:1.5 Wed May 29 05:05:24 2019
+++ src/sys/arch/arm/ti/if_cpsw.c Wed May 29 06:17:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cpsw.c,v 1.5 2019/05/29 05:05:24 msaitoh Exp $ */
+/* $NetBSD: if_cpsw.c,v 1.6 2019/05/29 06:17:27 msaitoh Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.5 2019/05/29 05:05:24 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.6 2019/05/29 06:17:27 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -401,6 +401,7 @@ cpsw_attach(device_t parent, device_t se
prop_dictionary_t dict = device_properties(self);
struct ethercom * const ec = &sc->sc_ec;
struct ifnet * const ifp = &ec->ec_if;
+ struct mii_data * const mii = &sc->sc_mii;
const int phandle = faa->faa_phandle;
bus_addr_t addr;
bus_size_t size;
@@ -544,7 +545,7 @@ cpsw_attach(device_t parent, device_t se
bus_dmamap_create(sc->sc_bdt, ETHER_MIN_LEN, 1, ETHER_MIN_LEN, 0,
BUS_DMA_WAITOK, &sc->sc_txpad_dm);
bus_dmamap_load(sc->sc_bdt, sc->sc_txpad_dm, sc->sc_txpad,
- ETHER_MIN_LEN, NULL, BUS_DMA_WAITOK|BUS_DMA_WRITE);
+ ETHER_MIN_LEN, NULL, BUS_DMA_WAITOK | BUS_DMA_WRITE);
bus_dmamap_sync(sc->sc_bdt, sc->sc_txpad_dm, 0, ETHER_MIN_LEN,
BUS_DMASYNC_PREWRITE);
@@ -564,14 +565,13 @@ cpsw_attach(device_t parent, device_t se
cpsw_stop(ifp, 0);
- sc->sc_mii.mii_ifp = ifp;
- sc->sc_mii.mii_readreg = cpsw_mii_readreg;
- sc->sc_mii.mii_writereg = cpsw_mii_writereg;
- sc->sc_mii.mii_statchg = cpsw_mii_statchg;
-
- sc->sc_ec.ec_mii = &sc->sc_mii;
- ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange,
- ether_mediastatus);
+ mii->mii_ifp = ifp;
+ mii->mii_readreg = cpsw_mii_readreg;
+ mii->mii_writereg = cpsw_mii_writereg;
+ mii->mii_statchg = cpsw_mii_statchg;
+
+ sc->sc_ec.ec_mii = mii;
+ ifmedia_init(&mii->mii_media, 0, ether_mediachange, ether_mediastatus);
/* Initialize MDIO */
cpsw_write_4(sc, MDIOCONTROL,
@@ -579,13 +579,12 @@ cpsw_attach(device_t parent, device_t se
/* Clear ALE */
cpsw_write_4(sc, CPSW_ALE_CONTROL, ALECTL_CLEAR_TABLE);
- mii_attach(self, &sc->sc_mii, 0xffffffff, MII_PHY_ANY, 0, 0);
- if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
+ mii_attach(self, mii, 0xffffffff, MII_PHY_ANY, 0, 0);
+ if (LIST_FIRST(&mii->mii_phys) == NULL) {
aprint_error_dev(self, "no PHY found!\n");
sc->sc_phy_has_1000t = false;
- ifmedia_add(&sc->sc_mii.mii_media,
- IFM_ETHER|IFM_MANUAL, 0, NULL);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL);
} else {
sc->sc_phy_has_1000t = cpsw_phy_has_1000t(sc);
if (sc->sc_phy_has_1000t) {
@@ -602,7 +601,7 @@ cpsw_attach(device_t parent, device_t se
#endif
}
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
}
if_attach(ifp);
@@ -635,7 +634,7 @@ cpsw_start(struct ifnet *ifp)
KERNHIST_FUNC(__func__);
KERNHIST_CALLED_5(cpswhist, sc, 0, 0, 0);
- if (__predict_false((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) !=
+ if (__predict_false((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) !=
IFF_RUNNING)) {
return;
}
@@ -876,7 +875,7 @@ cpsw_new_rxbuf(struct cpsw_softc * const
rdp->rx_mb[i] = m;
error = bus_dmamap_load_mbuf(sc->sc_bdt, rdp->rx_dm[i], rdp->rx_mb[i],
- BUS_DMA_READ|BUS_DMA_NOWAIT);
+ BUS_DMA_READ | BUS_DMA_NOWAIT);
if (error) {
device_printf(sc->sc_dev, "can't load rx DMA map %d: %d\n",
i, error);
@@ -1114,7 +1113,7 @@ cpsw_stop(struct ifnet *ifp, int disable
rdp->tx_mb[i] = NULL;
}
- ifp->if_flags &= ~(IFF_RUNNING|IFF_OACTIVE);
+ ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
ifp->if_timer = 0;
if (!disable)
@@ -1190,8 +1189,8 @@ cpsw_rxintr(void *arg)
return 1;
}
- if ((dw[3] & (CPDMA_BD_SOP|CPDMA_BD_EOP)) !=
- (CPDMA_BD_SOP|CPDMA_BD_EOP)) {
+ if ((dw[3] & (CPDMA_BD_SOP | CPDMA_BD_EOP)) !=
+ (CPDMA_BD_SOP | CPDMA_BD_EOP)) {
//Debugger();
}
Index: src/sys/arch/mips/ralink/ralink_eth.c
diff -u src/sys/arch/mips/ralink/ralink_eth.c:1.16 src/sys/arch/mips/ralink/ralink_eth.c:1.17
--- src/sys/arch/mips/ralink/ralink_eth.c:1.16 Wed May 29 05:06:39 2019
+++ src/sys/arch/mips/ralink/ralink_eth.c Wed May 29 06:17:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_eth.c,v 1.16 2019/05/29 05:06:39 msaitoh Exp $ */
+/* $NetBSD: ralink_eth.c,v 1.17 2019/05/29 06:17:28 msaitoh Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ralink_eth.c -- Ralink Ethernet Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.16 2019/05/29 05:06:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.17 2019/05/29 06:17:28 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -311,6 +311,7 @@ ralink_eth_attach(device_t parent, devic
{
ralink_eth_softc_t * const sc = device_private(self);
const struct mainbus_attach_args *ma = aux;
+ struct mii_data *mii = &sc->sc_mii;
int error;
int i;
@@ -478,30 +479,28 @@ ralink_eth_attach(device_t parent, devic
* Initialize our media structures.
* This may probe the PHY, if present.
*/
- sc->sc_mii.mii_ifp = ifp;
- sc->sc_mii.mii_readreg = ralink_eth_mii_read;
- sc->sc_mii.mii_writereg = ralink_eth_mii_write;
- sc->sc_mii.mii_statchg = ralink_eth_mii_statchg;
- sc->sc_ethercom.ec_mii = &sc->sc_mii;
- ifmedia_init(&sc->sc_mii.mii_media, 0, ether_mediachange,
- ether_mediastatus);
- mii_attach(sc->sc_dev, &sc->sc_mii, ~0, MII_PHY_ANY, MII_OFFSET_ANY,
- MIIF_FORCEANEG|MIIF_DOPAUSE|MIIF_NOISOLATE);
+ mii->mii_ifp = ifp;
+ mii->mii_readreg = ralink_eth_mii_read;
+ mii->mii_writereg = ralink_eth_mii_write;
+ mii->mii_statchg = ralink_eth_mii_statchg;
+ sc->sc_ethercom.ec_mii = mii;
+ ifmedia_init(mii->mii_media, 0, ether_mediachange, ether_mediastatus);
+ mii_attach(sc->sc_dev, mii, ~0, MII_PHY_ANY, MII_OFFSET_ANY,
+ MIIF_FORCEANEG | MIIF_DOPAUSE | MIIF_NOISOLATE);
- if (LIST_EMPTY(&sc->sc_mii.mii_phys)) {
+ if (LIST_EMPTY(&mii->mii_phys)) {
#if 1
- ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_1000_T|
- IFM_FDX|IFM_ETH_RXPAUSE|IFM_ETH_TXPAUSE, 0, NULL);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_1000_T|
- IFM_FDX|IFM_ETH_RXPAUSE|IFM_ETH_TXPAUSE);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_1000_T |
+ IFM_FDX | IFM_ETH_RXPAUSE | IFM_ETH_TXPAUSE, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_1000_T |
+ IFM_FDX | IFM_ETH_RXPAUSE | IFM_ETH_TXPAUSE);
#else
- ifmedia_add(&sc->sc_mii.mii_media,
- IFM_ETHER|IFM_MANUAL, 0, NULL);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_MANUAL);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_MANUAL, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_MANUAL);
#endif
} else {
/* Ensure we mask ok for the switch multiple phy's */
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
}
ifp->if_softc = sc;
@@ -862,7 +861,7 @@ ralink_eth_hw_init(ralink_eth_softc_t *s
*/
bus_dmamap_sync(sc->sc_dmat, sc->sc_pdmamap,
(int)&sc->sc_txdesc - (int)sc->sc_descs, sizeof(sc->sc_txdesc),
- BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+ BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/* Initialize the RX descriptor ring */
memset(sc->sc_rxdesc, 0, sizeof(sc->sc_rxdesc));
@@ -879,7 +878,7 @@ ralink_eth_hw_init(ralink_eth_softc_t *s
*/
bus_dmamap_sync(sc->sc_dmat, sc->sc_pdmamap,
(int)&sc->sc_rxdesc - (int)sc->sc_descs, sizeof(sc->sc_rxdesc),
- BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+ BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/* Clear the PDMA state */
r = fe_read(sc, RA_FE_PDMA_GLOBAL_CFG);
@@ -1130,7 +1129,7 @@ ralink_eth_add_rxbuf(ralink_eth_softc_t
rxs->rxs_mbuf = m;
error = bus_dmamap_load(sc->sc_dmat, rxs->rxs_dmamap, m->m_ext.ext_buf,
- m->m_ext.ext_size, NULL, BUS_DMA_READ|BUS_DMA_NOWAIT);
+ m->m_ext.ext_size, NULL, BUS_DMA_READ | BUS_DMA_NOWAIT);
if (error) {
aprint_error_dev(sc->sc_dev, "can't load rx DMA map %d, "
"error=%d\n", idx, error);
@@ -1163,7 +1162,7 @@ ralink_eth_start(struct ifnet *ifp)
int error;
int s;
- if ((ifp->if_flags & (IFF_RUNNING|IFF_OACTIVE)) != IFF_RUNNING)
+ if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
return;
s = splnet();
@@ -1195,7 +1194,7 @@ ralink_eth_start(struct ifnet *ifp)
* or does the DMA map load fail?
*/
if (bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m0,
- BUS_DMA_WRITE|BUS_DMA_NOWAIT) != 0) {
+ BUS_DMA_WRITE | BUS_DMA_NOWAIT) != 0) {
/* Allocate a new mbuf for re-alignment */
MGETHDR(m, M_DONTWAIT, MT_DATA);
@@ -1217,7 +1216,7 @@ ralink_eth_start(struct ifnet *ifp)
m_copydata(m0, 0, m0->m_pkthdr.len, mtod(m, void *));
m->m_pkthdr.len = m->m_len = m0->m_pkthdr.len;
error = bus_dmamap_load_mbuf(sc->sc_dmat, dmamap, m,
- BUS_DMA_WRITE|BUS_DMA_NOWAIT);
+ BUS_DMA_WRITE | BUS_DMA_NOWAIT);
if (error) {
aprint_error_dev(sc->sc_dev,
"unable to load Tx buffer error=%d\n",
@@ -1267,7 +1266,7 @@ ralink_eth_start(struct ifnet *ifp)
bus_dmamap_sync(sc->sc_dmat, sc->sc_pdmamap,
(int)&sc->sc_txdesc[tx_cpu_idx] - (int)sc->sc_descs,
sizeof(struct ralink_tx_desc),
- BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+ BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
/*
* Store a pointer to the packet so we can free it later,
@@ -1425,7 +1424,7 @@ ralink_eth_intr(void *arg)
return (n != 0);
}
- if (status & (RA_FE_INT_RX_DONE_INT1|RA_FE_INT_RX_DONE_INT0))
+ if (status & (RA_FE_INT_RX_DONE_INT1 | RA_FE_INT_RX_DONE_INT0))
ralink_eth_rxintr(sc);
if (status & (RA_FE_INT_TX_DONE_INT3 | RA_FE_INT_TX_DONE_INT2 |
@@ -1477,7 +1476,7 @@ ralink_eth_rxintr(ralink_eth_softc_t *sc
bus_dmamap_sync(sc->sc_dmat, sc->sc_pdmamap,
(int)&sc->sc_rxdesc[rx_cpu_idx] - (int)sc->sc_descs,
sizeof(struct ralink_rx_desc),
- BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
+ BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
RALINK_DEBUG(RALINK_DEBUG_REG,"rx(%d) 0x%08x: 0x%08x\n",
rx_cpu_idx, (int)&sc->sc_rxdesc[rx_cpu_idx].data_ptr,
@@ -1593,7 +1592,7 @@ ralink_eth_txintr(ralink_eth_softc_t *sc
bus_dmamap_sync(sc->sc_dmat, sc->sc_pdmamap,
(int)&sc->sc_txdesc[txs->txs_idx] - (int)sc->sc_descs,
sizeof(struct ralink_tx_desc),
- BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
+ BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
RALINK_DEBUG(RALINK_DEBUG_REG,"-tx(%d) 0x%08x: 0x%08x\n",
txs->txs_idx, (int)&sc->sc_txdesc[txs->txs_idx].data_ptr0,
Index: src/sys/arch/newsmips/apbus/if_tlp_ap.c
diff -u src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.14 src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.15
--- src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.14 Sun Sep 30 14:23:24 2018
+++ src/sys/arch/newsmips/apbus/if_tlp_ap.c Wed May 29 06:17:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_ap.c,v 1.14 2018/09/30 14:23:24 tsutsui Exp $ */
+/* $NetBSD: if_tlp_ap.c,v 1.15 2019/05/29 06:17:28 msaitoh Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_ap.c,v 1.14 2018/09/30 14:23:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_ap.c,v 1.15 2019/05/29 06:17:28 msaitoh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -238,19 +238,19 @@ static void
tlp_ap_tmsw_init(struct tulip_softc *sc)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
+ struct mii_data *mii = &sc->sc_mii;
sc->sc_preinit = tlp_ap_preinit;
- sc->sc_mii.mii_ifp = ifp;
- sc->sc_mii.mii_readreg = NULL;
- sc->sc_mii.mii_writereg = NULL;
- sc->sc_mii.mii_statchg = sc->sc_statchg;
- ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
- tlp_mediastatus);
- ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_TX, 0, NULL);
- ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_TX|IFM_FDX, 0,
+ mii->mii_ifp = ifp;
+ mii->mii_readreg = NULL;
+ mii->mii_writereg = NULL;
+ mii->mii_statchg = sc->sc_statchg;
+ ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_100_TX, 0, NULL);
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_100_TX | IFM_FDX, 0,
NULL);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_TX);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_100_TX);
}
static void
@@ -272,7 +272,7 @@ tlp_ap_setmedia(struct tulip_softc *sc)
sc->sc_mii.mii_media_active = sc->sc_mii.mii_media.ifm_cur->ifm_media;
if (ifp->if_flags & IFF_UP)
- tlp_idle(sc, OPMODE_ST|OPMODE_SR);
+ tlp_idle(sc, OPMODE_ST | OPMODE_SR);
if (sc->sc_mii.mii_media_active & IFM_FDX)
sc->sc_opmode |= OPMODE_FD;
else
Index: src/sys/dev/ic/ax88190.c
diff -u src/sys/dev/ic/ax88190.c:1.14 src/sys/dev/ic/ax88190.c:1.15
--- src/sys/dev/ic/ax88190.c:1.14 Wed May 29 05:06:40 2019
+++ src/sys/dev/ic/ax88190.c Wed May 29 06:17:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ax88190.c,v 1.14 2019/05/29 05:06:40 msaitoh Exp $ */
+/* $NetBSD: ax88190.c,v 1.15 2019/05/29 06:17:28 msaitoh Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.14 2019/05/29 05:06:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.15 2019/05/29 06:17:28 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,23 +84,23 @@ void
ax88190_media_init(struct dp8390_softc *sc)
{
struct ifnet *ifp = &sc->sc_ec.ec_if;
+ struct mii_data *mii = &sc->sc_mii;
- sc->sc_mii.mii_ifp = ifp;
- sc->sc_mii.mii_readreg = ax88190_mii_readreg;
- sc->sc_mii.mii_writereg = ax88190_mii_writereg;
- sc->sc_mii.mii_statchg = ax88190_mii_statchg;
- ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, dp8390_mediachange,
+ mii->mii_ifp = ifp;
+ mii->mii_readreg = ax88190_mii_readreg;
+ mii->mii_writereg = ax88190_mii_writereg;
+ mii->mii_statchg = ax88190_mii_statchg;
+ ifmedia_init(&mii->mii_media, IFM_IMASK, dp8390_mediachange,
dp8390_mediastatus);
- mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY, 0);
- if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
- ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0,
- NULL);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE);
+ if (LIST_FIRST(&mii->mii_phys) == NULL) {
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE);
} else
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
}
void
Index: src/sys/dev/ic/dl10019.c
diff -u src/sys/dev/ic/dl10019.c:1.13 src/sys/dev/ic/dl10019.c:1.14
--- src/sys/dev/ic/dl10019.c:1.13 Tue Jan 22 03:42:26 2019
+++ src/sys/dev/ic/dl10019.c Wed May 29 06:17:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dl10019.c,v 1.13 2019/01/22 03:42:26 msaitoh Exp $ */
+/* $NetBSD: dl10019.c,v 1.14 2019/05/29 06:17:28 msaitoh Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dl10019.c,v 1.13 2019/01/22 03:42:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl10019.c,v 1.14 2019/05/29 06:17:28 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,24 +117,25 @@ void
dl10019_media_init(struct dp8390_softc *sc)
{
struct ifnet *ifp = &sc->sc_ec.ec_if;
+ struct mii_data *mii = &sc->sc_mii;
- sc->sc_mii.mii_ifp = ifp;
- sc->sc_mii.mii_readreg = dl10019_mii_readreg;
- sc->sc_mii.mii_writereg = dl10019_mii_writereg;
- sc->sc_mii.mii_statchg = dl10019_mii_statchg;
- ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, dp8390_mediachange,
+ mii->mii_ifp = ifp;
+ mii->mii_readreg = dl10019_mii_readreg;
+ mii->mii_writereg = dl10019_mii_writereg;
+ mii->mii_statchg = dl10019_mii_statchg;
+ ifmedia_init(&mii->mii_media, IFM_IMASK, dp8390_mediachange,
dp8390_mediastatus);
dl10019_mii_reset(sc);
- mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff, MII_PHY_ANY,
+ mii_attach(sc->sc_dev, mii, 0xffffffff, MII_PHY_ANY,
MII_OFFSET_ANY, 0);
- if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
- ifmedia_add(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE, 0, NULL);
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_NONE);
+ if (LIST_FIRST(&mii->mii_phys) == NULL) {
+ ifmedia_add(&mii->mii_media, IFM_ETHER | IFM_NONE, 0, NULL);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE);
} else
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
}
void
Index: src/sys/dev/ic/elink3.c
diff -u src/sys/dev/ic/elink3.c:1.148 src/sys/dev/ic/elink3.c:1.149
--- src/sys/dev/ic/elink3.c:1.148 Fri May 24 06:26:38 2019
+++ src/sys/dev/ic/elink3.c Wed May 29 06:17:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.148 2019/05/24 06:26:38 msaitoh Exp $ */
+/* $NetBSD: elink3.c,v 1.149 2019/05/29 06:17:28 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.148 2019/05/24 06:26:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.149 2019/05/29 06:17:28 msaitoh Exp $");
#include "opt_inet.h"
@@ -135,23 +135,23 @@ struct ep_media {
* MII and real PHYs attached; no `native' media.
*/
const struct ep_media ep_vortex_media[] = {
- { ELINK_PCI_10BASE_T, "10baseT", IFM_ETHER|IFM_10_T,
+ { ELINK_PCI_10BASE_T, "10baseT", IFM_ETHER | IFM_10_T,
ELINKMEDIA_10BASE_T },
- { ELINK_PCI_10BASE_T, "10baseT-FDX", IFM_ETHER|IFM_10_T|IFM_FDX,
+ { ELINK_PCI_10BASE_T, "10baseT-FDX", IFM_ETHER | IFM_10_T | IFM_FDX,
ELINKMEDIA_10BASE_T },
- { ELINK_PCI_AUI, "10base5", IFM_ETHER|IFM_10_5,
+ { ELINK_PCI_AUI, "10base5", IFM_ETHER | IFM_10_5,
ELINKMEDIA_AUI },
- { ELINK_PCI_BNC, "10base2", IFM_ETHER|IFM_10_2,
+ { ELINK_PCI_BNC, "10base2", IFM_ETHER | IFM_10_2,
ELINKMEDIA_10BASE_2 },
- { ELINK_PCI_100BASE_TX, "100baseTX", IFM_ETHER|IFM_100_TX,
+ { ELINK_PCI_100BASE_TX, "100baseTX", IFM_ETHER | IFM_100_TX,
ELINKMEDIA_100BASE_TX },
- { ELINK_PCI_100BASE_TX, "100baseTX-FDX",IFM_ETHER|IFM_100_TX|IFM_FDX,
+ { ELINK_PCI_100BASE_TX, "100baseTX-FDX",IFM_ETHER | IFM_100_TX|IFM_FDX,
ELINKMEDIA_100BASE_TX },
- { ELINK_PCI_100BASE_FX, "100baseFX", IFM_ETHER|IFM_100_FX,
+ { ELINK_PCI_100BASE_FX, "100baseFX", IFM_ETHER | IFM_100_FX,
ELINKMEDIA_100BASE_FX },
- { ELINK_PCI_100BASE_MII,"manual", IFM_ETHER|IFM_MANUAL,
+ { ELINK_PCI_100BASE_MII,"manual", IFM_ETHER | IFM_MANUAL,
ELINKMEDIA_MII },
- { ELINK_PCI_100BASE_T4, "100baseT4", IFM_ETHER|IFM_100_T4,
+ { ELINK_PCI_100BASE_T4, "100baseT4", IFM_ETHER | IFM_100_T4,
ELINKMEDIA_100BASE_T4 },
{ 0, NULL, 0,
0 },
@@ -162,11 +162,11 @@ const struct ep_media ep_vortex_media[]
* in the 3c509, 3c579, and 3c589.
*/
const struct ep_media ep_509_media[] = {
- { ELINK_W0_CC_UTP, "10baseT", IFM_ETHER|IFM_10_T,
+ { ELINK_W0_CC_UTP, "10baseT", IFM_ETHER | IFM_10_T,
ELINKMEDIA_10BASE_T },
- { ELINK_W0_CC_AUI, "10base5", IFM_ETHER|IFM_10_5,
+ { ELINK_W0_CC_AUI, "10base5", IFM_ETHER | IFM_10_5,
ELINKMEDIA_AUI },
- { ELINK_W0_CC_BNC, "10base2", IFM_ETHER|IFM_10_2,
+ { ELINK_W0_CC_BNC, "10base2", IFM_ETHER | IFM_10_2,
ELINKMEDIA_10BASE_2 },
{ 0, NULL, 0,
0 },
@@ -319,6 +319,7 @@ epconfig(struct ep_softc *sc, u_short ch
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
+ struct mii_data *mii = &sc->sc_mii;
u_int16_t i;
u_int8_t myla[ETHER_ADDR_LEN];
@@ -426,12 +427,12 @@ epconfig(struct ep_softc *sc, u_short ch
* Initialize our media structures and MII info. We'll
* probe the MII if we discover that we have one.
*/
- sc->sc_mii.mii_ifp = ifp;
- sc->sc_mii.mii_readreg = ep_mii_readreg;
- sc->sc_mii.mii_writereg = ep_mii_writereg;
- sc->sc_mii.mii_statchg = ep_statchg;
- sc->sc_ethercom.ec_mii = &sc->sc_mii;
- ifmedia_init(&sc->sc_mii.mii_media, IFM_IMASK, ep_media_change,
+ mii->mii_ifp = ifp;
+ mii->mii_readreg = ep_mii_readreg;
+ mii->mii_writereg = ep_mii_writereg;
+ mii->mii_statchg = ep_statchg;
+ sc->sc_ethercom.ec_mii = mii;
+ ifmedia_init(&mii->mii_media, IFM_IMASK, ep_media_change,
ep_media_status);
/*
@@ -459,16 +460,16 @@ epconfig(struct ep_softc *sc, u_short ch
* we don't, just treat the Boomerang like the Vortex.
*/
if (sc->ep_flags & ELINK_FLAGS_MII) {
- mii_attach(sc->sc_dev, &sc->sc_mii, 0xffffffff,
+ mii_attach(sc->sc_dev, mii, 0xffffffff,
MII_PHY_ANY, MII_OFFSET_ANY, 0);
- if (LIST_FIRST(&sc->sc_mii.mii_phys) == NULL) {
- ifmedia_add(&sc->sc_mii.mii_media,
- IFM_ETHER|IFM_NONE, 0, NULL);
- ifmedia_set(&sc->sc_mii.mii_media,
- IFM_ETHER|IFM_NONE);
+ if (LIST_FIRST(&mii->mii_phys) == NULL) {
+ ifmedia_add(&mii->mii_media,
+ IFM_ETHER | IFM_NONE, 0, NULL);
+ ifmedia_set(&mii->mii_media,
+ IFM_ETHER | IFM_NONE);
} else {
- ifmedia_set(&sc->sc_mii.mii_media,
- IFM_ETHER|IFM_AUTO);
+ ifmedia_set(&mii->mii_media,
+ IFM_ETHER | IFM_AUTO);
}
break;
}
@@ -573,8 +574,8 @@ ep_509_probemedia(struct ep_softc *sc)
/* Sanity check that there are any media! */
if ((ep_w0_config & ELINK_W0_CC_MEDIAMASK) == 0) {
aprint_error("no media present!\n");
- ifmedia_add(ifm, IFM_ETHER|IFM_NONE, 0, NULL);
- ifmedia_set(ifm, IFM_ETHER|IFM_NONE);
+ ifmedia_add(ifm, IFM_ETHER | IFM_NONE, 0, NULL);
+ ifmedia_set(ifm, IFM_ETHER | IFM_NONE);
return;
}
@@ -644,8 +645,8 @@ ep_vortex_probemedia(struct ep_softc *sc
/* Sanity check that there are any media! */
if ((reset_options & ELINK_PCI_MEDIAMASK) == 0) {
aprint_error("no media present!\n");
- ifmedia_add(ifm, IFM_ETHER|IFM_NONE, 0, NULL);
- ifmedia_set(ifm, IFM_ETHER|IFM_NONE);
+ ifmedia_add(ifm, IFM_ETHER | IFM_NONE, 0, NULL);
+ ifmedia_set(ifm, IFM_ETHER | IFM_NONE);
return;
}
@@ -878,16 +879,16 @@ ep_roadrunner_mii_enable(struct ep_softc
GO_WINDOW(3);
bus_space_write_2(iot, ioh, ELINK_W3_RESET_OPTIONS,
- ELINK_PCI_100BASE_MII|ELINK_RUNNER_ENABLE_MII);
+ ELINK_PCI_100BASE_MII | ELINK_RUNNER_ENABLE_MII);
delay(1000);
bus_space_write_2(iot, ioh, ELINK_W3_RESET_OPTIONS,
- ELINK_PCI_100BASE_MII|ELINK_RUNNER_MII_RESET|
+ ELINK_PCI_100BASE_MII | ELINK_RUNNER_MII_RESET |
ELINK_RUNNER_ENABLE_MII);
ep_reset_cmd(sc, ELINK_COMMAND, TX_RESET);
ep_reset_cmd(sc, ELINK_COMMAND, RX_RESET);
delay(1000);
bus_space_write_2(iot, ioh, ELINK_W3_RESET_OPTIONS,
- ELINK_PCI_100BASE_MII|ELINK_RUNNER_ENABLE_MII);
+ ELINK_PCI_100BASE_MII | ELINK_RUNNER_ENABLE_MII);
}
/*
@@ -1046,7 +1047,7 @@ ep_media_status(struct ifnet *ifp, struc
bus_space_handle_t ioh = sc->sc_ioh;
if (sc->enabled == 0) {
- req->ifm_active = IFM_ETHER|IFM_NONE;
+ req->ifm_active = IFM_ETHER | IFM_NONE;
req->ifm_status = 0;
return;
}
Index: src/sys/dev/pci/if_tlp_pci.c
diff -u src/sys/dev/pci/if_tlp_pci.c:1.125 src/sys/dev/pci/if_tlp_pci.c:1.126
--- src/sys/dev/pci/if_tlp_pci.c:1.125 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/if_tlp_pci.c Wed May 29 06:17:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.125 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.126 2019/05/29 06:17:28 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.125 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.126 2019/05/29 06:17:28 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -509,9 +509,9 @@ tlp_pci_attach(device_t parent, device_t
* Clear the "sleep mode" bit in the CFDA register.
*/
reg = pci_conf_read(pc, pa->pa_tag, TULIP_PCI_CFDA);
- if (reg & (CFDA_SLEEP|CFDA_SNOOZE))
+ if (reg & (CFDA_SLEEP | CFDA_SNOOZE))
pci_conf_write(pc, pa->pa_tag, TULIP_PCI_CFDA,
- reg & ~(CFDA_SLEEP|CFDA_SNOOZE));
+ reg & ~(CFDA_SLEEP | CFDA_SNOOZE));
break;
default:
@@ -534,7 +534,7 @@ tlp_pci_attach(device_t parent, device_t
PCI_MAPREG_TYPE_IO, 0,
&iot, &ioh, NULL, &iosize) == 0);
memh_valid = (pci_mapreg_map(pa, TULIP_PCI_MMBA,
- PCI_MAPREG_TYPE_MEM|PCI_MAPREG_MEM_TYPE_32BIT, 0,
+ PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT, 0,
&memt, &memh, NULL, &memsize) == 0);
if (memh_valid) {
sc->sc_st = memt;
@@ -652,7 +652,7 @@ tlp_pci_attach(device_t parent, device_t
sc->sc_srom_addrbits = 6;
sc->sc_srom = malloc(TULIP_ROM_SIZE(6), M_DEVBUF,
- M_NOWAIT|M_ZERO);
+ M_NOWAIT | M_ZERO);
memcpy(sc->sc_srom, enaddr, sizeof(enaddr));
if (tlp_srom_debug) {
aprint_normal("SROM CONTENTS:");
@@ -1274,7 +1274,7 @@ tlp_pci_cogent_21040_quirks(struct tulip
{
strcpy(psc->sc_tulip.sc_name, "Cogent multi-port");
- psc->sc_flags |= TULIP_PCI_SHAREDINTR|TULIP_PCI_SHAREDROM;
+ psc->sc_flags |= TULIP_PCI_SHAREDINTR | TULIP_PCI_SHAREDROM;
}
static void
@@ -1388,6 +1388,7 @@ static void
tlp_smc9332dst_tmsw_init(struct tulip_softc *sc)
{
struct tulip_21x4x_media *tm;
+ struct mii_data *mii = &sc->sc_mii;
const char *sep = "";
uint32_t reg;
int i, cnt;
@@ -1396,15 +1397,14 @@ tlp_smc9332dst_tmsw_init(struct tulip_so
sc->sc_opmode = OPMODE_MBO | OPMODE_PS;
TULIP_WRITE(sc, CSR_OPMODE, sc->sc_opmode);
- ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
- tlp_mediastatus);
+ ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus);
aprint_normal_dev(sc->sc_dev, "");
#define ADD(m, c) \
- tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); \
+ tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); \
tm->tm_opmode = (c); \
tm->tm_gpdata = GPP_SMC9332DST_INIT; \
- ifmedia_add(&sc->sc_mii.mii_media, (m), 0, tm)
+ ifmedia_add(&mii->mii_media, (m), 0, tm)
#define PRINT(str) aprint_normal("%s%s", sep, str); sep = ", "
ADD(IFM_MAKEWORD(IFM_ETHER, IFM_10_T, 0, 0), OPMODE_TTM);
@@ -1448,18 +1448,17 @@ tlp_smc9332dst_tmsw_init(struct tulip_so
}
delay(1000);
}
- if (cnt > 100) {
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_TX);
- } else {
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_10_T);
- }
+ if (cnt > 100)
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_100_TX);
+ else
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_10_T);
}
static void
tlp_pci_vpc_21140_quirks(struct tulip_pci_softc *psc, const uint8_t *enaddr)
{
struct tulip_softc *sc = &psc->sc_tulip;
- char *p1 = (char *) &sc->sc_srom[32];
+ char *p1 = (char *)&sc->sc_srom[32];
char *p2 = &sc->sc_name[0];
do {
@@ -1583,7 +1582,7 @@ tlp_pci_adaptec_quirks(struct tulip_pci_
case 0x2400:
strcpy(psc->sc_tulip.sc_name, "Adaptec ANA-6944A");
- psc->sc_flags |= TULIP_PCI_SHAREDINTR|TULIP_PCI_SHAREDROM;
+ psc->sc_flags |= TULIP_PCI_SHAREDINTR | TULIP_PCI_SHAREDROM;
break;
case 0x2b00:
@@ -1592,7 +1591,7 @@ tlp_pci_adaptec_quirks(struct tulip_pci_
case 0x3000:
strcpy(psc->sc_tulip.sc_name, "Adaptec ANA-6922");
- psc->sc_flags |= TULIP_PCI_SHAREDINTR|TULIP_PCI_SHAREDROM;
+ psc->sc_flags |= TULIP_PCI_SHAREDINTR | TULIP_PCI_SHAREDROM;
break;
default:
@@ -1606,21 +1605,21 @@ static void
tlp_cogent_em1x0_tmsw_init(struct tulip_softc *sc)
{
struct tulip_21x4x_media *tm;
+ struct mii_data *mii = &sc->sc_mii;
const char *sep = "";
sc->sc_gp_dir = GPP_COGENT_EM1x0_PINS;
sc->sc_opmode = OPMODE_MBO | OPMODE_PS;
TULIP_WRITE(sc, CSR_OPMODE, sc->sc_opmode);
- ifmedia_init(&sc->sc_mii.mii_media, 0, tlp_mediachange,
- tlp_mediastatus);
+ ifmedia_init(&mii->mii_media, 0, tlp_mediachange, tlp_mediastatus);
aprint_normal_dev(sc->sc_dev, "");
#define ADD(m, c) \
- tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK|M_ZERO); \
+ tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO); \
tm->tm_opmode = (c); \
tm->tm_gpdata = GPP_COGENT_EM1x0_INIT; \
- ifmedia_add(&sc->sc_mii.mii_media, (m), 0, tm)
+ ifmedia_add(&mii->mii_media, (m), 0, tm)
#define PRINT(str) aprint_normal("%s%s", sep, str); sep = ", "
if (sc->sc_srom[32] == 0x15) {
@@ -1633,7 +1632,7 @@ tlp_cogent_em1x0_tmsw_init(struct tulip_
PRINT("100baseFX-FDX");
aprint_normal("\n");
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_FX);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_100_FX);
} else {
ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, 0, 0),
OPMODE_PS | OPMODE_PCS | OPMODE_SCR);
@@ -1644,7 +1643,7 @@ tlp_cogent_em1x0_tmsw_init(struct tulip_
PRINT("100baseTX-FDX");
aprint_normal("\n");
- ifmedia_set(&sc->sc_mii.mii_media, IFM_ETHER|IFM_100_TX);
+ ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_100_TX);
}
#undef ADD
