Automatically updated with the program

#!/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;

1 files changed, 9 insertions, 6 deletions

diff --git a/src/drivers/net/depca.c b/src/drivers/net/depca.c
index 78339b08..f8fb97ae 100644
--- a/src/drivers/net/depca.c
+++ b/src/drivers/net/depca.c
@@ -648,7 +648,8 @@ static void depca_transmit(
 /**************************************************************************
 DISABLE - Turn off ethernet interface
 ***************************************************************************/
-static void depca_disable ( struct nic *nic ) {
+static void depca_disable ( struct nic *nic, struct isa_device *isa __unused ) {
+	nic_disable ( nic );
 	/* reset and disable merge */
 	depca_reset(nic);
 
@@ -736,18 +737,19 @@ static struct nic_operations depca_operations = {
 	.poll		= depca_poll,
 	.transmit	= depca_transmit,
 	.irq		= depca_irq,
-	.disable	= depca_disable,
+
 };
 
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
 ***************************************************************************/
-static int depca_probe ( struct dev *dev, struct isa_device *isa ) {
-	struct nic *nic = nic_device ( dev );
+static int depca_probe ( struct nic *nic, struct isa_device *isa ) {
+
 	int	i, j;
 	long	sum, chksum;
 
 	nic->irqno    = 0;
+	isa_fill_nic ( nic, isa );
 	nic->ioaddr   = isa->ioaddr;
 
 	for (i = 0, j = 0, sum = 0; j < 3; j++) {
@@ -792,9 +794,10 @@ static isa_probe_addr_t depca_probe_addrs[] = {
 };
 
 static struct isa_driver depca_driver =
-	ISA_DRIVER ( "depca", depca_probe_addrs, depca_probe1,
+	ISA_DRIVER ( depca_probe_addrs, depca_probe1,
 		     GENERIC_ISAPNP_VENDOR, 0x80f7 );
 
-BOOT_DRIVER ( "depce", find_isa_boot_device, depca_driver, depca_probe );
+DRIVER ( "depce", nic_driver, isa_driver, depca_driver,
+	 depca_probe, depca_disable );
 
 ISA_ROM ( "depca", "Digital DE100 and DE200" );