david/ipxe
david
/
ipxe
Archived
1
0
Fork 0

Automatically updated using

perl -pi -0777 -e 's/_probe\s*\(\s*struct dev \*dev,\s*struct pci_device \*(\w+?)\s*\)\s*{(\s*)struct nic \*nic.*?$/_probe ( struct dev *dev ) {\n${2}struct nic *nic = nic_device ( dev );\n${2}struct pci_device *$1 = pci_device ( dev );/ms' *.c
This commit is contained in:
Michael Brown 2005-04-12 23:24:39 +00:00
parent 35e6f3e58a
commit bd9ae7cc70
22 changed files with 110 additions and 66 deletions

View File

@ -467,9 +467,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
static int t595_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
unsigned short *p;

View File

@ -688,9 +688,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
static int a3c90x_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i, c;
unsigned short eeprom[0x21];
unsigned int cfg;

View File

@ -654,9 +654,11 @@ static void davicom_irq(struct nic *nic __unused, irq_action_t action __unused)
/*********************************************************************/
/* eth_probe - Look for an adapter */
/*********************************************************************/
static int davicom_probe(struct dev *dev, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
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");

View File

@ -461,9 +461,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *) dev;
static int dmfe_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
uint32_t dev_rev, pci_pmr;
int i;

View File

@ -3580,9 +3580,11 @@ 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, struct pci_device *p)
{
struct nic *nic = (struct nic *)dev;
static int e1000_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *p = pci_device ( dev );
unsigned long mmio_start, mmio_len;
int ret_val, i;

View File

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

View File

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

View File

@ -925,9 +925,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *) dev;
static int forcedeth_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
unsigned long addr;
int sz;
u8 *base;

View File

@ -663,9 +663,11 @@ static void mtd_disable(struct dev *dev)
PROBE - Look for an adapter, this routine's visible to the outside
***************************************************************************/
static int mtd_probe(struct dev *dev, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
static int mtd_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
if (pci->ioaddr == 0)

View File

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

View File

@ -811,9 +811,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *) dev;
static int ns83820_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int sz;
long addr;
int using_dac = 0;

View File

@ -665,9 +665,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *) dev;
static int pcnet32_probe ( struct dev *dev ) {
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;

View File

@ -709,9 +709,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *) dev;
static int r8169_probe ( struct dev *dev ) {
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;

View File

@ -182,9 +182,11 @@ static void rtl_disable(struct dev *);
static void rtl_irq(struct nic *nic, irq_action_t action);
static int rtl8139_probe(struct dev *dev, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
static int rtl8139_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
int speed10, fullduplex;
int addr_len;

View File

@ -307,9 +307,11 @@ static int sis635_get_mac_addr(struct pci_device * pci_dev __unused, struct nic
* Returns: struct nic *: pointer to NIC data structure
*/
static int sis900_probe(struct dev *dev, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
static int sis900_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
int i;
int found=0;
int phy_addr;

View File

@ -134,9 +134,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
static int skel_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
if (board_found && valid_link)
{

View File

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

View File

@ -3224,9 +3224,11 @@ static void tg3_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 tg3_probe(struct dev *dev, struct pci_device *pdev)
{
struct nic *nic = (struct nic *)dev;
static int tg3_probe ( struct dev *dev ) {
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;

View File

@ -771,9 +771,11 @@ 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, struct pci_device *pci)
{
struct nic *nic = (struct nic *) dev;
static int tlan_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
u16 data = 0;
int err;
int i;

View File

@ -1218,9 +1218,11 @@ static void tulip_irq(struct nic *nic __unused, irq_action_t action __unused)
/*********************************************************************/
/* eth_probe - Look for an adapter */
/*********************************************************************/
static int tulip_probe(struct dev *dev, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
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];

View File

@ -951,9 +951,11 @@ void rhine_irq ( struct nic *nic, irq_action_t action ) {
}
static int
rhine_probe (struct dev *dev, struct pci_device *pci)
{
struct nic *nic = (struct nic *)dev;
rhine_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *pci = pci_device ( dev );
struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
if (!pci->ioaddr)
return 0;

View File

@ -609,9 +609,11 @@ static void w89c840_irq(struct nic *nic __unused, irq_action_t action __unused)
/**************************************************************************
w89c840_probe - Look for an adapter, this routine's visible to the outside
***************************************************************************/
static int w89c840_probe(struct dev *dev, struct pci_device *p)
{
struct nic *nic = (struct nic *)dev;
static int w89c840_probe ( struct dev *dev ) {
struct nic *nic = nic_device ( dev );
struct pci_device *p = pci_device ( dev );
u16 sum = 0;
int i, j;
unsigned short value;