mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
26 lines
888 B
C
26 lines
888 B
C
$NetBSD: patch-hw_net_etraxfs__eth.c,v 1.3 2014/01/15 18:26:20 wiz Exp $
|
|
|
|
Avoid conflicts with SSP read() macro in NetBSD's <ssp/unistd.h>
|
|
(PR lib/43832: ssp causes common names to be defines)
|
|
|
|
--- hw/net/etraxfs_eth.c.orig 2013-11-27 22:15:55.000000000 +0000
|
|
+++ hw/net/etraxfs_eth.c
|
|
@@ -185,7 +185,7 @@ static void mdio_read_req(struct qemu_md
|
|
|
|
phy = bus->devs[bus->addr];
|
|
if (phy && phy->read) {
|
|
- bus->data = phy->read(phy, bus->req);
|
|
+ bus->data = (*phy->read)(phy, bus->req);
|
|
} else {
|
|
bus->data = 0xffff;
|
|
}
|
|
@@ -364,7 +364,7 @@ static void eth_validate_duplex(ETRAXFSE
|
|
int new_mm = 0;
|
|
|
|
phy = eth->mdio_bus.devs[eth->phyaddr];
|
|
- phy_duplex = !!(phy->read(phy, 18) & (1 << 11));
|
|
+ phy_duplex = !!((*phy->read)(phy, 18) & (1 << 11));
|
|
mac_duplex = !!(eth->regs[RW_REC_CTRL] & 128);
|
|
|
|
if (mac_duplex != phy_duplex) {
|