|
@@ -191,11 +191,11 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
|
|
|
ei_outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
|
|
|
|
|
|
if (ei_local->word16)
|
|
|
- readsw(nic_base + NE_DATAPORT, hdr,
|
|
|
- sizeof(struct e8390_pkt_hdr) >> 1);
|
|
|
+ ioread16_rep(nic_base + NE_DATAPORT, hdr,
|
|
|
+ sizeof(struct e8390_pkt_hdr) >> 1);
|
|
|
else
|
|
|
- readsb(nic_base + NE_DATAPORT, hdr,
|
|
|
- sizeof(struct e8390_pkt_hdr));
|
|
|
+ ioread8_rep(nic_base + NE_DATAPORT, hdr,
|
|
|
+ sizeof(struct e8390_pkt_hdr));
|
|
|
|
|
|
ei_outb(ENISR_RDC, nic_base + EN0_ISR); /* Ack intr. */
|
|
|
ei_local->dmaing &= ~0x01;
|
|
@@ -237,12 +237,12 @@ static void ax_block_input(struct net_device *dev, int count,
|
|
|
ei_outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);
|
|
|
|
|
|
if (ei_local->word16) {
|
|
|
- readsw(nic_base + NE_DATAPORT, buf, count >> 1);
|
|
|
+ ioread16_rep(nic_base + NE_DATAPORT, buf, count >> 1);
|
|
|
if (count & 0x01)
|
|
|
buf[count-1] = ei_inb(nic_base + NE_DATAPORT);
|
|
|
|
|
|
} else {
|
|
|
- readsb(nic_base + NE_DATAPORT, buf, count);
|
|
|
+ ioread8_rep(nic_base + NE_DATAPORT, buf, count);
|
|
|
}
|
|
|
|
|
|
ei_local->dmaing &= ~1;
|
|
@@ -286,9 +286,9 @@ static void ax_block_output(struct net_device *dev, int count,
|
|
|
|
|
|
ei_outb(E8390_RWRITE+E8390_START, nic_base + NE_CMD);
|
|
|
if (ei_local->word16)
|
|
|
- writesw(nic_base + NE_DATAPORT, buf, count >> 1);
|
|
|
+ iowrite16_rep(nic_base + NE_DATAPORT, buf, count >> 1);
|
|
|
else
|
|
|
- writesb(nic_base + NE_DATAPORT, buf, count);
|
|
|
+ iowrite8_rep(nic_base + NE_DATAPORT, buf, count);
|
|
|
|
|
|
dma_start = jiffies;
|
|
|
|