changes to make it compile

diff --git a/aseg/Makefile b/aseg/Makefile
index 40726061e4911d7ee6bc9d5ec17e4931db885e94..64b3c5a987ce0a15d4b5fa89cf56710e44f5c1f4 100644 (file)
--- a/aseg/Makefile
+++ b/aseg/Makefile
@@ -4,7 +4,7 @@ CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__
 OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o \
        ../ich2/smram-ich2.o ../ich2/smi.o vga-overlay.o packet.o \
        ../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o ../net/net.o \
 OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o \
        ../ich2/smram-ich2.o ../ich2/smi.o vga-overlay.o packet.o \
        ../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o ../net/net.o \

-       ../ich2/ich2-timer.o ../pci/pci-bother.o
+       ../ich2/ich2-timer.o ../pci/pci-bother.o ../net/3c90x.o

 
 all: aseg.elf
 
 
 all: aseg.elf
 

diff --git a/include/timer.h b/include/timer.h
index 56054b06a2046d6863326e8e2b1a5892d3ae21b0..b3b6985fb4a3077041e4ea852d40a15c8a8737bd 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -4,4 +4,4 @@
 void oneshot_start_ms(unsigned long milliseconds);
 int oneshot_running(void);
 
 void oneshot_start_ms(unsigned long milliseconds);
 int oneshot_running(void);
 

-#endif TIMER_H
+#endif /* TIMER_H */

diff --git a/net/3c90x.c b/net/3c90x.c
index 37fd34d9cce4f4a29a2b0dc56c75ef639d2fba8e..711b69de7f6308466c4581f7786740037c472405 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -38,6 +38,7 @@
  */
 
 #include "etherboot-compat.h"
  */
 
 #include "etherboot-compat.h"

+#include "net.h"

 #include <timer.h>
 #include <io.h>
 #include <pci.h>
 #include <timer.h>
 #include <io.h>
 #include <pci.h>


@@ -712,8 +713,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
 /*
     adjust_pci_dev(pci);
 */
 /*
     adjust_pci_dev(pci);
 */

-    nic->ioaddr = ioaddr & ~3;
-    nic->irqno = 0;
+    nic.ioaddr = ioaddr & ~3;
+    nic.irqno = 0;

 
     INF_3C90X.IOAddr = ioaddr & ~3;
     INF_3C90X.CurrentWindow = 255;
 
     INF_3C90X.IOAddr = ioaddr & ~3;
     INF_3C90X.CurrentWindow = 255;


@@ -823,7 +824,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     /** Fill in our entry in the etherboot arp table **/
 /* XXX ? for lwip? 
     for(i=0;i<ETH_ALEN;i++)
     /** Fill in our entry in the etherboot arp table **/
 /* XXX ? for lwip? 
     for(i=0;i<ETH_ALEN;i++)

-       nic->node_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff;
+       nic.node_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff;

 */
 
     /** Read the media options register, print a message and set default
 */
 
     /** Read the media options register, print a message and set default


@@ -963,8 +964,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
                                  cmdAcknowledgeInterrupt, 0x661);
 
     /* * Set our exported functions **/
                                  cmdAcknowledgeInterrupt, 0x661);
 
     /* * Set our exported functions **/

-    nic->poll     = a3c90x_poll;
-    nic->transmit = a3c90x_transmit;
+    nic.poll     = a3c90x_poll;
+    nic.transmit = a3c90x_transmit;

 
     return 1;
 }
 
     return 1;
 }

diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h
index 6c9645817bb1893ff8e55ad59357a3b0a9631d74..2d8d98fb47efb3ad40588810a44988a29bb75c1a 100644 (file)
--- a/net/etherboot-compat.h
+++ b/net/etherboot-compat.h
@@ -1,3 +1,6 @@
+#ifndef _ETHERBOOT_COMPAT_H
+#define _ETHERBOOT_COMPAT_H
+

 #define ETH_ALEN       6
 
 struct dev {
 #define ETH_ALEN       6
 
 struct dev {


@@ -16,3 +19,5 @@ struct nic {
 };
 
 #define virt_to_bus(x) ((unsigned long)x)
 };
 
 #define virt_to_bus(x) ((unsigned long)x)

+
+#endif

diff --git a/net/net.h b/net/net.h
index f10e304ebaf09281464db300219d347acbc22731..01505abe227e7b5b003750db44d42650e0f09406 100644 (file)
--- a/net/net.h
+++ b/net/net.h
@@ -6,4 +6,6 @@
 extern void eth_init();
 extern void eth_poll();
 
 extern void eth_init();
 extern void eth_poll();
 

+extern struct nic nic;
+

 #endif
 #endif