Sync with sys/i386/isa/if_ed.c and sio.c revisions 1.145 and 1.215,

respectively.

3 files changed, 41 insertions, 48 deletions

diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 87a2012..abce135 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.65 1998/08/19 11:48:38 kato Exp $
+ *	$Id: sio.c,v 1.66 1998/08/28 12:44:49 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -42,16 +42,6 @@
 #include "sio.h"
 #include "pnp.h"
 
-#ifndef EXTRA_SIO
-#if NPNP > 0
-#define EXTRA_SIO 2
-#else
-#define EXTRA_SIO 0
-#endif
-#endif
-
-#define NSIOTOT (NSIO + EXTRA_SIO)
-
 /*
  * Serial driver, based on 386BSD-0.1 com driver.
  * Mostly rewritten to use pseudo-DMA.
@@ -184,6 +174,16 @@
 #define enable_intr()	COM_ENABLE_INTR()
 #endif /* SMP */
 
+#ifndef EXTRA_SIO
+#if NPNP > 0
+#define EXTRA_SIO MAX_PNP_CARDS
+#else
+#define EXTRA_SIO 0
+#endif
+#endif
+
+#define NSIOTOT (NSIO + EXTRA_SIO)
+
 #define	LOTS_OF_EVENTS	64	/* helps separate urgent events from input */
 #define	RS_IBUFSIZE	256
 
@@ -3685,13 +3685,11 @@ error:
 
 #if NPNP > 0
 
-static struct siopnp_ids {
-	u_long vend_id;
-	char *id_str;
-} siopnp_ids[] = {
+static pnpid_t siopnp_ids[] = {
 	{ 0x5015f435, "MOT1550"},
 	{ 0x8113b04e, "Supra1381"},
 	{ 0x9012b04e, "Supra1290"},
+	{ 0x7121b04e, "SupraExpress 56i Sp"},
 	{ 0x11007256, "USR0011"},
 	{ 0x30207256, "USR2030"},
 	{ 0 }
@@ -3714,12 +3712,12 @@ DATA_SET (pnpdevice_set, siopnp);
 static char *
 siopnp_probe(u_long csn, u_long vend_id)
 {
-	struct siopnp_ids *ids;
+	pnpid_t *id;
 	char *s = NULL;
 
-	for(ids = siopnp_ids; ids->vend_id != 0; ids++) {
-		if (vend_id == ids->vend_id) {
-			s = ids->id_str;
+	for(id = siopnp_ids; id->vend_id != 0; id++) {
+		if (vend_id == id->vend_id) {
+			s = id->id_str;
 			break;
 		}
 	}
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index 4ff5cce..010cc64 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.50 1998/06/22 08:06:58 kato Exp $
+ *	$Id: if_ed.c,v 1.51 1998/08/28 12:47:44 kato Exp $
  */
 
 /*
@@ -4213,11 +4213,8 @@ ds_getmcaf(sc, mcaf)
 
 #if NPNP > 0
 
-static struct edpnp_ids {
-	u_long vend_id;
-	char *id_str;
-} edpnp_ids[] = {
-	{ 0x1980635e, "WSC8019"},
+static pnpid_t edpnp_ids[] = {
+	{ 0xd680d041, "NE2000"},
 	{ 0 }
 };
 
@@ -4238,12 +4235,12 @@ DATA_SET (pnpdevice_set, edpnp);
 static char *
 edpnp_probe(u_long csn, u_long vend_id)
 {
-	struct edpnp_ids *ids;
+	pnpid_t *id;
 	char *s = NULL;
 
-	for(ids = edpnp_ids; ids->vend_id != 0; ids++) {
-		if (vend_id == ids->vend_id) {
-			s = ids->id_str;
+	for(id = edpnp_ids; id->vend_id != 0; id++) {
+		if (vend_id == id->vend_id) {
+			s = id->id_str;
 			break;
 		}
 	}
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 87a2012..abce135 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.65 1998/08/19 11:48:38 kato Exp $
+ *	$Id: sio.c,v 1.66 1998/08/28 12:44:49 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -42,16 +42,6 @@
 #include "sio.h"
 #include "pnp.h"
 
-#ifndef EXTRA_SIO
-#if NPNP > 0
-#define EXTRA_SIO 2
-#else
-#define EXTRA_SIO 0
-#endif
-#endif
-
-#define NSIOTOT (NSIO + EXTRA_SIO)
-
 /*
  * Serial driver, based on 386BSD-0.1 com driver.
  * Mostly rewritten to use pseudo-DMA.
@@ -184,6 +174,16 @@
 #define enable_intr()	COM_ENABLE_INTR()
 #endif /* SMP */
 
+#ifndef EXTRA_SIO
+#if NPNP > 0
+#define EXTRA_SIO MAX_PNP_CARDS
+#else
+#define EXTRA_SIO 0
+#endif
+#endif
+
+#define NSIOTOT (NSIO + EXTRA_SIO)
+
 #define	LOTS_OF_EVENTS	64	/* helps separate urgent events from input */
 #define	RS_IBUFSIZE	256
 
@@ -3685,13 +3685,11 @@ error:
 
 #if NPNP > 0
 
-static struct siopnp_ids {
-	u_long vend_id;
-	char *id_str;
-} siopnp_ids[] = {
+static pnpid_t siopnp_ids[] = {
 	{ 0x5015f435, "MOT1550"},
 	{ 0x8113b04e, "Supra1381"},
 	{ 0x9012b04e, "Supra1290"},
+	{ 0x7121b04e, "SupraExpress 56i Sp"},
 	{ 0x11007256, "USR0011"},
 	{ 0x30207256, "USR2030"},
 	{ 0 }
@@ -3714,12 +3712,12 @@ DATA_SET (pnpdevice_set, siopnp);
 static char *
 siopnp_probe(u_long csn, u_long vend_id)
 {
-	struct siopnp_ids *ids;
+	pnpid_t *id;
 	char *s = NULL;
 
-	for(ids = siopnp_ids; ids->vend_id != 0; ids++) {
-		if (vend_id == ids->vend_id) {
-			s = ids->id_str;
+	for(id = siopnp_ids; id->vend_id != 0; id++) {
+		if (vend_id == id->vend_id) {
+			s = id->id_str;
 			break;
 		}
 	}