Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys cleanup old lpt(4) attachment, and glue ppbus in so that...
details: https://anonhg.NetBSD.org/src/rev/e57065e9add5
branches: trunk
changeset: 557883:e57065e9add5
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Tue Jan 20 19:58:00 2004 +0000
description:
cleanup old lpt(4) attachment, and glue ppbus in so that they can coexist:
* lpt device is defined in MI place (dev/ppbus/files.ppbus), dev/ic/lpt.c
is included there too; dev/ic/lpt.c is not included if ppbus is
configured or if there is alternative platform lpt (like for pc532)
* g/c MD lpt definitions and custom puc/upc attachments,
glue moved to conf/files and dev/pci/files.pci respectively; remove
device lpt definition from dev/isa/files.isa
* add ppbus parport attribute, atppc device attachments, adjust plip and lpt
glue
diffstat:
sys/arch/acorn26/conf/files.acorn26 | 9 +--------
sys/arch/acorn32/conf/files.acorn32 | 6 +-----
sys/arch/alpha/conf/files.alpha | 11 +----------
sys/arch/amd64/conf/files.amd64 | 10 +---------
sys/arch/amiga/conf/files.amiga | 5 +----
sys/arch/amigappc/conf/files.amigappc | 5 +----
sys/arch/cats/conf/files.cats | 10 +---------
sys/arch/evbppc/conf/files.explora | 5 +----
sys/arch/i386/conf/files.i386 | 10 +---------
sys/arch/macppc/conf/files.macppc | 7 +------
sys/arch/netwinder/conf/files.netwinder | 7 +------
sys/arch/pc532/conf/files.pc532 | 4 ++--
sys/arch/pc532/conf/std.pc532 | 4 +++-
sys/arch/sgimips/mace/files.mace | 4 +---
sys/arch/sparc64/conf/files.sparc64 | 8 +-------
sys/conf/files | 10 ++++++----
sys/dev/DEVNAMES | 5 ++++-
17 files changed, 28 insertions(+), 92 deletions(-)
diffs (truncated from 385 to 300 lines):
diff -r 0223ba36315b -r e57065e9add5 sys/arch/acorn26/conf/files.acorn26
--- a/sys/arch/acorn26/conf/files.acorn26 Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/acorn26/conf/files.acorn26 Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acorn26,v 1.6 2003/09/30 00:35:30 thorpej Exp $
+# $NetBSD: files.acorn26,v 1.7 2004/01/20 19:58:00 jdolecek Exp $
# Copyright (c) 1997, 1998, 2000 Ben Harris
# All rights reserved.
@@ -159,13 +159,6 @@
# 82C7xx Universal Peripheral Controller
#
-# This section belongs in sys/conf/files, but some ports have their own
-# "lpt" devices, so it has to stay here.
-device lpt
-file dev/ic/lpt.c lpt needs-flag
-attach lpt at upc with lpt_upc
-file dev/ic/lpt_upc.c lpt_upc
-
# This section belongs here
attach upc at iobus with upc_iobus
file arch/acorn26/iobus/upc_iobus.c upc_iobus
diff -r 0223ba36315b -r e57065e9add5 sys/arch/acorn32/conf/files.acorn32
--- a/sys/arch/acorn32/conf/files.acorn32 Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/acorn32/conf/files.acorn32 Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acorn32,v 1.20 2004/01/03 14:46:17 chris Exp $
+# $NetBSD: files.acorn32,v 1.21 2004/01/20 19:58:00 jdolecek Exp $
#
# First try for arm-specific configuration info
#
@@ -32,10 +32,6 @@
file arch/acorn32/mainbus/wdc_pioc.c wdc_pioc
# Standard parallel driver
-# including dev/ic/lpt.c from the ISA file ... this sux
-device lpt
-file dev/ic/lpt.c lpt needs-flag
-
attach lpt at pioc with lpt_pioc
file arch/acorn32/mainbus/lpt_pioc.c lpt_pioc needs-flag
diff -r 0223ba36315b -r e57065e9add5 sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/alpha/conf/files.alpha Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.164 2003/10/08 17:29:59 bouyer Exp $
+# $NetBSD: files.alpha,v 1.165 2004/01/20 19:58:00 jdolecek Exp $
#
# alpha-specific configuration info
@@ -416,15 +416,6 @@
file arch/alpha/pci/sio.c sio | pceb needs-flag
file arch/alpha/pci/sio_pic.c sio | pceb
-# XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
-# XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.
-# XXX (when the conf/files and files.isa bogons are fixed, this can
-# XXX be fixed as well.)
-
-attach lpt at puc with lpt_puc
-file dev/pci/lpt_puc.c lpt_puc
-
-
#
# A12 if_de hack
#
diff -r 0223ba36315b -r e57065e9add5 sys/arch/amd64/conf/files.amd64
--- a/sys/arch/amd64/conf/files.amd64 Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/amd64/conf/files.amd64 Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.amd64,v 1.7 2003/10/06 22:53:47 fvdl Exp $
+# $NetBSD: files.amd64,v 1.8 2004/01/20 19:58:00 jdolecek Exp $
#
# new style config file for amd64 architecture
#
@@ -130,14 +130,6 @@
include "dev/isa/files.isa"
-# XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
-# XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.
-# XXX (when the conf/files and files.isa bogons are fixed, this can
-# XXX be fixed as well.)
-
-attach lpt at puc with lpt_puc
-file dev/pci/lpt_puc.c lpt_puc
-
# PC clock
file arch/amd64/isa/clock.c isa
diff -r 0223ba36315b -r e57065e9add5 sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/amiga/conf/files.amiga Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.132 2003/09/22 18:17:31 jandberg Exp $
+# $NetBSD: files.amiga,v 1.133 2004/01/20 19:58:00 jdolecek Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -290,9 +290,6 @@
attach gvpbus at zbus
file arch/amiga/dev/gvpbus.c gvpbus
-device lpt
-file dev/ic/lpt.c lpt needs-flag
-
attach lpt at supio with lpt_supio
file arch/amiga/dev/lpt_supio.c lpt_supio
diff -r 0223ba36315b -r e57065e9add5 sys/arch/amigappc/conf/files.amigappc
--- a/sys/arch/amigappc/conf/files.amigappc Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/amigappc/conf/files.amigappc Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.amigappc,v 1.16 2003/09/27 21:32:12 is Exp $
+# $NetBSD: files.amigappc,v 1.17 2004/01/20 19:58:00 jdolecek Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -246,9 +246,6 @@
attach gvpbus at zbus
file arch/amiga/dev/gvpbus.c gvpbus
-device lpt
-file dev/ic/lpt.c lpt needs-flag
-
attach lpt at supio with lpt_supio
file arch/amiga/dev/lpt_supio.c lpt_supio
diff -r 0223ba36315b -r e57065e9add5 sys/arch/cats/conf/files.cats
--- a/sys/arch/cats/conf/files.cats Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/cats/conf/files.cats Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.cats,v 1.27 2003/10/21 08:15:40 skrll Exp $
+# $NetBSD: files.cats,v 1.28 2004/01/20 19:58:00 jdolecek Exp $
#
# CATS-specific configuration info
#
@@ -94,14 +94,6 @@
attach pcib at pci
file arch/cats/pci/pcib.c pcib
-# XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
-# XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.
-# XXX (when the conf/files and files.isa bogons are fixed, this can
-# XXX be fixed as well.)
-
-attach lpt at puc with lpt_puc
-file dev/pci/lpt_puc.c lpt_puc
-
file arch/cats/pci/pciide_machdep.c pciide_common
# Include USB stuff
diff -r 0223ba36315b -r e57065e9add5 sys/arch/evbppc/conf/files.explora
--- a/sys/arch/evbppc/conf/files.explora Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/evbppc/conf/files.explora Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.explora,v 1.2 2003/11/19 14:27:24 scw Exp $
+# $NetBSD: files.explora,v 1.3 2004/01/20 19:58:00 jdolecek Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -32,9 +32,6 @@
attach com at elb with com_elb
file arch/evbppc/explora/dev/com_elb.c com_elb
-device lpt
-file dev/ic/lpt.c lpt needs-flag
-
attach lpt at elb with lpt_elb
file arch/evbppc/explora/dev/lpt_elb.c lpt_elb
diff -r 0223ba36315b -r e57065e9add5 sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386 Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/i386/conf/files.i386 Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.246 2003/11/16 12:02:15 tls Exp $
+# $NetBSD: files.i386,v 1.247 2004/01/20 19:58:00 jdolecek Exp $
#
# new style config file for i386 architecture
#
@@ -210,14 +210,6 @@
include "dev/isa/files.isa"
-# XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
-# XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.
-# XXX (when the conf/files and files.isa bogons are fixed, this can
-# XXX be fixed as well.)
-
-attach lpt at puc with lpt_puc
-file dev/pci/lpt_puc.c lpt_puc
-
# PC clock
file arch/i386/isa/clock.c isa
diff -r 0223ba36315b -r e57065e9add5 sys/arch/macppc/conf/files.macppc
--- a/sys/arch/macppc/conf/files.macppc Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/macppc/conf/files.macppc Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.macppc,v 1.61 2003/12/27 02:19:34 grant Exp $
+# $NetBSD: files.macppc,v 1.62 2004/01/20 19:58:00 jdolecek Exp $
#
# macppc-specific configuration info
@@ -178,11 +178,6 @@
attach macofcons at pci
file arch/macppc/dev/ofcons.c macofcons needs-flag
-device lpt
-file dev/ic/lpt.c lpt
-attach lpt at puc with lpt_puc
-file dev/pci/lpt_puc.c lpt_puc
-
include "dev/usb/files.usb"
include "dev/ieee1394/files.ieee1394"
diff -r 0223ba36315b -r e57065e9add5 sys/arch/netwinder/conf/files.netwinder
--- a/sys/arch/netwinder/conf/files.netwinder Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/netwinder/conf/files.netwinder Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.netwinder,v 1.30 2003/10/21 08:15:40 skrll Exp $
+# $NetBSD: files.netwinder,v 1.31 2004/01/20 19:58:00 jdolecek Exp $
#
# First try for arm-specific configuration info
#
@@ -97,11 +97,6 @@
attach pcib at pci
file arch/netwinder/pci/pcib.c pcib
-# XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
-# XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.
-# XXX (when the conf/files and files.isa bogons are fixed, this can
-# XXX be fixed as well.)
-
file arch/netwinder/pci/pciide_machdep.c pciide_common
include "dev/pckbc/files.pckbc"
diff -r 0223ba36315b -r e57065e9add5 sys/arch/pc532/conf/files.pc532
--- a/sys/arch/pc532/conf/files.pc532 Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/pc532/conf/files.pc532 Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.pc532,v 1.53 2003/11/06 00:41:20 simonb Exp $
+# $NetBSD: files.pc532,v 1.54 2004/01/20 19:58:00 jdolecek Exp $
#
# new style config file for pc532 architecture
#
@@ -28,7 +28,7 @@
attach scn at mainbus
file arch/pc532/dev/scn.c scn needs-flag
-device lpt: ether, ifnet, arp
+#device lpt: ether, ifnet, arp
attach lpt at mainbus
file arch/pc532/dev/lpt.c lpt needs-flag
diff -r 0223ba36315b -r e57065e9add5 sys/arch/pc532/conf/std.pc532
--- a/sys/arch/pc532/conf/std.pc532 Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/pc532/conf/std.pc532 Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.pc532,v 1.14 2001/07/09 16:09:02 wiz Exp $
+# $NetBSD: std.pc532,v 1.15 2004/01/20 19:58:00 jdolecek Exp $
#
# Standard configuration info for NetBSD/pc532.
@@ -29,3 +29,5 @@
options EXEC_AOUT # a.out executables
options EXEC_SCRIPT # #! scripts
+
+options USE_ALT_LPT
diff -r 0223ba36315b -r e57065e9add5 sys/arch/sgimips/mace/files.mace
--- a/sys/arch/sgimips/mace/files.mace Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/sgimips/mace/files.mace Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.mace,v 1.1 2004/01/18 04:07:17 sekiya Exp $
+# $NetBSD: files.mace,v 1.2 2004/01/20 19:58:00 jdolecek Exp $
device mace {[offset = -1], [intr = -1], [intrmask = 0] }
attach mace at mainbus
@@ -7,10 +7,8 @@
attach com at mace with com_mace
file arch/sgimips/mace/com_mace.c com_mace
-device lpt
attach lpt at mace with lpt_mace
file arch/sgimips/mace/lpt_mace.c lpt_mace
-file dev/ic/lpt.c lpt_mace
attach pckbc at mace with pckbc_mace
file arch/sgimips/mace/pckbc_mace.c pckbc_mace
diff -r 0223ba36315b -r e57065e9add5 sys/arch/sparc64/conf/files.sparc64
--- a/sys/arch/sparc64/conf/files.sparc64 Tue Jan 20 19:52:40 2004 +0000
+++ b/sys/arch/sparc64/conf/files.sparc64 Tue Jan 20 19:58:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.87 2003/11/15 17:52:30 bouyer Exp $
+# $NetBSD: files.sparc64,v 1.88 2004/01/20 19:58:01 jdolecek Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
Home |
Main Index |
Thread Index |
Old Index