sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-24 15:23:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Automatically updated with the program

Browse Source 
#!/usr/bin/perl -w -pi -0777

use strict;

( my $type ) = /find_(\w+?)_boot_device/ or die "Could not find type\n";

( my $disable ) = /\.disable\s*=\s*(\w+)/ or die "Could not locate disable\n";

s/(${disable}\s*\(\s*struct\s+nic\s+\*nic)(\s*\)\s*\{)(\s*)/${1}, struct ${type}_device \*${type} __unused${2}${3}nic_disable ( nic );${3}/s;

s/(${disable}\s*\(\s*struct\s+nic\s+\*nic)(\s*\)\s*;)/${1}, struct ${type}_device \*${type}${2}/g;

s/^\s*.disable\s*=\s*${disable}\s*,\s*?$//m;

s/(_probe\s*\(\s*)struct\s+dev\s+\*dev/${1}struct nic \*nic/g;

s/^\s*struct\s+nic\s+\*nic\s*=\s*nic_device\s*\(\s*dev\s*\)\s*;\s*?$//m;

s/^(\s*)(nic->(ioaddr|irqno)\s*=\s*${type})/${1}${type}_fill_nic ( nic, ${type} );\n${1}${2}/m;
This commit is contained in:
Michael Brown
2005-04-21 19:20:39 +00:00
parent cfe3a663af
commit 614c39a8a4
26 changed files with 225 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/drivers/net/sis900.c
View File

@@ -123,11 +123,11 @@ static struct pci_id pci_isa_bridge_list[] = {
static struct pci_driver sis_bridge_driver =
PCI_DRIVER ( "sis_bridge", pci_isa_bridge_list, PCI_NO_CLASS );
PCI_DRIVER ( pci_isa_bridge_list, PCI_NO_CLASS );
/* Function Prototypes */
static int sis900_probe(struct dev *dev,struct pci_device *pci);
static int sis900_probe(struct nic *nic,struct pci_device *pci);
static u16 sis900_read_eeprom(int location);
static void sis900_mdio_reset(long mdio_addr);
@@ -150,7 +150,7 @@ static void sis900_transmit(struct nic *nic, const char *d,
unsigned int t, unsigned int s, const char *p);
static int sis900_poll(struct nic *nic, int retrieve);
static void sis900_disable(struct nic *nic);
static void sis900_disable(struct nic *nic, struct pci_device *pci);
static void sis900_irq(struct nic *nic, irq_action_t action);
@@ -309,8 +309,8 @@ 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 = nic_device ( dev );
static int sis900_probe ( struct nic *nic, struct pci_device *pci ) {
int i;
int found=0;
int phy_addr;
@@ -321,6 +321,7 @@ static int sis900_probe ( struct dev *dev, struct pci_device *pci ) {
return 0;
nic->irqno = 0;
pci_fill_nic ( nic, pci );
nic->ioaddr = pci->ioaddr;
ioaddr = pci->ioaddr;
vendor = pci->vendor;
@@ -1208,7 +1209,8 @@ sis900_poll(struct nic *nic, int retrieve)
*/
static void
sis900_disable ( struct nic *nic ) {
sis900_disable ( struct nic *nic, struct pci_device *pci __unused ) {
nic_disable ( nic );
/* merge reset and disable */
sis900_init(nic);
@@ -1249,7 +1251,7 @@ static struct nic_operations sis900_operations = {
.poll = sis900_poll,
.transmit = sis900_transmit,
.irq = sis900_irq,
.disable = sis900_disable,
};
static struct pci_id sis900_nics[] = {
@@ -1260,4 +1262,5 @@ PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016"),
static struct pci_driver sis900_driver =
PCI_DRIVER ( "SIS900", sis900_nics, PCI_NO_CLASS );
BOOT_DRIVER ( "SIS900", find_pci_boot_device, sis900_driver, sis900_probe );
DRIVER ( "SIS900", nic_driver, pci_driver, sis900_driver,
sis900_probe, sis900_disable );