diff options
| author | Michael Brown | 2018-04-19 13:38:55 +0200 |
|---|---|---|
| committer | Michael Brown | 2018-04-19 13:43:06 +0200 |
| commit | 6804a8c89b8c31c3ef4e7e8ab03b82ebee41dd45 (patch) | |
| tree | ceb234f68817ac16268c97b55771c0e0d16c9e7c /src/drivers/net/smscusb.c | |
| parent | [velocity] Fix usage of mii_read() and mii_write() (diff) | |
| download | ipxe-6804a8c89b8c31c3ef4e7e8ab03b82ebee41dd45.tar.gz ipxe-6804a8c89b8c31c3ef4e7e8ab03b82ebee41dd45.tar.xz ipxe-6804a8c89b8c31c3ef4e7e8ab03b82ebee41dd45.zip | |
[mii] Separate concepts of MII interface and MII device
We currently have no generic concept of a PHY address, since all
existing implementations simply hardcode the PHY address within the
MII access methods.
A bit-bashing MII interface will need to be provided with an explicit
PHY address in order to generate the correct waveform. Allow for this
by separating out the concept of a MII device (i.e. a specific PHY
address attached to a particular MII interface).
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net/smscusb.c')
| -rw-r--r-- | src/drivers/net/smscusb.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/drivers/net/smscusb.c b/src/drivers/net/smscusb.c index 60390ce3..538d338c 100644 --- a/src/drivers/net/smscusb.c +++ b/src/drivers/net/smscusb.c @@ -481,13 +481,15 @@ static int smscusb_mii_wait ( struct smscusb_device *smscusb ) { /** * Read from MII register * - * @v mii MII interface + * @v mdio MII interface + * @v phy PHY address * @v reg Register address * @ret value Data read, or negative error */ -static int smscusb_mii_read ( struct mii_interface *mii, unsigned int reg ) { +static int smscusb_mii_read ( struct mii_interface *mdio, + unsigned int phy __unused, unsigned int reg ) { struct smscusb_device *smscusb = - container_of ( mii, struct smscusb_device, mii ); + container_of ( mdio, struct smscusb_device, mdio ); unsigned int base = smscusb->mii_base; uint32_t mii_access; uint32_t mii_data; @@ -520,15 +522,17 @@ static int smscusb_mii_read ( struct mii_interface *mii, unsigned int reg ) { /** * Write to MII register * - * @v mii MII interface + * @v mdio MII interface + * @v phy PHY address * @v reg Register address * @v data Data to write * @ret rc Return status code */ -static int smscusb_mii_write ( struct mii_interface *mii, unsigned int reg, +static int smscusb_mii_write ( struct mii_interface *mdio, + unsigned int phy __unused, unsigned int reg, unsigned int data ) { struct smscusb_device *smscusb = - container_of ( mii, struct smscusb_device, mii ); + container_of ( mdio, struct smscusb_device, mdio ); unsigned int base = smscusb->mii_base; uint32_t mii_access; uint32_t mii_data; |