Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-6]: src/sys/arch Pull up revision 1.3 (requested by chris in ti...
details: https://anonhg.NetBSD.org/src/rev/2937e41edf74
branches: netbsd-1-6
changeset: 529204:2937e41edf74
user: tron <tron%NetBSD.org@localhost>
date: Fri Nov 01 11:13:06 2002 +0000
description:
Pull up revision 1.3 (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/acorn26/podulebus/if_eh.c | 40 ++++++++++++++++++------------------
sys/arch/acorn32/podulebus/amps.c | 6 +---
sys/arch/acorn32/podulebus/csa.c | 4 +-
sys/arch/acorn32/podulebus/csc.c | 4 +-
sys/arch/acorn32/podulebus/icside.c | 7 +----
sys/arch/acorn32/podulebus/rapide.c | 6 +---
sys/arch/acorn32/podulebus/simide.c | 6 +---
7 files changed, 32 insertions(+), 41 deletions(-)
diffs (198 lines):
diff -r 1bf7b66332c7 -r 2937e41edf74 sys/arch/acorn26/podulebus/if_eh.c
--- a/sys/arch/acorn26/podulebus/if_eh.c Fri Nov 01 11:12:40 2002 +0000
+++ b/sys/arch/acorn26/podulebus/if_eh.c Fri Nov 01 11:13:06 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eh.c,v 1.2 2002/03/24 23:37:44 bjh21 Exp $ */
+/* $NetBSD: if_eh.c,v 1.2.4.1 2002/11/01 11:13:06 tron Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -52,7 +52,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.2 2002/03/24 23:37:44 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eh.c,v 1.2.4.1 2002/11/01 11:13:06 tron Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -144,12 +144,12 @@
struct podulebus_attach_args *pa = aux;
switch (pa->pa_product) {
- case PODULE_ICUBED_ETHERLAN100:
- case PODULE_ICUBED_ETHERLAN100AEH:
- case PODULE_ICUBED_ETHERLAN200:
- case PODULE_ICUBED_ETHERLAN200AEH:
- case PODULE_ICUBED_ETHERLAN500:
- case PODULE_ICUBED_ETHERLAN500AEH:
+ case PODULE_ETHERLAN100:
+ case PODULE_ETHERLAN100AEH:
+ case PODULE_ETHERLAN200:
+ case PODULE_ETHERLAN200AEH:
+ case PODULE_ETHERLAN500:
+ case PODULE_ETHERLAN500AEH:
return 1;
}
return 0;
@@ -182,31 +182,31 @@
/* Canonicalise card type. */
switch (pa->pa_product) {
- case PODULE_ICUBED_ETHERLAN100:
- case PODULE_ICUBED_ETHERLAN100AEH:
- sc->sc_type = PODULE_ICUBED_ETHERLAN100;
+ case PODULE_ETHERLAN100:
+ case PODULE_ETHERLAN100AEH:
+ sc->sc_type = PODULE_ETHERLAN100;
break;
- case PODULE_ICUBED_ETHERLAN200:
- case PODULE_ICUBED_ETHERLAN200AEH:
- sc->sc_type = PODULE_ICUBED_ETHERLAN200;
+ case PODULE_ETHERLAN200:
+ case PODULE_ETHERLAN200AEH:
+ sc->sc_type = PODULE_ETHERLAN200;
break;
- case PODULE_ICUBED_ETHERLAN500:
- case PODULE_ICUBED_ETHERLAN500AEH:
- sc->sc_type = PODULE_ICUBED_ETHERLAN500;
+ case PODULE_ETHERLAN500:
+ case PODULE_ETHERLAN500AEH:
+ sc->sc_type = PODULE_ETHERLAN500;
break;
}
/* Memory size and width varies. */
dsc->mem_start = 0;
switch (sc->sc_type) {
- case PODULE_ICUBED_ETHERLAN200:
+ case PODULE_ETHERLAN200:
sc->sc_flags |= EHF_MAU;
/* FALLTHROUGH */
- case PODULE_ICUBED_ETHERLAN100:
+ case PODULE_ETHERLAN100:
printf(": 8-bit, 32 KB RAM");
dsc->mem_size = 0x8000;
break;
- case PODULE_ICUBED_ETHERLAN500:
+ case PODULE_ETHERLAN500:
printf(": 16-bit, 64 KB RAM");
sc->sc_flags |= EHF_16BIT;
dsc->mem_size = 0x10000;
diff -r 1bf7b66332c7 -r 2937e41edf74 sys/arch/acorn32/podulebus/amps.c
--- a/sys/arch/acorn32/podulebus/amps.c Fri Nov 01 11:12:40 2002 +0000
+++ b/sys/arch/acorn32/podulebus/amps.c Fri Nov 01 11:13:06 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amps.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $ */
+/* $NetBSD: amps.c,v 1.2.12.1 2002/11/01 11:13:06 tron Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -143,9 +143,7 @@
{
struct podule_attach_args *pa = (void *)aux;
- if (matchpodule(pa, MANUFACTURER_ATOMWIDE2, PODULE_ATOMWIDE2_SERIAL, -1) == 0)
- return(0);
- return(1);
+ return (pa->pa_product == PODULE_ATOMWIDE_SERIAL);
}
/*
diff -r 1bf7b66332c7 -r 2937e41edf74 sys/arch/acorn32/podulebus/csa.c
--- a/sys/arch/acorn32/podulebus/csa.c Fri Nov 01 11:12:40 2002 +0000
+++ b/sys/arch/acorn32/podulebus/csa.c Fri Nov 01 11:13:06 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: csa.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $ */
+/* $NetBSD: csa.c,v 1.2.12.1 2002/11/01 11:13:07 tron Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -117,7 +117,7 @@
{
struct podule_attach_args *pa = aux;
- if (matchpodule(pa, MANUFACTURER_CUMANA, PODULE_CUMANA_SCSI1, -1))
+ if (pa->pa_product == PODULE_CUMANA_SCSI1)
return(1);
/* PowerROM */
diff -r 1bf7b66332c7 -r 2937e41edf74 sys/arch/acorn32/podulebus/csc.c
--- a/sys/arch/acorn32/podulebus/csc.c Fri Nov 01 11:12:40 2002 +0000
+++ b/sys/arch/acorn32/podulebus/csc.c Fri Nov 01 11:13:06 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: csc.c,v 1.2.12.1 2002/08/07 23:42:19 lukem Exp $ */
+/* $NetBSD: csc.c,v 1.2.12.2 2002/11/01 11:13:07 tron Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
struct podule_attach_args *pa = (struct podule_attach_args *)auxp;
/* Look for the card */
- if (matchpodule(pa, MANUFACTURER_CUMANA, PODULE_CUMANA_SCSI2, -1))
+ if (pa->pa_product == PODULE_CUMANA_SCSI2)
return 1;
/* PowerROM */
diff -r 1bf7b66332c7 -r 2937e41edf74 sys/arch/acorn32/podulebus/icside.c
--- a/sys/arch/acorn32/podulebus/icside.c Fri Nov 01 11:12:40 2002 +0000
+++ b/sys/arch/acorn32/podulebus/icside.c Fri Nov 01 11:13:06 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: icside.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $ */
+/* $NetBSD: icside.c,v 1.2.12.1 2002/11/01 11:13:07 tron Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -150,10 +150,7 @@
void *aux;
{
struct podule_attach_args *pa = (void *)aux;
- if (matchpodule(pa, MANUFACTURER_ICS, PODULE_ICS_IDE, -1) == 0)
- return(0);
-
- return(1);
+ return (pa->pa_product == PODULE_ICS_IDE);
}
/*
diff -r 1bf7b66332c7 -r 2937e41edf74 sys/arch/acorn32/podulebus/rapide.c
--- a/sys/arch/acorn32/podulebus/rapide.c Fri Nov 01 11:12:40 2002 +0000
+++ b/sys/arch/acorn32/podulebus/rapide.c Fri Nov 01 11:13:06 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rapide.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $ */
+/* $NetBSD: rapide.c,v 1.2.12.1 2002/11/01 11:13:07 tron Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -174,9 +174,7 @@
{
struct podule_attach_args *pa = (void *)aux;
- if (matchpodule(pa, MANUFACTURER_YES, PODULE_YES_RAPIDE, -1) == 0)
- return(0);
- return(1);
+ return (pa->pa_product == PODULE_RAPIDE);
}
/*
diff -r 1bf7b66332c7 -r 2937e41edf74 sys/arch/acorn32/podulebus/simide.c
--- a/sys/arch/acorn32/podulebus/simide.c Fri Nov 01 11:12:40 2002 +0000
+++ b/sys/arch/acorn32/podulebus/simide.c Fri Nov 01 11:13:06 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: simide.c,v 1.2 2001/11/27 00:53:12 thorpej Exp $ */
+/* $NetBSD: simide.c,v 1.2.12.1 2002/11/01 11:13:07 tron Exp $ */
/*
* Copyright (c) 1997-1998 Mark Brinicombe
@@ -139,9 +139,7 @@
{
struct podule_attach_args *pa = (void *)aux;
- if (matchpodule(pa, MANUFACTURER_SIMTEC, PODULE_SIMTEC_IDE, -1) == 0)
- return(0);
- return(1);
+ return (pa->pa_product == PODULE_SIMTEC_IDE);
}
/*
Home |
Main Index |
Thread Index |
Old Index