diff options
| author | David Greenman <dg@FreeBSD.org> | 1995-01-01 06:38:14 +0000 |
|---|---|---|
| committer | David Greenman <dg@FreeBSD.org> | 1995-01-01 06:38:14 +0000 |
| commit | 84bcd8659aff2e2d687ea6c950c269005b79e107 (patch) | |
| tree | 1bc8c61c29ccf91467c61744cc2767371133f329 /sys | |
| parent | c38c2f7f9b2067d3aaa8164ab77aa762ddd83421 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ed/if_ed.c | 12 | ||||
| -rw-r--r-- | sys/i386/isa/if_ed.c | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 46ac3fbdd84e..14710d025e13 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -13,7 +13,7 @@ * the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000, * and a variety of similar clones. * - * $Id: if_ed.c,v 1.60 1994/12/31 17:09:56 jkh Exp $ + * $Id: if_ed.c,v 1.61 1995/01/01 03:54:34 davidg Exp $ */ #include "ed.h" @@ -2234,7 +2234,7 @@ ed_pio_write_mbufs(sc, m, dst) struct mbuf *m; unsigned short dst; { - unsigned short len; + unsigned short len, dma_len; struct mbuf *mp; int maxwait = 100; /* about 120us */ @@ -2242,6 +2242,10 @@ ed_pio_write_mbufs(sc, m, dst) for (len = 0, mp = m; mp; mp = mp->m_next) len += mp->m_len; + dma_len = len; + if (sc->isa16bit && (dma_len & 1)) + dma_len++; + /* select page 0 registers */ outb(sc->nic_addr + ED_P0_CR, ED_CR_RD2 | ED_CR_STA); @@ -2249,8 +2253,8 @@ ed_pio_write_mbufs(sc, m, dst) outb(sc->nic_addr + ED_P0_ISR, ED_ISR_RDC); /* set up DMA byte count */ - outb(sc->nic_addr + ED_P0_RBCR0, len); - outb(sc->nic_addr + ED_P0_RBCR1, len >> 8); + outb(sc->nic_addr + ED_P0_RBCR0, dma_len); + outb(sc->nic_addr + ED_P0_RBCR1, dma_len >> 8); /* set up destination address in NIC mem */ outb(sc->nic_addr + ED_P0_RSAR0, dst); diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index 46ac3fbdd84e..14710d025e13 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -13,7 +13,7 @@ * the SMC Elite Ultra (8216), the 3Com 3c503, the NE1000 and NE2000, * and a variety of similar clones. * - * $Id: if_ed.c,v 1.60 1994/12/31 17:09:56 jkh Exp $ + * $Id: if_ed.c,v 1.61 1995/01/01 03:54:34 davidg Exp $ */ #include "ed.h" @@ -2234,7 +2234,7 @@ ed_pio_write_mbufs(sc, m, dst) struct mbuf *m; unsigned short dst; { - unsigned short len; + unsigned short len, dma_len; struct mbuf *mp; int maxwait = 100; /* about 120us */ @@ -2242,6 +2242,10 @@ ed_pio_write_mbufs(sc, m, dst) for (len = 0, mp = m; mp; mp = mp->m_next) len += mp->m_len; + dma_len = len; + if (sc->isa16bit && (dma_len & 1)) + dma_len++; + /* select page 0 registers */ outb(sc->nic_addr + ED_P0_CR, ED_CR_RD2 | ED_CR_STA); @@ -2249,8 +2253,8 @@ ed_pio_write_mbufs(sc, m, dst) outb(sc->nic_addr + ED_P0_ISR, ED_ISR_RDC); /* set up DMA byte count */ - outb(sc->nic_addr + ED_P0_RBCR0, len); - outb(sc->nic_addr + ED_P0_RBCR1, len >> 8); + outb(sc->nic_addr + ED_P0_RBCR0, dma_len); + outb(sc->nic_addr + ED_P0_RBCR1, dma_len >> 8); /* set up destination address in NIC mem */ outb(sc->nic_addr + ED_P0_RSAR0, dst); |