[src/netbsd-1-6]: src/sys Pull up revision 1.4 (requested by chris in ticket ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e63ad7335235
branches:  netbsd-1-6
changeset: 529205:e63ad7335235
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Nov 01 11:13:20 2002 +0000

description:
Pull up revision 1.4 (requested by chris in ticket #120):
Substantial overhaul of podule IDs.  Unlike on PCI or USB, podule IDs are
assigned by RISCOS Ltd (and were assigned by Acorn) to be unique across all
manufacturers.  This means that associating each one with a manufacturer (and
checking the manufacturer when attaching) is bogus.  Thus, we don't do that
any more.
This should have the pleasant side-effect of getting APDL IDE interfaces
working, since they're just ICS ones with a different manufacturer ID.

diffstat:

 sys/arch/acorn32/podulebus/cosc.c |  15 ++++++---------
 sys/dev/podulebus/acemidi.c       |   6 +++---
 sys/dev/podulebus/if_eb.c         |   9 +++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diffs (90 lines):

diff -r 2937e41edf74 -r e63ad7335235 sys/arch/acorn32/podulebus/cosc.c
--- a/sys/arch/acorn32/podulebus/cosc.c Fri Nov 01 11:13:06 2002 +0000
+++ b/sys/arch/acorn32/podulebus/cosc.c Fri Nov 01 11:13:20 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cosc.c,v 1.3 2001/11/27 00:53:12 thorpej Exp $ */
+/*     $NetBSD: cosc.c,v 1.3.12.1 2002/11/01 11:13:20 tron Exp $       */
 
 /*
  * Copyright (c) 1996 Mark Brinicombe
@@ -92,18 +92,15 @@
 
        /* Look for the card */
 
-       if (matchpodule(pa, MANUFACTURER_MCS, PODULE_MCS_SCSI, -1) != 0)
+       if (pa->pa_product == PODULE_CONNECT32)
                return(1);
 
        /* Old versions of the ROM on this card could have the wrong ID */
 
-       if (matchpodule(pa, MANUFACTURER_ACORN, PODULE_ACORN_SCSI, -1) == 0)
-               return(0);
-
-       if (strncmp(pa->pa_podule->description, "MCS", 3) != 0)
-               return(0);
-
-       return(1);
+       if (pa ->pa_product == PODULE_ACORN_SCSI &&
+           strncmp(pa->pa_podule->description, "MCS", 3) == 0)
+               return(1);
+       return(0);
 }
 
 static int dummy[6];
diff -r 2937e41edf74 -r e63ad7335235 sys/dev/podulebus/acemidi.c
--- a/sys/dev/podulebus/acemidi.c       Fri Nov 01 11:13:06 2002 +0000
+++ b/sys/dev/podulebus/acemidi.c       Fri Nov 01 11:13:20 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acemidi.c,v 1.3 2001/11/13 07:23:15 lukem Exp $ */
+/* $NetBSD: acemidi.c,v 1.3.12.1 2002/11/01 11:13:20 tron Exp $ */
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.3 2001/11/13 07:23:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.3.12.1 2002/11/01 11:13:20 tron Exp $");
 
 #include <sys/param.h>
 
@@ -72,7 +72,7 @@
 {
        struct podulebus_attach_args *pa = aux;
 
-       if (pa->pa_product == PODULE_MCS_MIDICONNECT)
+       if (pa->pa_product == PODULE_MIDICONNECT)
                return 1;
        return 0;
 }
diff -r 2937e41edf74 -r e63ad7335235 sys/dev/podulebus/if_eb.c
--- a/sys/dev/podulebus/if_eb.c Fri Nov 01 11:13:06 2002 +0000
+++ b/sys/dev/podulebus/if_eb.c Fri Nov 01 11:13:20 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eb.c,v 1.3 2001/11/13 13:32:34 lukem Exp $ */
+/* $NetBSD: if_eb.c,v 1.3.12.1 2002/11/01 11:13:20 tron Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Ben Harris
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.3 2001/11/13 13:32:34 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.3.12.1 2002/11/01 11:13:20 tron Exp $");
 
 #include <sys/param.h>
 
@@ -93,10 +93,7 @@
 {
        struct podulebus_attach_args *pa = aux;
        
-       if (matchpodule(pa, MANUFACTURER_ANT, PODULE_ANT_ETHERB, -1) == 0)
-               return 0;
-
-       return 1;
+       return pa->pa_product == PODULE_ETHERB;
 }