zap whitespace and tab
This commit is contained in:
parent
5b49f88fed
commit
4de47ea988
GPG key ID:
F42C07F07E2E35B7
681 changed files with 35748 additions and 35743 deletions
|
|
@ -605,7 +605,7 @@ alc_get_macaddr_813x(struct alc_softc *sc)
|
|||
break;
|
||||
}
|
||||
if (i == 0)
|
||||
printf("%s: reloading EEPROM timeout!\n",
|
||||
printf("%s: reloading EEPROM timeout!\n",
|
||||
sc->sc_dev.dv_xname);
|
||||
} else {
|
||||
if (alcdebug)
|
||||
|
|
@ -959,7 +959,7 @@ alc_phy_down(struct alc_softc *sc)
|
|||
default:
|
||||
/* Force PHY down. */
|
||||
CSR_WRITE_2(sc, ALC_GPHY_CFG, GPHY_CFG_EXT_RESET |
|
||||
GPHY_CFG_SEL_ANA_RESET | GPHY_CFG_PHY_IDDQ |
|
||||
GPHY_CFG_SEL_ANA_RESET | GPHY_CFG_PHY_IDDQ |
|
||||
GPHY_CFG_PWDOWN_HW);
|
||||
DELAY(1000);
|
||||
break;
|
||||
|
|
@ -1342,7 +1342,7 @@ alc_attach(struct device *parent, struct device *self, void *aux)
|
|||
sc->alc_dma_wr_burst = (burst & 0x00e0) >> 5;
|
||||
if (alcdebug) {
|
||||
printf("%s: Read request size : %u bytes.\n",
|
||||
sc->sc_dev.dv_xname,
|
||||
sc->sc_dev.dv_xname,
|
||||
alc_dma_burst[sc->alc_dma_rd_burst]);
|
||||
printf("%s: TLP payload size : %u bytes.\n",
|
||||
sc->sc_dev.dv_xname,
|
||||
|
|
@ -1416,7 +1416,7 @@ alc_attach(struct device *parent, struct device *self, void *aux)
|
|||
ifmedia_add(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL,
|
||||
0, NULL);
|
||||
ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_MANUAL);
|
||||
} else
|
||||
} else
|
||||
ifmedia_set(&sc->sc_miibus.mii_media, IFM_ETHER | IFM_AUTO);
|
||||
|
||||
if_attach(ifp);
|
||||
|
|
@ -1523,12 +1523,12 @@ alc_dma_alloc(struct alc_softc *sc)
|
|||
if (error) {
|
||||
printf("%s: could not load DMA'able memory for Tx ring.\n",
|
||||
sc->sc_dev.dv_xname);
|
||||
bus_dmamem_free(sc->sc_dmat,
|
||||
bus_dmamem_free(sc->sc_dmat,
|
||||
(bus_dma_segment_t *)&sc->alc_rdata.alc_tx_ring, 1);
|
||||
return (error);
|
||||
}
|
||||
|
||||
sc->alc_rdata.alc_tx_ring_paddr =
|
||||
sc->alc_rdata.alc_tx_ring_paddr =
|
||||
sc->alc_cdata.alc_tx_ring_map->dm_segs[0].ds_addr;
|
||||
|
||||
/*
|
||||
|
|
@ -1538,7 +1538,7 @@ alc_dma_alloc(struct alc_softc *sc)
|
|||
ALC_RX_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->alc_cdata.alc_rx_ring_map);
|
||||
if (error)
|
||||
return (ENOBUFS);
|
||||
|
||||
|
||||
/* Allocate DMA'able memory for RX ring */
|
||||
error = bus_dmamem_alloc(sc->sc_dmat, ALC_RX_RING_SZ,
|
||||
ETHER_ALIGN, 0, &sc->alc_rdata.alc_rx_ring_seg, 1,
|
||||
|
|
@ -1572,14 +1572,14 @@ alc_dma_alloc(struct alc_softc *sc)
|
|||
/*
|
||||
* Create DMA stuffs for RX return ring
|
||||
*/
|
||||
error = bus_dmamap_create(sc->sc_dmat, ALC_RR_RING_SZ, 1,
|
||||
error = bus_dmamap_create(sc->sc_dmat, ALC_RR_RING_SZ, 1,
|
||||
ALC_RR_RING_SZ, 0, BUS_DMA_NOWAIT, &sc->alc_cdata.alc_rr_ring_map);
|
||||
if (error)
|
||||
return (ENOBUFS);
|
||||
|
||||
/* Allocate DMA'able memory for RX return ring */
|
||||
error = bus_dmamem_alloc(sc->sc_dmat, ALC_RR_RING_SZ,
|
||||
ETHER_ALIGN, 0, &sc->alc_rdata.alc_rr_ring_seg, 1,
|
||||
error = bus_dmamem_alloc(sc->sc_dmat, ALC_RR_RING_SZ,
|
||||
ETHER_ALIGN, 0, &sc->alc_rdata.alc_rr_ring_seg, 1,
|
||||
&nsegs, BUS_DMA_NOWAIT | BUS_DMA_ZERO);
|
||||
if (error) {
|
||||
printf("%s: could not allocate DMA'able memory for Rx "
|
||||
|
|
@ -1604,21 +1604,21 @@ alc_dma_alloc(struct alc_softc *sc)
|
|||
return (error);
|
||||
}
|
||||
|
||||
sc->alc_rdata.alc_rr_ring_paddr =
|
||||
sc->alc_rdata.alc_rr_ring_paddr =
|
||||
sc->alc_cdata.alc_rr_ring_map->dm_segs[0].ds_addr;
|
||||
|
||||
/*
|
||||
* Create DMA stuffs for CMB block
|
||||
* Create DMA stuffs for CMB block
|
||||
*/
|
||||
error = bus_dmamap_create(sc->sc_dmat, ALC_CMB_SZ, 1,
|
||||
ALC_CMB_SZ, 0, BUS_DMA_NOWAIT,
|
||||
error = bus_dmamap_create(sc->sc_dmat, ALC_CMB_SZ, 1,
|
||||
ALC_CMB_SZ, 0, BUS_DMA_NOWAIT,
|
||||
&sc->alc_cdata.alc_cmb_map);
|
||||
if (error)
|
||||
if (error)
|
||||
return (ENOBUFS);
|
||||
|
||||
/* Allocate DMA'able memory for CMB block */
|
||||
error = bus_dmamem_alloc(sc->sc_dmat, ALC_CMB_SZ,
|
||||
ETHER_ALIGN, 0, &sc->alc_rdata.alc_cmb_seg, 1,
|
||||
error = bus_dmamem_alloc(sc->sc_dmat, ALC_CMB_SZ,
|
||||
ETHER_ALIGN, 0, &sc->alc_rdata.alc_cmb_seg, 1,
|
||||
&nsegs, BUS_DMA_NOWAIT | BUS_DMA_ZERO);
|
||||
if (error) {
|
||||
printf("%s: could not allocate DMA'able memory for "
|
||||
|
|
@ -1634,7 +1634,7 @@ alc_dma_alloc(struct alc_softc *sc)
|
|||
|
||||
/* Load the DMA map for CMB block. */
|
||||
error = bus_dmamap_load(sc->sc_dmat, sc->alc_cdata.alc_cmb_map,
|
||||
sc->alc_rdata.alc_cmb, ALC_CMB_SZ, NULL,
|
||||
sc->alc_rdata.alc_cmb, ALC_CMB_SZ, NULL,
|
||||
BUS_DMA_WAITOK);
|
||||
if (error) {
|
||||
printf("%s: could not load DMA'able memory for CMB block\n",
|
||||
|
|
@ -1644,21 +1644,21 @@ alc_dma_alloc(struct alc_softc *sc)
|
|||
return (error);
|
||||
}
|
||||
|
||||
sc->alc_rdata.alc_cmb_paddr =
|
||||
sc->alc_rdata.alc_cmb_paddr =
|
||||
sc->alc_cdata.alc_cmb_map->dm_segs[0].ds_addr;
|
||||
|
||||
/*
|
||||
* Create DMA stuffs for SMB block
|
||||
*/
|
||||
error = bus_dmamap_create(sc->sc_dmat, ALC_SMB_SZ, 1,
|
||||
ALC_SMB_SZ, 0, BUS_DMA_NOWAIT,
|
||||
error = bus_dmamap_create(sc->sc_dmat, ALC_SMB_SZ, 1,
|
||||
ALC_SMB_SZ, 0, BUS_DMA_NOWAIT,
|
||||
&sc->alc_cdata.alc_smb_map);
|
||||
if (error)
|
||||
return (ENOBUFS);
|
||||
|
||||
/* Allocate DMA'able memory for SMB block */
|
||||
error = bus_dmamem_alloc(sc->sc_dmat, ALC_SMB_SZ,
|
||||
ETHER_ALIGN, 0, &sc->alc_rdata.alc_smb_seg, 1,
|
||||
error = bus_dmamem_alloc(sc->sc_dmat, ALC_SMB_SZ,
|
||||
ETHER_ALIGN, 0, &sc->alc_rdata.alc_smb_seg, 1,
|
||||
&nsegs, BUS_DMA_NOWAIT | BUS_DMA_ZERO);
|
||||
if (error) {
|
||||
printf("%s: could not allocate DMA'able memory for "
|
||||
|
|
@ -1674,7 +1674,7 @@ alc_dma_alloc(struct alc_softc *sc)
|
|||
|
||||
/* Load the DMA map for SMB block */
|
||||
error = bus_dmamap_load(sc->sc_dmat, sc->alc_cdata.alc_smb_map,
|
||||
sc->alc_rdata.alc_smb, ALC_SMB_SZ, NULL,
|
||||
sc->alc_rdata.alc_smb, ALC_SMB_SZ, NULL,
|
||||
BUS_DMA_WAITOK);
|
||||
if (error) {
|
||||
printf("%s: could not load DMA'able memory for SMB block\n",
|
||||
|
|
@ -1684,7 +1684,7 @@ alc_dma_alloc(struct alc_softc *sc)
|
|||
return (error);
|
||||
}
|
||||
|
||||
sc->alc_rdata.alc_smb_paddr =
|
||||
sc->alc_rdata.alc_smb_paddr =
|
||||
sc->alc_cdata.alc_smb_map->dm_segs[0].ds_addr;
|
||||
|
||||
|
||||
|
|
@ -1767,11 +1767,11 @@ alc_dma_free(struct alc_softc *sc)
|
|||
sc->alc_cdata.alc_tx_ring_map = NULL;
|
||||
|
||||
/* Rx ring. */
|
||||
if (sc->alc_cdata.alc_rx_ring_map != NULL)
|
||||
if (sc->alc_cdata.alc_rx_ring_map != NULL)
|
||||
bus_dmamap_unload(sc->sc_dmat, sc->alc_cdata.alc_rx_ring_map);
|
||||
if (sc->alc_cdata.alc_rx_ring_map != NULL &&
|
||||
sc->alc_rdata.alc_rx_ring != NULL)
|
||||
bus_dmamem_free(sc->sc_dmat,
|
||||
bus_dmamem_free(sc->sc_dmat,
|
||||
(bus_dma_segment_t *)sc->alc_rdata.alc_rx_ring, 1);
|
||||
sc->alc_rdata.alc_rx_ring = NULL;
|
||||
sc->alc_cdata.alc_rx_ring_map = NULL;
|
||||
|
|
@ -1781,7 +1781,7 @@ alc_dma_free(struct alc_softc *sc)
|
|||
bus_dmamap_unload(sc->sc_dmat, sc->alc_cdata.alc_rr_ring_map);
|
||||
if (sc->alc_cdata.alc_rr_ring_map != NULL &&
|
||||
sc->alc_rdata.alc_rr_ring != NULL)
|
||||
bus_dmamem_free(sc->sc_dmat,
|
||||
bus_dmamem_free(sc->sc_dmat,
|
||||
(bus_dma_segment_t *)sc->alc_rdata.alc_rr_ring, 1);
|
||||
sc->alc_rdata.alc_rr_ring = NULL;
|
||||
sc->alc_cdata.alc_rr_ring_map = NULL;
|
||||
|
|
@ -1801,7 +1801,7 @@ alc_dma_free(struct alc_softc *sc)
|
|||
bus_dmamap_unload(sc->sc_dmat, sc->alc_cdata.alc_smb_map);
|
||||
if (sc->alc_cdata.alc_smb_map != NULL &&
|
||||
sc->alc_rdata.alc_smb != NULL)
|
||||
bus_dmamem_free(sc->sc_dmat,
|
||||
bus_dmamem_free(sc->sc_dmat,
|
||||
(bus_dma_segment_t *)sc->alc_rdata.alc_smb, 1);
|
||||
sc->alc_rdata.alc_smb = NULL;
|
||||
sc->alc_cdata.alc_smb_map = NULL;
|
||||
|
|
@ -1925,7 +1925,7 @@ alc_start(struct ifnet *ifp)
|
|||
continue;
|
||||
}
|
||||
enq++;
|
||||
|
||||
|
||||
#if NBPFILTER > 0
|
||||
/*
|
||||
* If there's a BPF listener, bounce a copy of this frame
|
||||
|
|
@ -1939,7 +1939,7 @@ alc_start(struct ifnet *ifp)
|
|||
if (enq > 0) {
|
||||
/* Sync descriptors. */
|
||||
bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_tx_ring_map, 0,
|
||||
sc->alc_cdata.alc_tx_ring_map->dm_mapsize,
|
||||
sc->alc_cdata.alc_tx_ring_map->dm_mapsize,
|
||||
BUS_DMASYNC_PREWRITE);
|
||||
/* Kick. Assume we're using normal Tx priority queue. */
|
||||
if ((sc->alc_flags & ALC_FLAG_AR816X_FAMILY) != 0)
|
||||
|
|
@ -2067,13 +2067,13 @@ alc_stats_clear(struct alc_softc *sc)
|
|||
|
||||
if ((sc->alc_flags & ALC_FLAG_SMB_BUG) == 0) {
|
||||
bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_smb_map, 0,
|
||||
sc->alc_cdata.alc_smb_map->dm_mapsize,
|
||||
sc->alc_cdata.alc_smb_map->dm_mapsize,
|
||||
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
|
||||
smb = sc->alc_rdata.alc_smb;
|
||||
/* Update done, clear. */
|
||||
smb->updated = 0;
|
||||
bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_smb_map, 0,
|
||||
sc->alc_cdata.alc_smb_map->dm_mapsize,
|
||||
sc->alc_cdata.alc_smb_map->dm_mapsize,
|
||||
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
|
||||
} else {
|
||||
for (reg = &sb.rx_frames, i = 0; reg <= &sb.rx_pkts_filtered;
|
||||
|
|
@ -2270,7 +2270,7 @@ alc_txeof(struct alc_softc *sc)
|
|||
BUS_DMASYNC_POSTWRITE);
|
||||
if ((sc->alc_flags & ALC_FLAG_CMB_BUG) == 0) {
|
||||
bus_dmamap_sync(sc->sc_dmat, sc->alc_cdata.alc_cmb_map, 0,
|
||||
sc->alc_cdata.alc_cmb_map->dm_mapsize,
|
||||
sc->alc_cdata.alc_cmb_map->dm_mapsize,
|
||||
BUS_DMASYNC_POSTREAD);
|
||||
prod = sc->alc_rdata.alc_cmb->cons;
|
||||
} else {
|
||||
|
|
@ -2648,7 +2648,7 @@ alc_reset(struct alc_softc *sc)
|
|||
}
|
||||
|
||||
if (i == 0)
|
||||
printf("%s: reset timeout(0x%08x)!\n", sc->sc_dev.dv_xname,
|
||||
printf("%s: reset timeout(0x%08x)!\n", sc->sc_dev.dv_xname,
|
||||
reg);
|
||||
|
||||
if ((sc->alc_flags & ALC_FLAG_AR816X_FAMILY) != 0) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue