Well, I compiled it, using the diff below.
Like you, I put a random value for PCI_DEVICE_ID_VORTEX_3c595. I'm not
sure whether it matters.
Good luck ...
Edmund
Attempt at ChangeLog:
1999-09-20 Edmund GRIMLEY EVANS <[EMAIL PROTECTED]>
Changes to make netboot/3c59x.c compile.
* netboot/3c59x.c: INCLUDE_3c59x is replaced by INCLUDE_3C59X
throughout.
* netboot/config.c: Likewise.
* netboot/io.h: Added macros __INS, __OUTS, outl, inl, outl_p,
inl_p and corresponding inline functions.
* netboot/pci.h: Added PCI_VENDOR_ID_VORTEX and
PCI_DEVICE_ID_VORTEX_3c595, the latter with a random value.
diff -ru ../gnu-cvs/grub/netboot/3c59x.c grub/netboot/3c59x.c
--- ../gnu-cvs/grub/netboot/3c59x.c Tue Sep 14 07:55:29 1999
+++ grub/netboot/3c59x.c Mon Sep 20 20:29:06 1999
@@ -14,7 +14,7 @@
Code 930.5, Goddard Space Flight Center, Greenbelt MD 20771
*/
-#ifdef INCLUDE_3c59x
+#ifdef INCLUDE_3C59X
#define lx_outb(a,b) outb(b,a)
@@ -1169,4 +1169,4 @@
return 0;
}
-#endif /* INCLUDE_3c59x */
+#endif /* INCLUDE_3C59X */
diff -ru ../gnu-cvs/grub/netboot/config.c grub/netboot/config.c
--- ../gnu-cvs/grub/netboot/config.c Tue Sep 14 19:19:26 1999
+++ grub/netboot/config.c Mon Sep 20 20:29:06 1999
@@ -4,7 +4,7 @@
#include "netboot_config.h"
#undef INCLUDE_PCI
-#if defined(INCLUDE_NEPCI) || defined(INCLUDE_EEPRO100) || defined (INCLUDE_3c59x)
+#if defined(INCLUDE_NEPCI) || defined(INCLUDE_EEPRO100) || defined (INCLUDE_3C59X)
/* || others later */
#if defined(NETBOOT32) /* only for 32 bit machines */
#define INCLUDE_PCI
@@ -33,7 +33,7 @@
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82557,
"Intel EtherExpressPro100"},
#endif
-#ifdef INCLUDE_3c59x
+#ifdef INCLUDE_3C59X
{PCI_VENDOR_ID_VORTEX, PCI_DEVICE_ID_VORTEX_3c595, "3c595"},
#endif
@@ -83,7 +83,7 @@
extern struct nic *ne2100_probe(struct nic *, unsigned short *);
#endif
-#ifdef INCLUDE_3c59x
+#ifdef INCLUDE_3C59X
extern struct nic *VX_probe(struct nic *, unsigned short *);
#endif
@@ -120,7 +120,7 @@
{ "NE*000/PCI", nepci_probe, pci_addrs },
#endif
-#ifdef INCLUDE_3c59x
+#ifdef INCLUDE_3C59X
{"VorTex/PCI", VX_probe, pci_addrs},
#endif
diff -ru ../gnu-cvs/grub/netboot/io.h grub/netboot/io.h
--- ../gnu-cvs/grub/netboot/io.h Tue Sep 14 07:55:37 1999
+++ grub/netboot/io.h Mon Sep 20 20:45:18 1999
@@ -34,6 +34,18 @@
__IN1(s##_p) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); SLOW_DOWN_IO; return
_v; } \
__IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return
_v; }
+#define __INS(s) \
+extern inline void ins##s(unsigned short port, void * addr, unsigned long count); \
+extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \
+{ __asm__ __volatile__ ("cld ; rep ; ins" #s \
+: "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+
+#define __OUTS(s) \
+extern inline void outs##s(unsigned short port, const void * addr, unsigned long
+count); \
+extern inline void outs##s(unsigned short port, const void * addr, unsigned long
+count) \
+{ __asm__ __volatile__ ("cld ; rep ; outs" #s \
+: "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+
#define RETURN_TYPE unsigned char
/* __IN(b,"b","0" (0)) */
__IN(b,"")
@@ -50,6 +62,14 @@
__OUT(w,"w",short)
__OUT(l,,int)
+__INS(b)
+__INS(w)
+__INS(l)
+
+__OUTS(b)
+__OUTS(w)
+__OUTS(l)
+
#define outb(port,val) \
((__builtin_constant_p((port)) && (port) < 256) ? \
__outbc((val),(port)) : \
@@ -89,5 +109,25 @@
((__builtin_constant_p((port)) && (port) < 256) ? \
__inwc_p(port) : \
__inw_p(port))
+
+#define outl(port,val) \
+((__builtin_constant_p((port)) && (port) < 256) ? \
+ __outlc((val),(port)) : \
+ __outl((val),(port)))
+
+#define inl(port) \
+((__builtin_constant_p((port)) && (port) < 256) ? \
+ __inlc(port) : \
+ __inl(port))
+
+#define outl_p(port,val) \
+((__builtin_constant_p((port)) && (port) < 256) ? \
+ __outlc_p((val),(port)) : \
+ __outl_p((val),(port)))
+
+#define inl_p(port) \
+((__builtin_constant_p((port)) && (port) < 256) ? \
+ __inlc_p(port) : \
+ __inl_p(port))
#endif
diff -ru ../gnu-cvs/grub/netboot/pci.h grub/netboot/pci.h
--- ../gnu-cvs/grub/netboot/pci.h Tue Sep 14 07:55:43 1999
+++ grub/netboot/pci.h Mon Sep 20 20:35:50 1999
@@ -80,6 +80,8 @@
#define PCI_DEVICE_ID_VIA_82C926 0x0926
#define PCI_VENDOR_ID_SURECOM 0x10bd
#define PCI_DEVICE_ID_SURECOM_NE34 0x0e34
+#define PCI_VENDOR_ID_VORTEX 0x1119
+#define PCI_DEVICE_ID_VORTEX_3c595 0x1234 /* Correct value unknown */
struct pci_device {
unsigned short vendor, dev_id;
