aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/mii
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/mii')
-rw-r--r--sys/dev/mii/miidevs8
-rw-r--r--sys/dev/mii/mv88e151x.c8
-rw-r--r--sys/dev/mii/rgephy.c6
-rw-r--r--sys/dev/mii/rgephyreg.h2
-rw-r--r--sys/dev/mii/rlphy.c18
-rw-r--r--sys/dev/mii/rlswitch.c2
6 files changed, 23 insertions, 21 deletions
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 5c10fd0f0224..ca7e78a1cdd5 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -69,7 +69,7 @@ oui NATSEMI 0x080017 National Semiconductor
oui PMCSIERRA 0x00e004 PMC-Sierra
oui QUALSEMI 0x006051 Quality Semiconductor
oui RDC 0x00d02d RDC Semiconductor
-oui REALTEK 0x00e04c RealTek Semicondctor
+oui REALTEK 0x00e04c Realtek Semicondctor
oui SEEQ 0x00a07d Seeq Technology
oui SIS 0x00e006 Silicon Integrated Systems
oui SMC 0x00800f SMC
@@ -109,8 +109,8 @@ oui yyDAVICOM 0x000602 Davicom Semiconductor
oui xxICPLUS 0x0009c3 IC Plus Corp.
oui xxPMCSIERRA 0x0009c0 PMC-Sierra
oui xxPMCSIERRA2 0x009057 PMC-Sierra
-oui xxREALTEK 0x000732 RealTek Semicondctor
-oui yyREALTEK 0x000004 RealTek Semicondctor
+oui xxREALTEK 0x000732 Realtek Semicondctor
+oui yyREALTEK 0x000004 Realtek Semicondctor
oui xxTI 0x100014 Texas Instruments
/*
@@ -325,7 +325,7 @@ model xxQUALSEMI QS6612 0x0000 QS6612 10/100 media interface
model RDC R6040 0x0003 R6040 10/100 media interface
model RDC R6040_2 0x0005 R6040 10/100 media interface
-/* RealTek Semicondctor PHYs */
+/* Realtek Semicondctor PHYs */
model yyREALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface
model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface
model REALTEK RTL8305SC 0x0005 RTL8305SC 10/100 802.1q switch
diff --git a/sys/dev/mii/mv88e151x.c b/sys/dev/mii/mv88e151x.c
index 618ad81471c9..fb03b2a7a917 100644
--- a/sys/dev/mii/mv88e151x.c
+++ b/sys/dev/mii/mv88e151x.c
@@ -97,7 +97,7 @@ mv88e151x_attach(device_t dev)
{
const struct mii_attach_args *ma;
struct mii_softc *sc;
- uint32_t cop_cap, cop_extcap;
+ uint32_t cop_cap = 0, cop_extcap = 0;
sc = device_get_softc(dev);
ma = device_get_ivars(dev);
@@ -224,10 +224,12 @@ mv88e151x_fiber_status(struct mii_softc *phy)
else if (reg & MV88E151X_STATUS_LINK &&
reg & MV88E151X_STATUS_SYNC &&
(reg & MV88E151X_STATUS_ENERGY) == 0) {
- if ((reg & MV88E151X_STATUS_SPEED_MASK) ==
+ if (((reg & MV88E151X_STATUS_SPEED_MASK) >>
+ MV88E151X_STATUS_SPEED_SHIFT) ==
MV88E151X_STATUS_SPEED_1000)
mii->mii_media_active |= IFM_1000_SX;
- else if ((reg & MV88E151X_STATUS_SPEED_MASK) ==
+ else if (((reg & MV88E151X_STATUS_SPEED_MASK) >>
+ MV88E151X_STATUS_SPEED_SHIFT) ==
MV88E151X_STATUS_SPEED_100)
mii->mii_media_active |= IFM_100_FX;
else
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 4ff86c8c8ccb..32559517680a 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
/*
- * Driver for the RealTek 8169S/8110S/8211B/8211C internal 10/100/1000 PHY.
+ * Driver for the Realtek 8169S/8110S/8211B/8211C internal 10/100/1000 PHY.
*/
#include <sys/param.h>
@@ -263,7 +263,7 @@ setit:
/*
* Callback if something changed. Note that we need to poke
- * the DSP on the RealTek PHYs if the media changes.
+ * the DSP on the Realtek PHYs if the media changes.
*
*/
if (sc->mii_media_active != mii->mii_media_active ||
@@ -459,7 +459,7 @@ rgephy_loop(struct mii_softc *sc)
PHY_WRITE(x, y, (PHY_READ(x, y) & ~(z)))
/*
- * Initialize RealTek PHY per the datasheet. The DSP in the PHYs of
+ * Initialize Realtek PHY per the datasheet. The DSP in the PHYs of
* existing revisions of the 8169S/8110S chips need to be tuned in
* order to reliably negotiate a 1000Mbps link. This is only needed
* for rev 0 and rev 1 of the PHY. Later versions work without
diff --git a/sys/dev/mii/rgephyreg.h b/sys/dev/mii/rgephyreg.h
index fef985ebe30e..89a862734f33 100644
--- a/sys/dev/mii/rgephyreg.h
+++ b/sys/dev/mii/rgephyreg.h
@@ -41,7 +41,7 @@
#define RGEPHY_8211FVD 8
/*
- * RealTek 8169S/8110S gigE PHY registers
+ * Realtek 8169S/8110S gigE PHY registers
*/
#define RGEPHY_MII_BMCR 0x00
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 71b9dc63f839..094fff438a56 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
/*
- * driver for RealTek 8139 internal PHYs
+ * driver for Realtek 8139 internal PHYs
*/
#include <sys/param.h>
@@ -82,11 +82,11 @@ static int rlphy_service(struct mii_softc *, struct mii_data *, int);
static void rlphy_status(struct mii_softc *);
/*
- * RealTek internal PHYs don't have vendor/device ID registers;
+ * Realtek internal PHYs don't have vendor/device ID registers;
* re(4) and rl(4) fake up a return value of all zeros.
*/
static const struct mii_phydesc rlintphys[] = {
- { 0, 0, "RealTek internal media interface" },
+ { 0, 0, "Realtek internal media interface" },
MII_PHY_END
};
@@ -122,7 +122,7 @@ rlphy_attach(device_t dev)
{
/*
- * The RealTek PHY can never be isolated.
+ * The Realtek PHY can never be isolated.
*/
mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE,
&rlphy_funcs, 1);
@@ -143,7 +143,7 @@ rlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
case MII_TICK:
/*
- * The RealTek PHY's autonegotiation doesn't need to be
+ * The Realtek PHY's autonegotiation doesn't need to be
* kicked; it continues in the background.
*/
break;
@@ -222,20 +222,20 @@ rlphy_status(struct mii_softc *phy)
*/
/*
- * The RealTek PHY supports non-NWAY link speed
+ * The Realtek PHY supports non-NWAY link speed
* detection, however it does not report the link
* detection results via the ANLPAR or BMSR registers.
- * (What? RealTek doesn't do things the way everyone
+ * (What? Realtek doesn't do things the way everyone
* else does? I'm just shocked, shocked I tell you.)
* To determine the link speed, we have to do one
* of two things:
*
- * - If this is a standalone RealTek RTL8201(L) or
+ * - If this is a standalone Realtek RTL8201(L) or
* workalike PHY, we can determine the link speed by
* testing bit 0 in the magic, vendor-specific register
* at offset 0x19.
*
- * - If this is a RealTek MAC with integrated PHY, we
+ * - If this is a Realtek MAC with integrated PHY, we
* can test the 'SPEED10' bit of the MAC's media status
* register.
*/
diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index 653751df0f4c..fad2aaa64d4c 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
/*
- * driver for RealTek 8305 pseudo PHYs
+ * driver for Realtek 8305 pseudo PHYs
*/
#include <sys/param.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-30 20:35:07 +0000