d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style(9) xe(4). The MD5 sums are different, but comparing the dissassemblies

Browse Source 
the only changes are from gcc moving some global variables around slightly.
This commit is contained in:
John Baldwin 2008-06-04 20:26:57 +00:00
parent 14bf405be4
commit 214b852cd9
3 changed files with 1522 additions and 1467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

746
sys/dev/xe/if_xe.c
View File

File diff suppressed because it is too large Load Diff

11
sys/dev/xe/if_xe_pccard.c
View File

@ -94,7 +94,6 @@ extern int xe_debug;
#define XE_REM56_MAC_ADDR_1 0x10 #define XE_REM56_MAC_ADDR_1 0x10
#define XE_REM56_MAC_ADDR_2 0xa4 #define XE_REM56_MAC_ADDR_2 0xa4
struct xe_pccard_product { struct xe_pccard_product {
struct pccard_product product; struct pccard_product product;
uint16_t prodext; uint16_t prodext;
@ -126,7 +125,6 @@ static const struct xe_pccard_product xe_pccard_products[] = {
{ { NULL }, 0, 0 } { { NULL }, 0, 0 }
}; };
/* /*
* Fixing for CEM2, CEM3 and CEM56/REM56 cards. These need some magic to * Fixing for CEM2, CEM3 and CEM56/REM56 cards. These need some magic to
* enable the Ethernet function, which isn't mentioned anywhere in the CIS. * enable the Ethernet function, which isn't mentioned anywhere in the CIS.
@ -135,7 +133,7 @@ static const struct xe_pccard_product xe_pccard_products[] = {
static int static int
xe_cemfix(device_t dev) xe_cemfix(device_t dev)
{ {
struct xe_softc *sc = (struct xe_softc *) device_get_softc(dev); struct xe_softc *sc = device_get_softc(dev);
int ioport; int ioport;
DEVPRINTF(2, (dev, "cemfix\n")); DEVPRINTF(2, (dev, "cemfix\n"));
@ -164,7 +162,8 @@ xe_cemfix(device_t dev)
} }
static int static int
xe_pccard_product_match(device_t dev, const struct pccard_product* ent, int vpfmatch) xe_pccard_product_match(device_t dev, const struct pccard_product* ent,
int vpfmatch)
{ {
const struct xe_pccard_product* xpp; const struct xe_pccard_product* xpp;
uint16_t prodext; uint16_t prodext;
@ -184,7 +183,7 @@ xe_pccard_product_match(device_t dev, const struct pccard_product* ent, int vpfm
static const struct xe_pccard_product * static const struct xe_pccard_product *
xe_pccard_get_product(device_t dev) xe_pccard_get_product(device_t dev)
{ {
return ((const struct xe_pccard_product *) pccard_product_lookup(dev, return ((const struct xe_pccard_product *)pccard_product_lookup(dev,
(const struct pccard_product *)xe_pccard_products, (const struct pccard_product *)xe_pccard_products,
sizeof(xe_pccard_products[0]), xe_pccard_product_match)); sizeof(xe_pccard_products[0]), xe_pccard_product_match));
} }
@ -237,7 +236,7 @@ xe_bad_mac(uint8_t *enaddr)
static int static int
xe_pccard_attach(device_t dev) xe_pccard_attach(device_t dev)
{ {
struct xe_softc *scp = (struct xe_softc *) device_get_softc(dev); struct xe_softc *scp = device_get_softc(dev);
uint32_t vendor,product; uint32_t vendor,product;
uint16_t prodext; uint16_t prodext;
const char* vendor_str = NULL; const char* vendor_str = NULL;

12
sys/dev/xe/if_xevar.h
View File

@ -41,8 +41,8 @@ struct xe_softc {
struct mtx lock; struct mtx lock;
struct ifnet *ifp; struct ifnet *ifp;
struct ifmedia *ifm; struct ifmedia *ifm;
u_char enaddr[6]; u_char enaddr[ETHER_ADDR_LEN];
const char *card_type;/* Card model name */ const char *card_type; /* Card model name */
const char *vendor; /* Card manufacturer */ const char *vendor; /* Card manufacturer */
device_t dev; /* Device */ device_t dev; /* Device */
void *intrhand; void *intrhand;
@ -53,11 +53,11 @@ struct xe_softc {
struct resource *ce2_port_res; struct resource *ce2_port_res;
int ce2_port_rid; int ce2_port_rid;
int srev; /* Silicon revision */ int srev; /* Silicon revision */
int tx_queued; /* Packets currently waiting to transmit */ int tx_queued; /* Transmit packets currently waiting */
int tx_tpr; /* Last value of TPR reg on card */ int tx_tpr; /* Last value of TPR reg on card */
int tx_timeouts; /* Count of transmit timeouts */ int tx_timeouts; /* Count of transmit timeouts */
u_int16_t tx_min; /* Smallest packet we can send without padding */ uint16_t tx_min; /* Smallest packet for no padding */
u_int16_t tx_thres; /* Threshold bytes for early transmit */ uint16_t tx_thres; /* Threshold bytes for early transmit */
int autoneg_status; /* Autonegotiation progress state */ int autoneg_status; /* Autonegotiation progress state */
int media; /* Private media word */ int media; /* Private media word */
u_char version; /* Bonding Version register from card */ u_char version; /* Bonding Version register from card */
@ -65,7 +65,7 @@ struct xe_softc {
u_char ce2; /* 1 = Card has CE2 silicon */ u_char ce2; /* 1 = Card has CE2 silicon */
u_char mohawk; /* 1 = Card has Mohawk (CE3) silicon */ u_char mohawk; /* 1 = Card has Mohawk (CE3) silicon */
u_char dingo; /* 1 = Card has Dingo (CEM56) silicon */ u_char dingo; /* 1 = Card has Dingo (CEM56) silicon */
u_char phy_ok; /* 1 = MII-compliant PHY found and initialised */ u_char phy_ok; /* 1 = MII-compliant PHY found */
u_char gone; /* 1 = Card bailed out */ u_char gone; /* 1 = Card bailed out */
}; };