Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/atari Make things work with the new autoconf stuff:
details: https://anonhg.NetBSD.org/src/rev/dbb2f449eaa1
branches: trunk
changeset: 540267:dbb2f449eaa1
user: leo <leo%NetBSD.org@localhost>
date: Sun Dec 08 21:31:35 2002 +0000
description:
Make things work with the new autoconf stuff:
- The pcibus is now called 'pcib' and the isabus 'isab'. Their attributes are
'pcibus' and 'isabus' respectively. This makes the underlying busses
attach again.
- Initialize the parent structure in the config_console() function.
Otherwise we end up without a console.
diffstat:
sys/arch/atari/atari/autoconf.c | 31 ++++++++++++++++---------------
sys/arch/atari/conf/HADES.in | 10 +++++-----
sys/arch/atari/conf/MILAN.in | 10 +++++-----
sys/arch/atari/conf/files.atari | 10 +++++-----
sys/arch/atari/isa/isa_machdep.c | 6 +++---
sys/arch/atari/pci/pci_machdep.c | 6 +++---
6 files changed, 37 insertions(+), 36 deletions(-)
diffs (200 lines):
diff -r 7dd8b49ecae4 -r dbb2f449eaa1 sys/arch/atari/atari/autoconf.c
--- a/sys/arch/atari/atari/autoconf.c Sun Dec 08 21:29:27 2002 +0000
+++ b/sys/arch/atari/atari/autoconf.c Sun Dec 08 21:31:35 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.41 2002/10/04 01:50:55 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.42 2002/12/08 21:31:35 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -104,6 +104,7 @@
if (atari_realconfig)
return(config_found(pdp, auxp, pfn) != NULL);
+ memset(&temp, 0, sizeof(temp));
if (pdp == NULL)
pdp = &temp;
@@ -145,8 +146,8 @@
* some setup for the 'grf-side'. This make it possible to use
* a PCI card for both wscons and grfabs.
*/
- atari_config_found(cf, NULL, "pcibus", NULL);
- atari_config_found(cf, NULL, "isabus", NULL);
+ atari_config_found(cf, NULL, "pcib" , NULL);
+ atari_config_found(cf, NULL, "isab" , NULL);
atari_config_found(cf, NULL, "grfbus", NULL);
}
@@ -278,18 +279,18 @@
void *auxp;
{
printf ("\n");
- config_found(dp, "clock" , simple_devprint);
- config_found(dp, "grfbus" , simple_devprint);
- config_found(dp, "kbd" , simple_devprint);
- config_found(dp, "fdc" , simple_devprint);
- config_found(dp, "ser" , simple_devprint);
- config_found(dp, "zs" , simple_devprint);
- config_found(dp, "ncrscsi", simple_devprint);
- config_found(dp, "nvr" , simple_devprint);
- config_found(dp, "lpt" , simple_devprint);
- config_found(dp, "wdc" , simple_devprint);
- config_found(dp, "isabus" , simple_devprint);
- config_found(dp, "pcibus" , simple_devprint);
+ config_found(dp, "clock" , simple_devprint);
+ config_found(dp, "grfbus" , simple_devprint);
+ config_found(dp, "kbd" , simple_devprint);
+ config_found(dp, "fdc" , simple_devprint);
+ config_found(dp, "ser" , simple_devprint);
+ config_found(dp, "zs" , simple_devprint);
+ config_found(dp, "ncrscsi" , simple_devprint);
+ config_found(dp, "nvr" , simple_devprint);
+ config_found(dp, "lpt" , simple_devprint);
+ config_found(dp, "wdc" , simple_devprint);
+ config_found(dp, "isab" , simple_devprint);
+ config_found(dp, "pcib" , simple_devprint);
config_found(dp, "avmebus" , simple_devprint);
}
diff -r 7dd8b49ecae4 -r dbb2f449eaa1 sys/arch/atari/conf/HADES.in
--- a/sys/arch/atari/conf/HADES.in Sun Dec 08 21:29:27 2002 +0000
+++ b/sys/arch/atari/conf/HADES.in Sun Dec 08 21:31:35 2002 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: HADES.in,v 1.4 2001/04/10 06:28:38 leo Exp $
+# $NetBSD: HADES.in,v 1.5 2002/12/08 21:31:37 leo Exp $
#
# Medusa-Hades
#
@@ -28,15 +28,15 @@
ite1 at grfet1
grfet2 at grfbus0
ite2 at grfet2
-pcibus0 at mainbus0 # PCI-bus
-pci0 at pcibus0
+pcib0 at mainbus0 # PCI-bus
+pci0 at pcib0
avmebus0 at mainbus0 # VME bus
vme0 at avmebus0
le0 at vme0 irq 5 # Lance ethernet (Riebl/PAM).
le0 at vme0 irq 4 # Lance ethernet (BVME410).
et0 at vme0 # Crazy Dots II
-isabus0 at mainbus0 # ISA-bus
-isa0 at isabus0
+isab0 at mainbus0 # ISA-bus
+isa0 at isab0
wdc0 at mainbus0 # IDE-bus
wd* at wdc? channel ? drive ?
# ATAPI bus support
diff -r 7dd8b49ecae4 -r dbb2f449eaa1 sys/arch/atari/conf/MILAN.in
--- a/sys/arch/atari/conf/MILAN.in Sun Dec 08 21:29:27 2002 +0000
+++ b/sys/arch/atari/conf/MILAN.in Sun Dec 08 21:31:35 2002 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: MILAN.in,v 1.10 2002/06/15 21:44:07 leo Exp $
+# $NetBSD: MILAN.in,v 1.11 2002/12/08 21:31:37 leo Exp $
#
# Milan
#
@@ -39,10 +39,10 @@
# The following sections describe various hardware options.
#
-isabus0 at mainbus0 # ISA-bus
-isa0 at isabus0
-pcibus0 at mainbus0 # PCI-bus
-pci0 at pcibus0
+isab0 at mainbus0 # ISA-bus
+isa0 at isab0
+pcib0 at mainbus0 # PCI-bus
+pci0 at pcib0
nvr0 at mainbus0 # nvram driver
ser0 at mainbus0
fdcisa0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy contr.
diff -r 7dd8b49ecae4 -r dbb2f449eaa1 sys/arch/atari/conf/files.atari
--- a/sys/arch/atari/conf/files.atari Sun Dec 08 21:29:27 2002 +0000
+++ b/sys/arch/atari/conf/files.atari Sun Dec 08 21:31:35 2002 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: files.atari,v 1.100 2002/11/03 02:29:39 chs Exp $
+# $NetBSD: files.atari,v 1.101 2002/12/08 21:31:37 leo Exp $
maxpartitions 16
@@ -145,8 +145,8 @@
file arch/atari/pci/pci_tseng.c pci
file arch/atari/pci/pciide_machdep.c pciide
-device pcibus
-attach pcibus at mainbus
+device pcib: pcibus
+attach pcib at mainbus
include "dev/pci/files.pci"
@@ -158,8 +158,8 @@
file arch/atari/isa/isa_milan.c isa & _milanhw_
file arch/atari/isa/isa_dma.c isadma
-device isabus
-attach isabus at mainbus
+device isab: isabus
+attach isab at mainbus
include "dev/isa/files.isa"
include "dev/ata/files.ata"
diff -r 7dd8b49ecae4 -r dbb2f449eaa1 sys/arch/atari/isa/isa_machdep.c
--- a/sys/arch/atari/isa/isa_machdep.c Sun Dec 08 21:29:27 2002 +0000
+++ b/sys/arch/atari/isa/isa_machdep.c Sun Dec 08 21:31:35 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.25 2002/10/02 05:04:26 thorpej Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.26 2002/12/08 21:31:38 leo Exp $ */
/*
* Copyright (c) 1997 Leo Weppelman. All rights reserved.
@@ -74,7 +74,7 @@
struct atari_isa_chipset sc_chipset;
};
-CFATTACH_DECL(isabus, sizeof(struct isabus_softc),
+CFATTACH_DECL(isab, sizeof(struct isabus_softc),
isabusmatch, isabusattach, NULL, NULL);
/*
@@ -91,7 +91,7 @@
{
static int nmatched = 0;
- if (strcmp((char *)auxp, "isabus"))
+ if (strcmp((char *)auxp, "isab"))
return (0); /* Wrong number... */
if(atari_realconfig == 0)
diff -r 7dd8b49ecae4 -r dbb2f449eaa1 sys/arch/atari/pci/pci_machdep.c
--- a/sys/arch/atari/pci/pci_machdep.c Sun Dec 08 21:29:27 2002 +0000
+++ b/sys/arch/atari/pci/pci_machdep.c Sun Dec 08 21:31:35 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.38 2002/10/02 05:04:26 thorpej Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.39 2002/12/08 21:31:38 leo Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -125,7 +125,7 @@
static int overlap_pci_areas __P((struct pci_memreg *p,
struct pci_memreg *self, u_int addr, u_int size, u_int what));
-CFATTACH_DECL(pcibus, sizeof(struct device),
+CFATTACH_DECL(pcib, sizeof(struct device),
pcibusmatch, pcibusattach, NULL, NULL);
/*
@@ -142,7 +142,7 @@
{
static int nmatched = 0;
- if (strcmp((char *)auxp, "pcibus"))
+ if (strcmp((char *)auxp, "pcib"))
return (0); /* Wrong number... */
if(atari_realconfig == 0)
Home |
Main Index |
Thread Index |
Old Index