Module Name: src
Committed By: martin
Date: Tue Mar 13 13:42:54 UTC 2018
Modified Files:
src/sys/arch/atari/conf [netbsd-8]: MILAN-ISAIDE MILAN-PCIIDE
Log Message:
Regen for ticket #624
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.87.8.1 src/sys/arch/atari/conf/MILAN-ISAIDE
cvs rdiff -u -r1.91 -r1.91.8.1 src/sys/arch/atari/conf/MILAN-PCIIDE
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/atari/conf/MILAN-ISAIDE
diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.87 src/sys/arch/atari/conf/MILAN-ISAIDE:1.87.8.1
--- src/sys/arch/atari/conf/MILAN-ISAIDE:1.87 Tue Dec 13 20:42:16 2016
+++ src/sys/arch/atari/conf/MILAN-ISAIDE Tue Mar 13 13:42:54 2018
@@ -1,12 +1,12 @@
#
-# $NetBSD: MILAN-ISAIDE,v 1.87 2016/12/13 20:42:16 christos Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.87.8.1 2018/03/13 13:42:54 martin Exp $
#
# This file was automatically created. Changes will be
# lost when running makeconf in this directory.
#
# Created from:
-# NetBSD: MILAN.in,v 1.27 2014/07/05 09:24:23 tsutsui Exp $
-# NetBSD: GENERIC.in,v 1.109 2014/11/24 08:23:48 tsutsui Exp $
+# NetBSD: MILAN.in,v 1.27.20.1 2018/03/13 13:41:13 martin Exp $
+# NetBSD: GENERIC.in,v 1.112.8.1 2018/01/26 14:28:15 martin Exp $
include "arch/atari/conf/std.milan"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -89,9 +89,7 @@ ep* at pci? dev ? function ? # 3Com 3c59
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
audio* at eso?
-
-spkr* at audio? # PC speaker (synthesized)
-
+spkr* at audio? # PC speaker (synthesized)
options WSEMUL_VT100 # VT100 / VT220 emulation
options WS_KERNEL_FG=WSCOL_WHITE
options WS_KERNEL_BG=WSCOL_BLACK
@@ -114,8 +112,6 @@ wsdisplay* at vga? console ? # as a wsco
pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
wskbd* at pckbd? console ? # wscons keyboard
-
wd* at atabus? drive ?
atapibus* at atabus? # ATAPI bus support
-
cd* at atapibus? drive ? # ATAPI CD-ROM drives
Index: src/sys/arch/atari/conf/MILAN-PCIIDE
diff -u src/sys/arch/atari/conf/MILAN-PCIIDE:1.91 src/sys/arch/atari/conf/MILAN-PCIIDE:1.91.8.1
--- src/sys/arch/atari/conf/MILAN-PCIIDE:1.91 Tue Dec 13 20:42:16 2016
+++ src/sys/arch/atari/conf/MILAN-PCIIDE Tue Mar 13 13:42:54 2018
@@ -1,12 +1,12 @@
#
-# $NetBSD: MILAN-PCIIDE,v 1.91 2016/12/13 20:42:16 christos Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.91.8.1 2018/03/13 13:42:54 martin Exp $
#
# This file was automatically created. Changes will be
# lost when running makeconf in this directory.
#
# Created from:
-# NetBSD: MILAN.in,v 1.27 2014/07/05 09:24:23 tsutsui Exp $
-# NetBSD: GENERIC.in,v 1.109 2014/11/24 08:23:48 tsutsui Exp $
+# NetBSD: MILAN.in,v 1.27.20.1 2018/03/13 13:41:13 martin Exp $
+# NetBSD: GENERIC.in,v 1.112.8.1 2018/01/26 14:28:15 martin Exp $
include "arch/atari/conf/std.milan"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -89,9 +89,7 @@ ep* at pci? dev ? function ? # 3Com 3c59
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
audio* at eso?
-
-spkr* at audio? # PC speaker (synthesized)
-
+spkr* at audio? # PC speaker (synthesized)
options WSEMUL_VT100 # VT100 / VT220 emulation
options WS_KERNEL_FG=WSCOL_WHITE
options WS_KERNEL_BG=WSCOL_BLACK
@@ -107,19 +105,7 @@ ser0 at mainbus0
fdcisa0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy contr.
fdisa0 at fdcisa0 drive 0
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
-acardide* at pci? dev ? function ? # Acard IDE controllers
-aceride* at pci? dev ? function ? # Acer Lab IDE controllers
-artsata* at pci? dev ? function ? # Intel i31244 SATA controller
-cmdide* at pci? dev ? function ? # CMD tech IDE controllers
-cypide* at pci? dev ? function ? # Cypress IDE controllers
-hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers
-optiide* at pci? dev ? function ? # Opti IDE controllers
-pdcide* at pci? dev ? function ? # Promise IDE controllers
-pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
-satalink* at pci? dev ? function ? # SiI SATALink controllers
-siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
-viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
+piixide* at pci? dev ? function ? # Intel IDE controllers
atabus* at ata? channel ?
vga0 at pci? dev ? function ? # a PCI VGA card
wsdisplay* at vga? console ? # as a wscons console
