Use DEVMETHOD_END.
This commit is contained in:
parent
b1b604daf1
commit
0f30a4cf89
@ -95,7 +95,7 @@ static device_method_t dcphy_methods[] = {
|
||||
DEVMETHOD(device_attach, dcphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t dcphy_devclass;
|
||||
|
@ -74,7 +74,7 @@ static device_method_t pnphy_methods[] = {
|
||||
DEVMETHOD(device_attach, pnphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t pnphy_devclass;
|
||||
|
@ -87,7 +87,7 @@ static device_method_t acphy_methods[] = {
|
||||
DEVMETHOD(device_attach, acphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t acphy_devclass;
|
||||
|
@ -66,7 +66,7 @@ static device_method_t amphy_methods[] = {
|
||||
DEVMETHOD(device_attach, amphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t amphy_devclass;
|
||||
|
@ -59,7 +59,7 @@ static device_method_t atphy_methods[] = {
|
||||
DEVMETHOD(device_attach, atphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ NULL, NULL }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t atphy_devclass;
|
||||
|
@ -56,7 +56,7 @@ static device_method_t axphy_methods[] = {
|
||||
DEVMETHOD(device_attach, axphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t axphy_devclass;
|
||||
|
@ -91,8 +91,7 @@ static device_method_t bmtphy_methods[] = {
|
||||
DEVMETHOD(device_attach, bmtphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t bmtphy_devclass;
|
||||
|
@ -82,7 +82,7 @@ static device_method_t brgphy_methods[] = {
|
||||
DEVMETHOD(device_attach, brgphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t brgphy_devclass;
|
||||
|
@ -67,7 +67,7 @@ static device_method_t ciphy_methods[] = {
|
||||
DEVMETHOD(device_attach, ciphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t ciphy_devclass;
|
||||
|
@ -71,7 +71,7 @@ static device_method_t e1000phy_methods[] = {
|
||||
DEVMETHOD(device_attach, e1000phy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t e1000phy_devclass;
|
||||
|
@ -95,7 +95,7 @@ static device_method_t gentbi_methods[] = {
|
||||
DEVMETHOD(device_attach, gentbi_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{0, 0}
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t gentbi_devclass;
|
||||
|
@ -89,7 +89,7 @@ static device_method_t icsphy_methods[] = {
|
||||
DEVMETHOD(device_attach, icsphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t icsphy_devclass;
|
||||
|
@ -63,7 +63,7 @@ static device_method_t ip1000phy_methods[] = {
|
||||
DEVMETHOD(device_attach, ip1000phy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t ip1000phy_devclass;
|
||||
|
@ -62,7 +62,7 @@ static device_method_t jmphy_methods[] = {
|
||||
DEVMETHOD(device_attach, jmphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ NULL, NULL }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t jmphy_devclass;
|
||||
|
@ -91,7 +91,7 @@ static device_method_t lxtphy_methods[] = {
|
||||
DEVMETHOD(device_attach, lxtphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t lxtphy_devclass;
|
||||
|
@ -84,7 +84,7 @@ static device_method_t mlphy_methods[] = {
|
||||
DEVMETHOD(device_attach, mlphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t mlphy_devclass;
|
||||
|
@ -83,7 +83,7 @@ static device_method_t nsgphy_methods[] = {
|
||||
DEVMETHOD(device_attach, nsgphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t nsgphy_devclass;
|
||||
|
@ -90,7 +90,7 @@ static device_method_t nsphy_methods[] = {
|
||||
DEVMETHOD(device_attach, nsphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t nsphy_devclass;
|
||||
|
@ -93,7 +93,7 @@ static device_method_t nsphyter_methods[] = {
|
||||
DEVMETHOD(device_attach, nsphyter_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t nsphyter_devclass;
|
||||
|
@ -69,7 +69,7 @@ static device_method_t pnaphy_methods[] = {
|
||||
DEVMETHOD(device_attach, pnaphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t pnaphy_devclass;
|
||||
|
@ -91,7 +91,7 @@ static device_method_t qsphy_methods[] = {
|
||||
DEVMETHOD(device_attach, qsphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t qsphy_devclass;
|
||||
|
@ -68,7 +68,7 @@ static device_method_t rgephy_methods[] = {
|
||||
DEVMETHOD(device_attach, rgephy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t rgephy_devclass;
|
||||
|
@ -66,7 +66,7 @@ static device_method_t rlphy_methods[] = {
|
||||
DEVMETHOD(device_attach, rlphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t rlphy_devclass;
|
||||
|
@ -70,7 +70,7 @@ static device_method_t rlswitch_methods[] = {
|
||||
DEVMETHOD(device_attach, rlswitch_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t rlswitch_devclass;
|
||||
|
@ -62,8 +62,7 @@ static device_method_t smcphy_methods[] = {
|
||||
DEVMETHOD(device_attach, smcphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t smcphy_devclass;
|
||||
@ -207,8 +206,7 @@ smcphy_auto(struct mii_softc *sc, int media)
|
||||
{
|
||||
uint16_t anar;
|
||||
|
||||
anar = BMSR_MEDIA_TO_ANAR(sc->mii_capabilities) |
|
||||
ANAR_CSMA;
|
||||
anar = BMSR_MEDIA_TO_ANAR(sc->mii_capabilities) | ANAR_CSMA;
|
||||
if ((media & IFM_FLOW) != 0 || (sc->mii_flags & MIIF_FORCEPAUSE) != 0)
|
||||
anar |= ANAR_FC;
|
||||
PHY_WRITE(sc, MII_ANAR, anar);
|
||||
|
@ -71,7 +71,7 @@ static device_method_t tdkphy_methods[] = {
|
||||
DEVMETHOD(device_attach, tdkphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t tdkphy_devclass;
|
||||
|
@ -97,7 +97,7 @@ static device_method_t tlphy_methods[] = {
|
||||
DEVMETHOD(device_attach, tlphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t tlphy_devclass;
|
||||
|
@ -72,7 +72,7 @@ static device_method_t truephy_methods[] = {
|
||||
DEVMETHOD(device_attach, truephy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static const struct mii_phydesc truephys[] = {
|
||||
|
@ -86,7 +86,7 @@ static device_method_t ukphy_methods[] = {
|
||||
DEVMETHOD(device_attach, ukphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t ukphy_devclass;
|
||||
|
@ -66,7 +66,7 @@ static device_method_t xmphy_methods[] = {
|
||||
DEVMETHOD(device_attach, xmphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t xmphy_devclass;
|
||||
|
@ -61,7 +61,7 @@ static device_method_t ruephy_methods[] = {
|
||||
DEVMETHOD(device_attach, ruephy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t ruephy_devclass;
|
||||
|
@ -86,7 +86,7 @@ static device_method_t xlphy_methods[] = {
|
||||
DEVMETHOD(device_attach, xlphy_attach),
|
||||
DEVMETHOD(device_detach, mii_phy_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
{ 0, 0 }
|
||||
DEVMETHOD_END
|
||||
};
|
||||
|
||||
static devclass_t xlphy_devclass;
|
||||
|
Loading…
Reference in New Issue
Block a user