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

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

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

description:
Pull up revision 1.6 (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/asc.c   |   6 +++---
 sys/arch/acorn32/podulebus/if_ie.c |   9 +++------
 sys/dev/podulebus/if_ea.c          |  13 +++----------
 sys/dev/podulebus/podulebus.h      |   5 ++---
 4 files changed, 11 insertions(+), 22 deletions(-)

diffs (112 lines):

diff -r de8ba4988d2b -r 303618577fb6 sys/arch/acorn32/podulebus/asc.c
--- a/sys/arch/acorn32/podulebus/asc.c  Fri Nov 01 11:13:36 2002 +0000
+++ b/sys/arch/acorn32/podulebus/asc.c  Fri Nov 01 11:13:55 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asc.c,v 1.5 2002/03/10 15:47:45 bjh21 Exp $    */
+/*     $NetBSD: asc.c,v 1.5.6.1 2002/11/01 11:13:55 tron Exp $ */
 
 /*
  * Copyright (c) 2001 Richard Earnshaw
@@ -74,7 +74,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.5 2002/03/10 15:47:45 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.5.6.1 2002/11/01 11:13:55 tron Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -146,7 +146,7 @@
        /* Look for the card */
 
        /* Standard ROM, skipping the MCS card that used the same ID. */
-       if (matchpodule(pa, MANUFACTURER_ACORN, PODULE_ACORN_SCSI, -1) &&
+       if (pa->pa_product == PODULE_ACORN_SCSI &&
            strncmp(pa->pa_podule->description, "MCS", 3) != 0)
                return 1;
 
diff -r de8ba4988d2b -r 303618577fb6 sys/arch/acorn32/podulebus/if_ie.c
--- a/sys/arch/acorn32/podulebus/if_ie.c        Fri Nov 01 11:13:36 2002 +0000
+++ b/sys/arch/acorn32/podulebus/if_ie.c        Fri Nov 01 11:13:55 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.5 2002/02/18 19:22:14 bjh21 Exp $ */
+/* $NetBSD: if_ie.c,v 1.5.10.1 2002/11/01 11:13:55 tron Exp $ */
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson.
@@ -61,7 +61,7 @@
 
 #include <sys/param.h>
 
-__RCSID("$NetBSD: if_ie.c,v 1.5 2002/02/18 19:22:14 bjh21 Exp $");
+__RCSID("$NetBSD: if_ie.c,v 1.5.10.1 2002/11/01 11:13:55 tron Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -309,10 +309,7 @@
 
 /* Look for a network slot interface */
 
-       if (matchpodule(pa, MANUFACTURER_ACORN, PODULE_ACORN_ETHER1, -1) == 0)
-               return(0);
-
-       return(1);
+       return (pa->pa_product == PODULE_ETHER1);
 }
 
 /*
diff -r de8ba4988d2b -r 303618577fb6 sys/dev/podulebus/if_ea.c
--- a/sys/dev/podulebus/if_ea.c Fri Nov 01 11:13:36 2002 +0000
+++ b/sys/dev/podulebus/if_ea.c Fri Nov 01 11:13:55 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ea.c,v 1.5 2001/11/13 13:32:34 lukem Exp $ */
+/* $NetBSD: if_ea.c,v 1.5.12.1 2002/11/01 11:13:56 tron Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Ben Harris
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.5 2001/11/13 13:32:34 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.5.12.1 2002/11/01 11:13:56 tron Exp $");
 
 #include <sys/param.h>
 
@@ -93,14 +93,7 @@
 {
        struct podulebus_attach_args *pa = aux;
        
-       if ((matchpodule(pa, MANUFACTURER_ATOMWIDE,
-                        PODULE_ATOMWIDE_ETHER3, -1) == 0)
-           && (matchpodule(pa, MANUFACTURER_ACORN,
-                           PODULE_ACORN_ETHER3XXX, -1) == 0)
-           && (matchpodule(pa, MANUFACTURER_ANT, PODULE_ANT_ETHER3, -1) == 0))
-               return 0;
-
-       return 1;
+       return pa->pa_product == PODULE_ETHER3;
 }
 
 
diff -r de8ba4988d2b -r 303618577fb6 sys/dev/podulebus/podulebus.h
--- a/sys/dev/podulebus/podulebus.h     Fri Nov 01 11:13:36 2002 +0000
+++ b/sys/dev/podulebus/podulebus.h     Fri Nov 01 11:13:55 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.h,v 1.4 2001/07/04 13:58:04 bjh21 Exp $ */
+/* $NetBSD: podulebus.h,v 1.4.18.1 2002/11/01 11:13:56 tron Exp $ */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -51,10 +51,9 @@
        char *description;
 };
 
-struct podule_list {
+struct manufacturer_description {
        int manufacturer_id;
        char *description;
-       struct podule_description *products;
 };
 
 #include <machine/podulebus_machdep.h>