Re: [Etherboot-developers] Problems Booting 5.1 cvs

[<ke...@us...>]

I have revived floppyload.S to replace boot1a.s, more later.

Timothy, there are some glitches in your 3c515 code. I made the
following changes because of multiple definition of pnp_card_csn, please
check.

diff -ur ./core/isapnp.c ../../../../etherboot-5.1.8/src/core/isapnp.c
--- ./core/isapnp.c	2003-04-02 11:17:07.000000000 +1000
+++ ../../../../etherboot-5.1.8/src/core/isapnp.c	2003-04-09 19:33:12.000000000 +1000
@@ -34,7 +34,7 @@
 #include "timer.h"
 #include "isapnp.h"
 
-int pnp_card_csn;
+static int pnp_card_csn = 0;
 
 void DELAY(int val) {
 	int c;
diff -ur ./drivers/net/3c515.c ../../../../etherboot-5.1.8/src/drivers/net/3c515.c
--- ./drivers/net/3c515.c	2003-04-03 06:53:00.000000000 +1000
+++ ../../../../etherboot-5.1.8/src/drivers/net/3c515.c	2003-04-09 19:32:28.000000000 +1000
@@ -77,9 +77,6 @@
 #define BASE 	(eth_nic_base)
 static int if_port;
 struct corkscrew_private *vp;
-#ifdef ISA_PNP
-int pnp_card_csn = 0;
-#endif
 /* Brought directly from 3c515.c by Becker */
 #define CORKSCREW 1