david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Automatically updated using 

perl -pi -0777 -e 's/(_probe\s*\(\s*struct\s+dev.*?)(\s*\)\s*{.*?$)\s*struct pci_device.*?=\s*pci_device \( dev \);$/${1}, struct pci_device *pci${2}/ms' *.c

sis900 excluded from update
This commit is contained in:
Michael Brown 2005-04-14 14:44:33 +00:00
parent 72fe23a76e
commit 963dbefb51
23 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/net/3c595.c
View File

@ -468,9 +468,8 @@ static void t595_irq(struct nic *nic __unused, irq_action_t action __unused)
/**************************************************************************
ETH_PROBE - Look for an adapter
***************************************************************************/
static int t595_probe ( struct dev *dev ) {
static int t595_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
unsigned short *p;

3
src/drivers/net/3c90x.c
View File

@ -690,9 +690,8 @@ static void a3c90x_irq(struct nic *nic __unused, irq_action_t action __unused)
*** initialization. If this routine is called, the pci functions did find the
*** card. We just have to init it here.
***/
static int a3c90x_probe ( struct dev *dev ) {
static int a3c90x_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i, c;
unsigned short eeprom[0x21];
unsigned int cfg;

3
src/drivers/net/davicom.c
View File

@ -178,7 +178,7 @@ static void davicom_media_chk(struct nic *);
/*********************************************************************/
/* Utility Routines */
/*********************************************************************/
static inline void whereami(const char *str)
static inline void whereami(const char *str, struct pci_device *pci)
{
printf("%s\n", str);
/* sleep(2); */
@ -657,7 +657,6 @@ static void davicom_irq(struct nic *nic __unused, irq_action_t action __unused)
/*********************************************************************/
static int davicom_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
unsigned int i;
whereami("davicom_probe\n");

3
src/drivers/net/dmfe.c
View File

@ -459,9 +459,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
#define board_found 1
#define valid_link 0
static int dmfe_probe ( struct dev *dev ) {
static int dmfe_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
uint32_t dev_rev, pci_pmr;
int i;

3
src/drivers/net/e1000.c
View File

@ -3582,9 +3582,8 @@ static void e1000_irq(struct nic *nic __unused, irq_action_t action)
PROBE - Look for an adapter, this routine's visible to the outside
You should omit the last argument struct pci_device * for a non-PCI NIC
***************************************************************************/
static int e1000_probe ( struct dev *dev ) {
static int e1000_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *p = pci_device ( dev );
unsigned long mmio_start, mmio_len;
int ret_val, i;

3
src/drivers/net/eepro100.c
View File

@ -603,9 +603,8 @@ static void eepro100_disable ( struct nic *nic __unused ) {
* leaves the 82557 initialized, and ready to recieve packets.
*/
static int eepro100_probe ( struct dev *dev ) {
static int eepro100_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *p = pci_device ( dev );
unsigned short sum = 0;
int i;
int read_cmd, ee_size;

3
src/drivers/net/epic100.c
View File

@ -99,9 +99,8 @@ static unsigned char tx_packet[PKT_BUF_SZ * TX_RING_SIZE];
static int
epic100_probe ( struct dev *dev ) {
epic100_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
unsigned short* ap;
unsigned int phy, phy_idx;

3
src/drivers/net/forcedeth.c
View File

@ -941,9 +941,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
#define IORESOURCE_MEM 0x00000200
#define board_found 1
#define valid_link 0
static int forcedeth_probe ( struct dev *dev ) {
static int forcedeth_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
unsigned long addr;
int sz;
u8 *base;

3
src/drivers/net/mtd80x.c
View File

@ -674,9 +674,8 @@ static struct pci_driver mtd80x_driver =
PROBE - Look for an adapter, this routine's visible to the outside
***************************************************************************/
static int mtd_probe ( struct dev *dev ) {
static int mtd_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
if ( ! find_pci_device ( pci, &mtd80x_driver ) )

4
src/drivers/net/natsemi.c
View File

@ -243,11 +243,9 @@ static void natsemi_irq(struct nic *nic, irq_action_t action);
*/
static int
natsemi_probe ( struct dev *dev ) {
natsemi_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
int prev_eedata;
u32 tmp;

3
src/drivers/net/ns83820.c
View File

@ -825,9 +825,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
#define board_found 1
#define valid_link 0
static int ns83820_probe ( struct dev *dev ) {
static int ns83820_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int sz;
long addr;
int using_dac = 0;

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

@ -666,9 +666,8 @@ static void pcnet32_irq(struct nic *nic __unused, irq_action_t action __unused)
PROBE - Look for an adapter, this routine's visible to the outside
You should omit the last argument struct pci_device * for a non-PCI NIC
***************************************************************************/
static int pcnet32_probe ( struct dev *dev ) {
static int pcnet32_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i, media;
int fdx, mii, fset, dxsuflo, ltint;
int chip_version;

3
src/drivers/net/prism2_pci.c
View File

@ -26,9 +26,8 @@ PCI_ROM(0x1260, 0x3873, "dwl520", "DLink DWL-520"),
static struct pci_driver prism2_pci_driver =
PCI_DRIVER ( "Prism2_PCI", prism2_pci_nics, PCI_NO_CLASS );
static int prism2_pci_probe ( struct dev *dev ) {
static int prism2_pci_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
hfa384x_t *hw = &hw_global;
uint32_t membase = 0; /* Prism2.5 Memory Base */

3
src/drivers/net/prism2_plx.c
View File

@ -92,9 +92,8 @@ static int prism2_find_plx ( hfa384x_t *hw, struct pci_device *p )
return found;
}
static int prism2_plx_probe ( struct dev *dev ) {
static int prism2_plx_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
hfa384x_t *hw = &hw_global;
if ( ! find_pci_device ( pci, &prism2_plx_driver ) )

3
src/drivers/net/r8169.c
View File

@ -723,9 +723,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
#define board_found 1
#define valid_link 0
static int r8169_probe ( struct dev *dev ) {
static int r8169_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
static int board_idx = -1;
static int printed_version = 0;
int i, rc;

3
src/drivers/net/rtl8139.c
View File

@ -183,9 +183,8 @@ static void rtl_irq(struct nic *nic, irq_action_t action);
static struct nic_operations rtl_operations;
static struct pci_driver rtl8139_driver;
static int rtl8139_probe ( struct dev *dev ) {
static int rtl8139_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
int speed10, fullduplex;
int addr_len;

4
src/drivers/net/skel.c
View File

@ -133,12 +133,10 @@ PROBE - Look for an adapter, this routine's visible to the outside
#define board_found 1
#define valid_link 0
static int skel_probe ( struct dev *dev ) {
static int skel_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
if (board_found && valid_link)
{
/* store NIC parameters */

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

@ -583,9 +583,8 @@ static struct pci_driver sundance_driver;
/**************************************************************************
PROBE - Look for an adapter, this routine's visible to the outside
***************************************************************************/
static int sundance_probe ( struct dev *dev ) {
static int sundance_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
u8 ee_data[EEPROM_SIZE];
u16 mii_ctl;
int i;

3
src/drivers/net/tg3.c
View File

@ -3264,9 +3264,8 @@ static struct pci_driver tg3_driver =
PROBE - Look for an adapter, this routine's visible to the outside
You should omit the last argument struct pci_device * for a non-PCI NIC
***************************************************************************/
static int tg3_probe ( struct dev *dev ) {
static int tg3_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pdev = pci_device ( dev );
struct tg3 *tp = &tg3;
unsigned long tg3reg_base, tg3reg_len;
int i, err, pm_cap;

3
src/drivers/net/tlan.c
View File

@ -781,9 +781,8 @@ PROBE - Look for an adapter, this routine's visible to the outside
#define board_found 1
#define valid_link 0
static int tlan_probe ( struct dev *dev ) {
static int tlan_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
u16 data = 0;
int err;
int i;

3
src/drivers/net/tulip.c
View File

@ -516,7 +516,7 @@ static void tulip_more(void);
/*********************************************************************/
#ifdef TULIP_DEBUG_WHERE
static void whereami (const char *str)
static void whereami (const char *str, struct pci_device *pci)
{
printf("%s: %s\n", tp->nic_name, str);
/* sleep(2); */
@ -1227,7 +1227,6 @@ static struct pci_driver tulip_driver;
/*********************************************************************/
static int tulip_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
u32 i;
u8 chip_rev;
u8 ee_data[EEPROM_SIZE];

3
src/drivers/net/via-rhine.c
View File

@ -954,9 +954,8 @@ static struct nic_operations rhine_operations;
static struct pci_driver rhine_driver;
static int
rhine_probe ( struct dev *dev ) {
rhine_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
if ( ! find_pci_device ( pci, &rhine_driver ) )

3
src/drivers/net/w89c840.c
View File

@ -623,9 +623,8 @@ static struct pci_driver w89c840_driver =
/**************************************************************************
w89c840_probe - Look for an adapter, this routine's visible to the outside
***************************************************************************/
static int w89c840_probe ( struct dev *dev ) {
static int w89c840_probe ( struct dev *dev, struct pci_device *pci ) {
struct nic *nic = nic_device ( dev );
struct pci_device *p = pci_device ( dev );
if ( ! find_pci_device ( p, &w89c840_driver ) )
return 0;