From 331e2bd82ba66091f99c93b46e5c894639983e82 Mon Sep 17 00:00:00 2001
From: briggs <briggs@NetBSD.org>
Date: Fri, 5 May 1995 05:40:13 +0000
Subject: [PATCH] Add some code/defines to differentiate Asante and
 Interlan/Gator cards correctly with the new nubus code.

---
 sys/arch/mac68k/dev/if_ae.c   | 19 ++++++++++++-------
 sys/arch/mac68k/dev/nubus.h   |  7 ++++---
 sys/arch/mac68k/nubus/nubus.h |  7 ++++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/sys/arch/mac68k/dev/if_ae.c b/sys/arch/mac68k/dev/if_ae.c
index d1429487d362..df48e0011434 100644
--- a/sys/arch/mac68k/dev/if_ae.c
+++ b/sys/arch/mac68k/dev/if_ae.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ae.c,v 1.28 1995/04/29 20:23:44 briggs Exp $	*/
+/*	$NetBSD: if_ae.c,v 1.29 1995/05/05 05:40:15 briggs Exp $	*/
 
 /*
  * Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -205,7 +205,7 @@ ae_id_card(slot, sc)
 	if (slottype.type != NUBUS_TYPE_ETHERNET)
 		return 0;
 
-	switch (slottype.type) {
+	switch (slottype.drsw) {
 	case NUBUS_DRSW_3COM:
 	case NUBUS_DRSW_APPLE:
 		sc->vendor = AE_VENDOR_APPLE;
@@ -213,11 +213,16 @@ ae_id_card(slot, sc)
 	case NUBUS_DRSW_ASANTE:
 		sc->vendor = AE_VENDOR_ASANTE;
 		break;
-	case NUBUS_DRSW_DAYNA:
-		sc->vendor = AE_VENDOR_DAYNA;
-		break;
-	case NUBUS_DRSW_INTERLAN:
-		sc->vendor = AE_VENDOR_INTERLAN;
+	case NUBUS_DRSW_GATOR:
+		switch (slottype.drhw) {
+		default:
+		case NUBUS_DRHW_INTERLAN:
+			sc->vendor = AE_VENDOR_INTERLAN;
+			break;
+		case NUBUS_DRHW_KINETICS:
+			sc->vendor = AE_VENDOR_DAYNA;
+			break;
+		}
 		break;
 	default:
 		sc->vendor = AE_VENDOR_UNKNOWN;
diff --git a/sys/arch/mac68k/dev/nubus.h b/sys/arch/mac68k/dev/nubus.h
index 5cedaf7225fc..be9735d14b7a 100644
--- a/sys/arch/mac68k/dev/nubus.h
+++ b/sys/arch/mac68k/dev/nubus.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nubus.h,v 1.5 1995/04/29 20:23:48 briggs Exp $	*/
+/*	$NetBSD: nubus.h,v 1.6 1995/05/05 05:40:13 briggs Exp $	*/
 
 /*
  * Copyright (c) 1995 Allen Briggs.  All rights reserved.
@@ -56,9 +56,10 @@
 #define NUBUS_CATEGORY_NETWORK	0x0004
 #define  NUBUS_TYPE_ETHERNET	0x0001
 #define   NUBUS_DRSW_3COM	0x0000
+#define   NUBUS_DRSW_GATOR	0x0103
+#define    NUBUS_DRHW_INTERLAN	0x0100
+#define    NUBUS_DRHW_KINETICS	0x0106
 #define   NUBUS_DRSW_ASANTE	0x0104
-#define   NUBUS_DRSW_DAYNA	0x0105	/* XXX */
-#define   NUBUS_DRSW_INTERLAN	0x0106	/* XXX */
 #define    NUBUS_DRHW_SONIC	0x0110
 
 #define NUBUS_CATEGORY_FONT	0x0009	/* KanjiTalk Font Card? */
diff --git a/sys/arch/mac68k/nubus/nubus.h b/sys/arch/mac68k/nubus/nubus.h
index 5cedaf7225fc..be9735d14b7a 100644
--- a/sys/arch/mac68k/nubus/nubus.h
+++ b/sys/arch/mac68k/nubus/nubus.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nubus.h,v 1.5 1995/04/29 20:23:48 briggs Exp $	*/
+/*	$NetBSD: nubus.h,v 1.6 1995/05/05 05:40:13 briggs Exp $	*/
 
 /*
  * Copyright (c) 1995 Allen Briggs.  All rights reserved.
@@ -56,9 +56,10 @@
 #define NUBUS_CATEGORY_NETWORK	0x0004
 #define  NUBUS_TYPE_ETHERNET	0x0001
 #define   NUBUS_DRSW_3COM	0x0000
+#define   NUBUS_DRSW_GATOR	0x0103
+#define    NUBUS_DRHW_INTERLAN	0x0100
+#define    NUBUS_DRHW_KINETICS	0x0106
 #define   NUBUS_DRSW_ASANTE	0x0104
-#define   NUBUS_DRSW_DAYNA	0x0105	/* XXX */
-#define   NUBUS_DRSW_INTERLAN	0x0106	/* XXX */
 #define    NUBUS_DRHW_SONIC	0x0110
 
 #define NUBUS_CATEGORY_FONT	0x0009	/* KanjiTalk Font Card? */