Module Name: src
Committed By: soren
Date: Wed Jul 17 21:26:29 UTC 2013
Modified Files:
src/sys/arch/amd64/conf: files.amd64
src/sys/arch/i386/conf: files.i386
src/sys/arch/x86/conf: files.x86
src/sys/dev/pci: eso.c sv.c
Log Message:
A few "isa" files are so tightly integrated into the x86 platform code
as to not really be part of the optional isa bus autoconf machinery.
Allows configuring a kernel like so:
include "arch/amd64/conf/GENERIC"
no isa
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.370 -r1.371 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/sv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.79 src/sys/arch/amd64/conf/files.amd64:1.80
--- src/sys/arch/amd64/conf/files.amd64:1.79 Sat Oct 13 19:42:02 2012
+++ src/sys/arch/amd64/conf/files.amd64 Wed Jul 17 21:26:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.amd64,v 1.79 2012/10/13 19:42:02 alnsn Exp $
+# $NetBSD: files.amd64,v 1.80 2013/07/17 21:26:28 soren Exp $
#
# new style config file for amd64 architecture
#
@@ -107,13 +107,6 @@ include "arch/x86/pci/files.pci"
include "dev/isa/files.isa"
-# PC clock
-file arch/x86/isa/clock.c isa
-file arch/x86/isa/rtc.c isa
-
-# TSC timecounter support
-file arch/x86/x86/tsc.c
-
# attribute used to represent the "keyboard controller"
# XXX should be a real device
define pckbcport { [irq = -1], [port = -1] }
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.370 src/sys/arch/i386/conf/files.i386:1.371
--- src/sys/arch/i386/conf/files.i386:1.370 Tue Dec 25 10:51:03 2012
+++ src/sys/arch/i386/conf/files.i386 Wed Jul 17 21:26:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.370 2012/12/25 10:51:03 mbalmer Exp $
+# $NetBSD: files.i386,v 1.371 2013/07/17 21:26:28 soren Exp $
#
# new style config file for i386 architecture
#
@@ -245,18 +245,11 @@ file arch/i386/pci/p64h2apic.c p64h2apic
include "dev/isa/files.isa"
-# PC clock
-file arch/x86/isa/clock.c isa
-file arch/x86/isa/rtc.c isa
-
# Protech PS3100 cash drawer
device ptcd: gpiobus
attach ptcd at isa
file dev/isa/ptcd.c ptcd
-# TSC support
-file arch/x86/x86/tsc.c
-
# Numeric Processing Extension; Math Co-processor
device npx
file arch/i386/isa/npx.c npx needs-flag
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.79 src/sys/arch/x86/conf/files.x86:1.80
--- src/sys/arch/x86/conf/files.x86:1.79 Wed Aug 29 17:13:21 2012
+++ src/sys/arch/x86/conf/files.x86 Wed Jul 17 21:26:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.79 2012/08/29 17:13:21 drochner Exp $
+# $NetBSD: files.x86,v 1.80 2013/07/17 21:26:29 soren Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -89,6 +89,7 @@ file arch/x86/x86/pmap_tlb.c
file arch/x86/x86/procfs_machdep.c procfs
file arch/x86/x86/sys_machdep.c
file arch/x86/x86/syscall.c
+file arch/x86/x86/tsc.c
file arch/x86/x86/vm_machdep.c
file arch/x86/x86/x86_autoconf.c
file arch/x86/x86/x86_userconf.c userconf
@@ -118,7 +119,11 @@ file arch/x86/acpi/acpi_pdc.c acpi
file arch/x86/acpi/acpi_wakeup.c acpi
file arch/x86/acpi/acpi_machdep.c acpi
-file arch/x86/isa/isa_machdep.c isa
+file arch/x86/isa/isa_machdep.c
+
+# PC clock
+file arch/x86/isa/clock.c
+file arch/x86/isa/rtc.c
# Stubs for x86 routines not included in the system
file arch/x86/x86/x86_stub.c
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.62 src/sys/dev/pci/eso.c:1.63
--- src/sys/dev/pci/eso.c:1.62 Sat Oct 27 17:18:31 2012
+++ src/sys/dev/pci/eso.c Wed Jul 17 21:26:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.62 2012/10/27 17:18:31 chs Exp $ */
+/* $NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.62 2012/10/27 17:18:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $");
#include "mpu.h"
@@ -96,11 +96,8 @@ __KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.62
* XXX engine by allocating through the ISA DMA tag.
*/
#if defined(amd64) || defined(i386)
-#include "isa.h"
-#if NISA > 0
#include <dev/isa/isavar.h>
#endif
-#endif
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) printf x
Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.47 src/sys/dev/pci/sv.c:1.48
--- src/sys/dev/pci/sv.c:1.47 Sat Oct 27 17:18:35 2012
+++ src/sys/dev/pci/sv.c Wed Jul 17 21:26:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.47 2012/10/27 17:18:35 chs Exp $ */
+/* $NetBSD: sv.c,v 1.48 2013/07/17 21:26:29 soren Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.47 2012/10/27 17:18:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.48 2013/07/17 21:26:29 soren Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,12 +95,9 @@ __KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.47
* As long as bus_dmamem_alloc_range() is missing we use the ISA
* DMA tag on i386.
*/
-#if defined(i386)
-#include "isa.h"
-#if NISA > 0
+#if defined(amd64) || defined(i386)
#include <dev/isa/isavar.h>
#endif
-#endif
#ifdef AUDIO_DEBUG
#define DPRINTF(x) if (svdebug) printf x
@@ -379,7 +376,7 @@ sv_attach(device_t parent, device_t self
#if defined(alpha)
/* XXX Force allocation through the SGMAP. */
sc->sc_dmatag = alphabus_dma_get_tag(pa->pa_dmat, ALPHA_BUS_ISA);
-#elif defined(i386) && NISA > 0
+#elif defined(amd64) || defined(i386)
/* XXX
* The SonicVibes DMA is broken and only works on 24-bit addresses.
* As long as bus_dmamem_alloc_range() is missing we use the ISA
