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

[mii] Synchronise constants with current Linux include/linux/mii.h 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/6/head
Michael Brown 2012-04-18 15:42:55 +01:00
parent 2f3f0ca953
commit d27e6d6efd
2 changed files with 111 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/net/etherfabric.c
View File

@ -93,7 +93,6 @@ static int falcon_mdio_read ( struct efab_nic *efab, int device, int location );
#define LPA_EF_10000FULL 0x00040000 #define LPA_EF_10000FULL 0x00040000
#define LPA_EF_10000HALF 0x00080000 #define LPA_EF_10000HALF 0x00080000
#define LPA_100 (LPA_100FULL | LPA_100HALF | LPA_100BASE4)
#define LPA_EF_1000 ( LPA_EF_1000FULL | LPA_EF_1000HALF ) #define LPA_EF_1000 ( LPA_EF_1000FULL | LPA_EF_1000HALF )
#define LPA_EF_10000 ( LPA_EF_10000FULL | LPA_EF_10000HALF ) #define LPA_EF_10000 ( LPA_EF_10000FULL | LPA_EF_10000HALF )
#define LPA_EF_DUPLEX ( LPA_10FULL | LPA_100FULL | LPA_EF_1000FULL | \ #define LPA_EF_DUPLEX ( LPA_10FULL | LPA_100FULL | LPA_EF_1000FULL | \

37
src/include/mii.h
View File

@ -1,22 +1,19 @@
/* #ifndef _MII_H_
* linux/mii.h: definitions for MII-compatible transceivers #define _MII_H_
* Originally drivers/net/sunhme.h.
/** @file
*
* Media Independent Interface constants
*
* Extracted from Linux's include/linux/mii.h
* *
* Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com) * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
* *
* Copied Form Linux 2.4.25 an unneeded items removed by:
* Timothy Legge (timlegge at etherboot dot org)
*
* 03/26/2004
*/ */
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 */
#define MII_BMSR 0x01 /* Basic mode status register */ #define MII_BMSR 0x01 /* Basic mode status register */
#define MII_PHYSID1 0x02 /* PHYS ID 1 */ #define MII_PHYSID1 0x02 /* PHYS ID 1 */
@ -88,10 +85,10 @@ FILE_LICENCE ( GPL2_ONLY );
#define ADVERTISE_LPACK 0x4000 /* Ack link partners response */ #define ADVERTISE_LPACK 0x4000 /* Ack link partners response */
#define ADVERTISE_NPAGE 0x8000 /* Next page bit */ #define ADVERTISE_NPAGE 0x8000 /* Next page bit */
#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \ #define ADVERTISE_FULL ( ADVERTISE_100FULL | ADVERTISE_10FULL | \
ADVERTISE_CSMA) ADVERTISE_CSMA)
#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \ #define ADVERTISE_ALL ( ADVERTISE_10HALF | ADVERTISE_10FULL | \
ADVERTISE_100HALF | ADVERTISE_100FULL) ADVERTISE_100HALF | ADVERTISE_100FULL )
/* Link partner ability register. */ /* Link partner ability register. */
#define LPA_SLCT 0x001f /* Same as advertise selector */ #define LPA_SLCT 0x001f /* Same as advertise selector */
@ -111,8 +108,8 @@ FILE_LICENCE ( GPL2_ONLY );
#define LPA_LPACK 0x4000 /* Link partner acked us */ #define LPA_LPACK 0x4000 /* Link partner acked us */
#define LPA_NPAGE 0x8000 /* Next page bit */ #define LPA_NPAGE 0x8000 /* Next page bit */
#define LPA_DUPLEX (LPA_10FULL | LPA_100FULL) #define LPA_DUPLEX ( LPA_10FULL | LPA_100FULL )
#define LPA_100 (LPA_100FULL | LPA_100HALF | LPA_100BASE4) #define LPA_100 ( LPA_100FULL | LPA_100HALF | LPA_100BASE4 )
/* Expansion register for auto-negotiation. */ /* Expansion register for auto-negotiation. */
#define EXPANSION_NWAY 0x0001 /* Can do N-way auto-nego */ #define EXPANSION_NWAY 0x0001 /* Can do N-way auto-nego */
@ -135,10 +132,10 @@ FILE_LICENCE ( GPL2_ONLY );
#define ADVERTISE_1000HALF 0x0100 /* Advertise 1000BASE-T half duplex */ #define ADVERTISE_1000HALF 0x0100 /* Advertise 1000BASE-T half duplex */
/* 1000BASE-T Status register */ /* 1000BASE-T Status register */
#define LPA_1000LOCALRXOK 0x2000 /* Link partner local receiver status */ #define LPA_1000LOCALRXOK 0x2000 /* Partner local receiver status */
#define LPA_1000REMRXOK 0x1000 /* Link partner remote receiver status */ #define LPA_1000REMRXOK 0x1000 /* Partner remote receiver status */
#define LPA_1000FULL 0x0800 /* Link partner 1000BASE-T full duplex */ #define LPA_1000FULL 0x0800 /* Partner 1000BASE-T full duplex */
#define LPA_1000HALF 0x0400 /* Link partner 1000BASE-T half duplex */ #define LPA_1000HALF 0x0400 /* Partner 1000BASE-T half duplex */
#include <ipxe/netdevice.h> #include <ipxe/netdevice.h>