diff options
| author | thorpej <thorpej@NetBSD.org> | 1999-12-12 02:53:56 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 1999-12-12 02:53:56 +0000 |
| commit | afbb07a0e54207df0d78eb6ec9a86559d20cd892 (patch) | |
| tree | 5a7f2f4894bc545fffcb08181e7f87edbc80b3c9 /sys/dev | |
| parent | 3716f21b7eff1da92cebbcdc6420fc710f7a50a5 (diff) | |
Use htole32() and le32toh().
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/elinkxl.c | 34 | ||||
| -rw-r--r-- | sys/dev/pci/if_vr.c | 41 | ||||
| -rw-r--r-- | sys/dev/pci/pciide.c | 23 |
3 files changed, 38 insertions, 60 deletions
diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c index fb433a56912..a662fdc84fb 100644 --- a/sys/dev/ic/elinkxl.c +++ b/sys/dev/ic/elinkxl.c @@ -1,4 +1,4 @@ -/* $NetBSD: elinkxl.c,v 1.20 1999/11/19 10:42:48 bouyer Exp $ */ +/* $NetBSD: elinkxl.c,v 1.21 1999/12/12 03:00:47 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -81,15 +81,7 @@ #include <machine/cpu.h> #include <machine/bus.h> #include <machine/intr.h> - -#if BYTE_ORDER == BIG_ENDIAN -#include <machine/bswap.h> -#define htopci(x) bswap32(x) -#define pcitoh(x) bswap32(x) -#else -#define htopci(x) (x) -#define pcitoh(x) (x) -#endif +#include <machine/endian.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -363,7 +355,7 @@ ex_config(sc) sc->sc_rxdescs[i].rx_dmamap = sc->sc_rx_dmamaps[i]; sc->sc_rxdescs[i].rx_upd = &sc->sc_upd[i]; sc->sc_upd[i].upd_frags[0].fr_len = - htopci((MCLBYTES - 2) | EX_FR_LAST); + htole32((MCLBYTES - 2) | EX_FR_LAST); if (ex_add_rxbuf(sc, &sc->sc_rxdescs[i]) != 0) { printf("%s: can't allocate or map rx buffers\n", sc->sc_dev.dv_xname); @@ -1024,12 +1016,12 @@ ex_start(ifp) fr = &txp->tx_dpd->dpd_frags[0]; totlen = 0; for (segment = 0; segment < dmamap->dm_nsegs; segment++, fr++) { - fr->fr_addr = htopci(dmamap->dm_segs[segment].ds_addr); - fr->fr_len = htopci(dmamap->dm_segs[segment].ds_len); + fr->fr_addr = htole32(dmamap->dm_segs[segment].ds_addr); + fr->fr_len = htole32(dmamap->dm_segs[segment].ds_len); totlen += dmamap->dm_segs[segment].ds_len; } fr--; - fr->fr_len |= htopci(EX_FR_LAST); + fr->fr_len |= htole32(EX_FR_LAST); txp->tx_mbhead = mb_head; bus_dmamap_sync(sc->sc_dmat, dmamap, 0, dmamap->dm_mapsize, @@ -1037,7 +1029,7 @@ ex_start(ifp) dpd = txp->tx_dpd; dpd->dpd_nextptr = 0; - dpd->dpd_fsh = htopci(totlen); + dpd->dpd_fsh = htole32(totlen); bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, ((caddr_t)dpd - (caddr_t)sc->sc_dpd), @@ -1057,7 +1049,7 @@ ex_start(ifp) bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, offset, sizeof (struct ex_dpd), BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); - prevdpd->dpd_nextptr = htopci(DPD_DMADDR(sc, txp)); + prevdpd->dpd_nextptr = htole32(DPD_DMADDR(sc, txp)); bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, offset, sizeof (struct ex_dpd), BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); @@ -1077,7 +1069,7 @@ ex_start(ifp) } out: if (sc->tx_head) { - sc->tx_tail->tx_dpd->dpd_fsh |= htopci(EX_DPD_DNIND); + sc->tx_tail->tx_dpd->dpd_fsh |= htole32(EX_DPD_DNIND); bus_dmamap_sync(sc->sc_dmat, sc->sc_dpd_dmamap, ((caddr_t)sc->tx_tail->tx_dpd - (caddr_t)sc->sc_dpd), sizeof (struct ex_dpd), @@ -1185,7 +1177,7 @@ ex_intr(arg) rxmap = rxd->rx_dmamap; m = rxd->rx_mbhead; upd = rxd->rx_upd; - pktstat = pcitoh(upd->upd_pktstatus); + pktstat = le32toh(upd->upd_pktstatus); bus_dmamap_sync(sc->sc_dmat, rxmap, 0, rxmap->dm_mapsize, @@ -1665,9 +1657,9 @@ ex_add_rxbuf(sc, rxd) m->m_data += 2; rxd->rx_mbhead = m; - rxd->rx_upd->upd_pktstatus = htopci(MCLBYTES - 2); + rxd->rx_upd->upd_pktstatus = htole32(MCLBYTES - 2); rxd->rx_upd->upd_frags[0].fr_addr = - htopci(rxmap->dm_segs[0].ds_addr + 2); + htole32(rxmap->dm_segs[0].ds_addr + 2); rxd->rx_upd->upd_nextptr = 0; /* @@ -1675,7 +1667,7 @@ ex_add_rxbuf(sc, rxd) */ if (sc->rx_head != NULL) { sc->rx_tail->rx_next = rxd; - sc->rx_tail->rx_upd->upd_nextptr = htopci(sc->sc_upddma + + sc->rx_tail->rx_upd->upd_nextptr = htole32(sc->sc_upddma + ((caddr_t)rxd->rx_upd - (caddr_t)sc->sc_upd)); bus_dmamap_sync(sc->sc_dmat, sc->sc_upd_dmamap, (caddr_t)sc->rx_tail->rx_upd - (caddr_t)sc->sc_upd, diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index a785f1c53fe..f632bb3e16a 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vr.c,v 1.29 1999/11/19 18:27:18 thorpej Exp $ */ +/* $NetBSD: if_vr.c,v 1.30 1999/12/12 02:56:49 thorpej Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -134,6 +134,7 @@ #include <machine/bus.h> #include <machine/intr.h> +#include <machine/endian.h> #include <dev/mii/mii.h> #include <dev/mii/miivar.h> @@ -145,15 +146,6 @@ #include <dev/pci/if_vrreg.h> -#if BYTE_ORDER == BIG_ENDIAN -#include <machine/bswap.h> -#define htopci(x) bswap32(x) -#define pcitoh(x) bswap32(x) -#else -#define htopci(x) (x) -#define pcitoh(x) (x) -#endif - #define VR_USEIOSPACE /* @@ -268,11 +260,11 @@ do { \ struct vr_desc *__d = VR_CDRX((sc), (i)); \ struct vr_descsoft *__ds = VR_DSRX((sc), (i)); \ \ - __d->vr_next = htopci(VR_CDRXADDR((sc), VR_NEXTRX((i)))); \ - __d->vr_status = htopci(VR_RXSTAT_FIRSTFRAG | \ + __d->vr_next = htole32(VR_CDRXADDR((sc), VR_NEXTRX((i)))); \ + __d->vr_status = htole32(VR_RXSTAT_FIRSTFRAG | \ VR_RXSTAT_LASTFRAG | VR_RXSTAT_OWN); \ - __d->vr_data = htopci(__ds->ds_dmamap->dm_segs[0].ds_addr); \ - __d->vr_ctl = htopci(VR_RXCTL_CHAIN | VR_RXCTL_RX_INTR | \ + __d->vr_data = htole32(__ds->ds_dmamap->dm_segs[0].ds_addr); \ + __d->vr_ctl = htole32(VR_RXCTL_CHAIN | VR_RXCTL_RX_INTR | \ ((MCLBYTES - 1) & VR_RXCTL_BUFLEN)); \ VR_CDRXSYNC((sc), (i), BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); \ } while (0) @@ -614,7 +606,7 @@ vr_rxeof(sc) VR_CDRXSYNC(sc, i, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); - rxstat = pcitoh(d->vr_status); + rxstat = le32toh(d->vr_status); if (rxstat & VR_RXSTAT_OWN) { /* @@ -671,7 +663,7 @@ vr_rxeof(sc) ds->ds_dmamap->dm_mapsize, BUS_DMASYNC_POSTREAD); /* No errors; receive the packet. */ - total_len = VR_RXBYTES(pcitoh(d->vr_status)); + total_len = VR_RXBYTES(le32toh(d->vr_status)); /* * XXX The VIA Rhine chip includes the CRC with every @@ -824,7 +816,7 @@ vr_txeof(sc) VR_CDTXSYNC(sc, i, BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE); - txstat = pcitoh(d->vr_status); + txstat = le32toh(d->vr_status); if (txstat & VR_TXSTAT_OWN) break; @@ -1038,11 +1030,12 @@ vr_start(ifp) * Fill in the transmit descriptor. The Rhine * doesn't auto-pad, so we have to do this ourselves. */ - d->vr_data = htopci(ds->ds_dmamap->dm_segs[0].ds_addr); - d->vr_ctl = htopci(m0->m_pkthdr.len < VR_MIN_FRAMELEN ? + d->vr_data = htole32(ds->ds_dmamap->dm_segs[0].ds_addr); + d->vr_ctl = htole32(m0->m_pkthdr.len < VR_MIN_FRAMELEN ? VR_MIN_FRAMELEN : m0->m_pkthdr.len); d->vr_ctl |= - htopci(VR_TXCTL_TLINK|VR_TXCTL_FIRSTFRAG|VR_TXCTL_LASTFRAG); + htole32(VR_TXCTL_TLINK|VR_TXCTL_FIRSTFRAG| + VR_TXCTL_LASTFRAG); /* * If this is the first descriptor we're enqueuing, @@ -1052,7 +1045,7 @@ vr_start(ifp) if (nexttx == firsttx) d->vr_status = 0; else - d->vr_status = htopci(VR_TXSTAT_OWN); + d->vr_status = htole32(VR_TXSTAT_OWN); VR_CDTXSYNC(sc, nexttx, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); @@ -1079,7 +1072,7 @@ vr_start(ifp) * Cause a transmit interrupt to happen on the * last packet we enqueued. */ - VR_CDTX(sc, sc->vr_txlast)->vr_ctl |= htopci(VR_TXCTL_FINT); + VR_CDTX(sc, sc->vr_txlast)->vr_ctl |= htole32(VR_TXCTL_FINT); VR_CDTXSYNC(sc, sc->vr_txlast, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); @@ -1087,7 +1080,7 @@ vr_start(ifp) * The entire packet chain is set up. Give the * first descriptor to the Rhine now. */ - VR_CDTX(sc, firsttx)->vr_status = htopci(VR_TXSTAT_OWN); + VR_CDTX(sc, firsttx)->vr_status = htole32(VR_TXSTAT_OWN); VR_CDTXSYNC(sc, firsttx, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); @@ -1131,7 +1124,7 @@ vr_init(sc) for (i = 0; i < VR_NTXDESC; i++) { d = VR_CDTX(sc, i); memset(d, 0, sizeof(struct vr_desc)); - d->vr_next = htopci(VR_CDTXADDR(sc, VR_NEXTTX(i))); + d->vr_next = htole32(VR_CDTXADDR(sc, VR_NEXTTX(i))); VR_CDTXSYNC(sc, i, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); } sc->vr_txpending = 0; diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 6d0dafef43b..c5565d11f48 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $NetBSD: pciide.c,v 1.48 1999/11/28 20:05:18 bouyer Exp $ */ +/* $NetBSD: pciide.c,v 1.49 1999/12/12 02:53:56 thorpej Exp $ */ /* @@ -97,6 +97,8 @@ int wdcdebug_pciide_mask = 0; #include <sys/device.h> #include <sys/malloc.h> +#include <machine/endian.h> + #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_kern.h> @@ -114,15 +116,6 @@ int wdcdebug_pciide_mask = 0; #include <dev/pci/pciide_acer_reg.h> #include <dev/pci/pciide_pdc202xx_reg.h> -#if BYTE_ORDER == BIG_ENDIAN -#include <machine/bswap.h> -#define htopci(x) bswap32(x) -#define pcitoh(x) bswap32(x) -#else -#define htopci(x) (x) -#define pcitoh(x) (x) -#endif - /* inlines for reading/writing 8-bit PCI registers */ static __inline u_int8_t pciide_pci_read __P((pci_chipset_tag_t, pcitag_t, int)); @@ -819,17 +812,17 @@ pciide_dma_init(v, channel, drive, databuf, datalen, flags) } #endif dma_maps->dma_table[seg].base_addr = - htopci(dma_maps->dmamap_xfer->dm_segs[seg].ds_addr); + htole32(dma_maps->dmamap_xfer->dm_segs[seg].ds_addr); dma_maps->dma_table[seg].byte_count = - htopci(dma_maps->dmamap_xfer->dm_segs[seg].ds_len & + htole32(dma_maps->dmamap_xfer->dm_segs[seg].ds_len & IDEDMA_BYTE_COUNT_MASK); WDCDEBUG_PRINT(("\t seg %d len %d addr 0x%x\n", - seg, pcitoh(dma_maps->dma_table[seg].byte_count), - pcitoh(dma_maps->dma_table[seg].base_addr)), DEBUG_DMA); + seg, le32toh(dma_maps->dma_table[seg].byte_count), + le32toh(dma_maps->dma_table[seg].base_addr)), DEBUG_DMA); } dma_maps->dma_table[dma_maps->dmamap_xfer->dm_nsegs -1].byte_count |= - htopci(IDEDMA_BYTE_COUNT_EOT); + htole32(IDEDMA_BYTE_COUNT_EOT); bus_dmamap_sync(sc->sc_dmat, dma_maps->dmamap_table, 0, dma_maps->dmamap_table->dm_mapsize, |
