narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ethernet] Move struct mii_if_info to mii.h 

Signed-off-by: Michael Brown <mcb30@etherboot.org>
pull/1/head
Daniel Verkamp 2008-12-10 01:11:50 -06:00 committed by Michael Brown
parent 3c06277bbb
commit 005fce0258
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/net/pcnet32.c
View File

@ -222,12 +222,6 @@ struct {
unsigned char rxb[RX_RING_SIZE][PKT_BUF_SZ]; unsigned char rxb[RX_RING_SIZE][PKT_BUF_SZ];
} pcnet32_bufs __shared; } pcnet32_bufs __shared;
/* May need to be moved to mii.h */
struct mii_if_info {
int phy_id;
int advertising;
unsigned int full_duplex:1; /* is full duplex? */
};
/* /*
* The first three fields of pcnet32_private are read by the ethernet device * The first three fields of pcnet32_private are read by the ethernet device

7
src/drivers/net/sundance.c
View File

@ -59,13 +59,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
#define virt_to_le32desc(addr) cpu_to_le32(virt_to_bus(addr)) #define virt_to_le32desc(addr) cpu_to_le32(virt_to_bus(addr))
#define le32desc_to_virt(addr) bus_to_virt(le32_to_cpu(addr)) #define le32desc_to_virt(addr) bus_to_virt(le32_to_cpu(addr))
/* May need to be moved to mii.h */
struct mii_if_info {
int phy_id;
int advertising;
unsigned int full_duplex:1; /* is full duplex? */
};
/* Set the mtu */ /* Set the mtu */
static int mtu = 1514; static int mtu = 1514;

21
src/include/mii.h
View File

@ -12,6 +12,9 @@
FILE_LICENCE ( GPL2_ONLY ); FILE_LICENCE ( GPL2_ONLY );
#ifndef _MII_H_
#define _MII_H_
/* Generic MII registers. */ /* Generic MII registers. */
#define MII_BMCR 0x00 /* Basic mode control register */ #define MII_BMCR 0x00 /* Basic mode control register */
@ -105,3 +108,21 @@ FILE_LICENCE ( GPL2_ONLY );
#define NWAYTEST_LOOPBACK 0x0100 /* Enable loopback for N-way */ #define NWAYTEST_LOOPBACK 0x0100 /* Enable loopback for N-way */
#define NWAYTEST_RESV2 0xfe00 /* Unused... */ #define NWAYTEST_RESV2 0xfe00 /* Unused... */
#include <gpxe/netdevice.h>
struct mii_if_info {
int phy_id;
int advertising;
int phy_id_mask;
int reg_num_mask;
unsigned int full_duplex : 1; /* is full duplex? */
unsigned int force_media : 1; /* is autoneg. disabled? */
unsigned int supports_gmii : 1; /* are GMII registers supported? */
struct net_device *dev;
int (*mdio_read) (struct net_device *dev, int phy_id, int location);
void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
};
#endif