diff options
| -rw-r--r-- | sys/dev/nge/if_nge.c | 2 | ||||
| -rw-r--r-- | sys/dev/vr/if_vr.c | 2 | ||||
| -rw-r--r-- | sys/dev/xe/if_xe.c | 2 | ||||
| -rw-r--r-- | sys/pci/if_rl.c | 2 | ||||
| -rw-r--r-- | sys/pci/if_ste.c | 2 | ||||
| -rw-r--r-- | sys/pci/if_vr.c | 2 | ||||
| -rw-r--r-- | sys/pci/if_wb.c | 2 | ||||
| -rw-r--r-- | sys/pci/if_xl.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index 67fa7bd..d498ebb 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -483,9 +483,9 @@ nge_mii_readreg(sc, frame) /* Check for ack */ SIO_CLR(NGE_MEAR_MII_CLK); DELAY(1); + ack = CSR_READ_4(sc, NGE_MEAR) & NGE_MEAR_MII_DATA; SIO_SET(NGE_MEAR_MII_CLK); DELAY(1); - ack = CSR_READ_4(sc, NGE_MEAR) & NGE_MEAR_MII_DATA; /* * Now try reading data bits. If the ack failed, we still diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index 81e00b5..407abf1 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -329,9 +329,9 @@ vr_mii_readreg(sc, frame) /* Check for ack */ SIO_CLR(VR_MIICMD_CLK); DELAY(1); + ack = CSR_READ_4(sc, VR_MIICMD) & VR_MIICMD_DATAOUT; SIO_SET(VR_MIICMD_CLK); DELAY(1); - ack = CSR_READ_4(sc, VR_MIICMD) & VR_MIICMD_DATAOUT; /* * Now try reading data bits. If the ack failed, we still diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c index bbbf095..6ba4de4 100644 --- a/sys/dev/xe/if_xe.c +++ b/sys/dev/xe/if_xe.c @@ -1659,9 +1659,9 @@ xe_mii_readreg(struct xe_softc *scp, struct xe_mii_frame *frame) { /* Check for ack */ XE_MII_CLR(XE_MII_CLK); DELAY(1); + ack = XE_INB(XE_GPR2) & XE_MII_RDD; XE_MII_SET(XE_MII_CLK); DELAY(1); - ack = XE_INB(XE_GPR2) & XE_MII_RDD; /* * Now try reading data bits. If the ack failed, we still diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index 719b4ec..18d85e1 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -491,9 +491,9 @@ rl_mii_readreg(sc, frame) /* Check for ack */ MII_CLR(RL_MII_CLK); DELAY(1); + ack = CSR_READ_2(sc, RL_MII) & RL_MII_DATAIN; MII_SET(RL_MII_CLK); DELAY(1); - ack = CSR_READ_2(sc, RL_MII) & RL_MII_DATAIN; /* * Now try reading data bits. If the ack failed, we still diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index 674bf7b..370b0f5 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -282,9 +282,9 @@ ste_mii_readreg(sc, frame) /* Check for ack */ MII_CLR(STE_PHYCTL_MCLK); DELAY(1); + ack = CSR_READ_2(sc, STE_PHYCTL) & STE_PHYCTL_MDATA; MII_SET(STE_PHYCTL_MCLK); DELAY(1); - ack = CSR_READ_2(sc, STE_PHYCTL) & STE_PHYCTL_MDATA; /* * Now try reading data bits. If the ack failed, we still diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c index 81e00b5..407abf1 100644 --- a/sys/pci/if_vr.c +++ b/sys/pci/if_vr.c @@ -329,9 +329,9 @@ vr_mii_readreg(sc, frame) /* Check for ack */ SIO_CLR(VR_MIICMD_CLK); DELAY(1); + ack = CSR_READ_4(sc, VR_MIICMD) & VR_MIICMD_DATAOUT; SIO_SET(VR_MIICMD_CLK); DELAY(1); - ack = CSR_READ_4(sc, VR_MIICMD) & VR_MIICMD_DATAOUT; /* * Now try reading data bits. If the ack failed, we still diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c index 4bd79e2..30618af 100644 --- a/sys/pci/if_wb.c +++ b/sys/pci/if_wb.c @@ -436,9 +436,9 @@ wb_mii_readreg(sc, frame) /* Check for ack */ SIO_CLR(WB_SIO_MII_CLK); DELAY(1); + ack = CSR_READ_4(sc, WB_SIO) & WB_SIO_MII_DATAOUT; SIO_SET(WB_SIO_MII_CLK); DELAY(1); - ack = CSR_READ_4(sc, WB_SIO) & WB_SIO_MII_DATAOUT; SIO_CLR(WB_SIO_MII_CLK); DELAY(1); SIO_SET(WB_SIO_MII_CLK); diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index cc0e275..4ac4134 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -494,8 +494,8 @@ xl_mii_readreg(sc, frame) /* Check for ack */ MII_CLR(XL_MII_CLK); - MII_SET(XL_MII_CLK); ack = CSR_READ_2(sc, XL_W4_PHY_MGMT) & XL_MII_DATA; + MII_SET(XL_MII_CLK); /* * Now try reading data bits. If the ack failed, we still |
