Merged mcb30-realmode-redesign back to HEAD

11 files changed, 35 insertions, 22 deletions

diff --git a/src/drivers/disk/ide_disk.c b/src/drivers/disk/ide_disk.c
index be0fa310..d7e62aca 100644
--- a/src/drivers/disk/ide_disk.c
+++ b/src/drivers/disk/ide_disk.c
@@ -759,7 +759,8 @@ static int ide_pci_probe(struct dev *dev, struct pci_device *pci)
 }
 #define PCI_DEVICE_ID_INTEL_82801CA_11	0x248b
 static struct pci_id ide_controllers[] = {
-{ PCI_VENDOR_ID_INTEL,       PCI_DEVICE_ID_INTEL_82801CA_11,    "PIIX4" },
+	PCI_ROM(0x0000, 0x0000, "ide_disk", "Generic IDE disk support"),
+/* { PCI_VENDOR_ID_INTEL,       PCI_DEVICE_ID_INTEL_82801CA_11,    "PIIX4" },*/
 #if 0  /* Currently I don't need any entries in this table so ignore it */
 { PCI_VENDOR_ID_INTEL,       PCI_DEVICE_ID_INTEL_82371FB_0,     "PIIX" },
 { PCI_VENDOR_ID_INTEL,       PCI_DEVICE_ID_INTEL_82371FB_1,     "PIIX" },
diff --git a/src/drivers/net/3c509.c b/src/drivers/net/3c509.c
index 0a7187ed..6375e8c7 100644
--- a/src/drivers/net/3c509.c
+++ b/src/drivers/net/3c509.c
@@ -653,6 +653,7 @@ static struct isa_driver t509_driver __isa_driver = {
 	.probe   = t509_probe,
 	.ioaddrs = 0,
 };
+ISA_ROM("3c509","3c509, ISA/EISA");
 #endif
 
 #ifdef INCLUDE_3C529
@@ -662,6 +663,7 @@ static struct isa_driver t529_driver __isa_driver = {
 	.probe   = t529_probe,
 	.ioaddrs = 0,
 };
+ISA_ROM("3c529","3c529 == MCA 3c509");
 #endif
 
 /*
diff --git a/src/drivers/net/3c515.c b/src/drivers/net/3c515.c
index f185acef..7c21b45e 100644
--- a/src/drivers/net/3c515.c
+++ b/src/drivers/net/3c515.c
@@ -812,3 +812,4 @@ static struct isa_driver t515_driver __isa_driver = {
 	.probe = t515_probe,
 	.ioaddrs = 0,
 };
+ISA_ROM("3c515","3c515, Fast EtherLink ISA");
diff --git a/src/drivers/net/cs89x0.c b/src/drivers/net/cs89x0.c
index 42de1f2a..f418dc1b 100644
--- a/src/drivers/net/cs89x0.c
+++ b/src/drivers/net/cs89x0.c
@@ -711,6 +711,7 @@ static struct isa_driver cs89x0_driver __isa_driver = {
 	.probe   = cs89x0_probe,
 	.ioaddrs = 0,
 };
+ISA_ROM("cs89x0","Crystal Semiconductor CS89x0");
 
 /*
  * Local variables:
diff --git a/src/drivers/net/depca.c b/src/drivers/net/depca.c
index 29266b10..ca456803 100644
--- a/src/drivers/net/depca.c
+++ b/src/drivers/net/depca.c
@@ -792,3 +792,4 @@ static struct isa_driver depca_driver __isa_driver = {
 	.probe   = depca_probe,
 	.ioaddrs = 0,
 };
+ISA_ROM("depca","Digital DE100 and DE200");
diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c
index b27c9f7f..a191a163 100644
--- a/src/drivers/net/eepro.c
+++ b/src/drivers/net/eepro.c
@@ -623,3 +623,4 @@ static struct isa_driver eepro_driver __isa_driver = {
 	.probe   = eepro_probe,
 	.ioaddrs = 0,
 };
+ISA_ROM("eepro","Intel Etherexpress Pro/10");
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index 16b41f8b..34f6f50d 100755
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -370,25 +370,6 @@ struct ring_desc {
 };
 #endif
 
-/* Define the TX Descriptor */
-static struct ring_desc tx_ring[NR_TX_DESC]
-    __attribute__ ((aligned(8)));
-
-/* Create a static buffer of size REAL_RX_BUF_SIZE for each
-TX Descriptor.  All descriptors point to a
-part of this buffer */
-static unsigned char txb[NR_TX_DESC * REAL_RX_BUF_SIZE];
-
-/* Define the TX Descriptor */
-static struct ring_desc rx_ring[NR_RX_DESC]
-    __attribute__ ((aligned(8)));
-
-/* Create a static buffer of size REAL_RX_BUF_SIZE for each
-RX Descriptor   All descriptors point to a
-part of this buffer */
-static unsigned char rxb[NR_RX_DESC * REAL_RX_BUF_SIZE]
-    __attribute__ ((aligned(8)));
-
 /* Private Storage for the NIC */
 struct ns83820_private {
 	u8 *base;
@@ -412,6 +393,25 @@ struct ns83820_private {
 } nsx;
 static struct ns83820_private *ns;
 
+/* Define the TX Descriptor */
+static struct ring_desc tx_ring[NR_TX_DESC]
+    __attribute__ ((aligned(8)));
+
+/* Create a static buffer of size REAL_RX_BUF_SIZE for each
+TX Descriptor.  All descriptors point to a
+part of this buffer */
+static unsigned char txb[NR_TX_DESC * REAL_RX_BUF_SIZE];
+
+/* Define the TX Descriptor */
+static struct ring_desc rx_ring[NR_RX_DESC]
+    __attribute__ ((aligned(8)));
+
+/* Create a static buffer of size REAL_RX_BUF_SIZE for each
+RX Descriptor   All descriptors point to a
+part of this buffer */
+static unsigned char rxb[NR_RX_DESC * REAL_RX_BUF_SIZE]
+    __attribute__ ((aligned(8)));
+
 static void phy_intr(struct nic *nic __unused)
 {
 	static char *speeds[] =
diff --git a/src/drivers/net/ns8390.c b/src/drivers/net/ns8390.c
index dddc0819..5a18c8e6 100644
--- a/src/drivers/net/ns8390.c
+++ b/src/drivers/net/ns8390.c
@@ -961,6 +961,7 @@ static struct isa_driver wd_driver __isa_driver = {
 	.probe   = wd_probe,
 	.ioaddrs = 0, 
 };
+ISA_ROM("wd","WD8003/8013, SMC8216/8416, SMC 83c790 (EtherEZ)");
 #endif
 
 #ifdef	INCLUDE_3C503
@@ -970,6 +971,7 @@ static struct isa_driver t503_driver __isa_driver = {
 	.probe   = t503_probe,
 	.ioaddrs = 0, 
 };
+ISA_ROM("3c503","3Com503, Etherlink II[/16]");
 #endif
 
 #ifdef	INCLUDE_NE
@@ -979,6 +981,7 @@ static struct isa_driver ne_driver __isa_driver = {
 	.probe   = ne_probe,
 	.ioaddrs = 0, 
 };
+ISA_ROM("ne","NE1000/2000 and clones");
 #endif
 
 #ifdef	INCLUDE_NS8390
@@ -1013,4 +1016,3 @@ static struct pci_driver nepci_driver __pci_driver = {
  *  c-basic-offset: 8
  * End:
  */
-
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index be2b06cc..4aafb4ff 100644
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -18,7 +18,9 @@ $Id$
 #include "prism2.c"
 
 static struct pci_id prism2_pci_nics[] = {
-PCI_ROM(0x1260, 0x3873, "prism2_pci", "Harris Semiconductor Prism2.5 clone"),	/* Generic Prism2.5 PCI device */
+PCI_ROM(0x1260, 0x3873, "prism2_pci",	"Harris Semiconductor Prism2.5 clone"),
+PCI_ROM(0x1260, 0x3873, "hwp01170",	"ActionTec HWP01170"),
+PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520"),
 };
 
 static struct pci_driver prism2_pci_driver __pci_driver = {
diff --git a/src/drivers/net/sk_g16.c b/src/drivers/net/sk_g16.c
index 6591c020..f65118d7 100644
--- a/src/drivers/net/sk_g16.c
+++ b/src/drivers/net/sk_g16.c
@@ -1187,3 +1187,4 @@ static struct isa_driver SK_driver __isa_driver = {
 	.probe   = SK_probe,
 	.ioaddrs = 0,
 };
+ISA_ROM("sk_g16","Schneider and Koch G16");
diff --git a/src/drivers/net/smc9000.c b/src/drivers/net/smc9000.c
index a05521e8..6a935e35 100644
--- a/src/drivers/net/smc9000.c
+++ b/src/drivers/net/smc9000.c
@@ -542,3 +542,4 @@ static struct isa_driver smc9000_driver __isa_driver = {
 	.probe   = smc9000_probe,
 	.ioaddrs = 0,
 };
+ISA_ROM("smc9000","SMC9000");