Fri Dec 9 02:23:25 2016 UTC ()
kill PCPPISPEAKER


(christos)
diff -r1.41 -r1.42 src/sys/arch/amd64/conf/ALL
diff -r1.444 -r1.445 src/sys/arch/amd64/conf/GENERIC
cvs diff -r1.41 -r1.42 src/sys/arch/amd64/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/ALL 2016/12/08 11:31:09 1.41
+++ src/sys/arch/amd64/conf/ALL 2016/12/09 02:23:25 1.42
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.41 2016/12/08 11:31:09 nat Exp $ 1# $NetBSD: ALL,v 1.42 2016/12/09 02:23:25 christos Exp $
2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp 2# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
3# 3#
4# ALL machine description file 4# ALL machine description file
5# 5#
6# This machine description includes all devices and options and it is 6# This machine description includes all devices and options and it is
7# used to compile-test the source and does not necessarily produce a 7# used to compile-test the source and does not necessarily produce a
8# bootable or useful kernel. 8# bootable or useful kernel.
9# 9#
10# For further information on hardware support for this architecture, see 10# For further information on hardware support for this architecture, see
11# the intro(4) man page. For further information about kernel options 11# the intro(4) man page. For further information about kernel options
12# for this architecture, see the options(4) man page. For an explanation 12# for this architecture, see the options(4) man page. For an explanation
13# of each device driver in this file see the section 4 man page for the 13# of each device driver in this file see the section 4 man page for the
14# device. 14# device.
15 15
16include "arch/amd64/conf/std.amd64" 16include "arch/amd64/conf/std.amd64"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.41 $" 20#ident "ALL-$Revision: 1.42 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27#options VM86 # virtual 8086 emulation 27#options VM86 # virtual 8086 emulation
28#options USER_LDT # user-settable LDT; used by WINE 28#options USER_LDT # user-settable LDT; used by WINE
29options X86EMU # 386 Real Mode emulator 29options X86EMU # 386 Real Mode emulator
30#options PAE # PAE mode (36 bits physical addressing) 30#options PAE # PAE mode (36 bits physical addressing)
31 31
32# CPU features 32# CPU features
33acpicpu* at cpu? # ACPI CPU (including frequency scaling) 33acpicpu* at cpu? # ACPI CPU (including frequency scaling)
@@ -1365,27 +1365,26 @@ audio* at audiobus? @@ -1365,27 +1365,26 @@ audio* at audiobus?
1365mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card 1365mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
1366mpu* at cmpci? 1366mpu* at cmpci?
1367mpu* at eso? 1367mpu* at eso?
1368mpu* at fms? 1368mpu* at fms?
1369mpu* at sb? 1369mpu* at sb?
1370mpu* at yds? 1370mpu* at yds?
1371mpu* at ym? 1371mpu* at ym?
1372 1372
1373# MIDI support 1373# MIDI support
1374midi* at midibus? 1374midi* at midibus?
1375midi* at pcppi? # MIDI interface to the PC speaker 1375midi* at pcppi? # MIDI interface to the PC speaker
1376 1376
1377# The spkr driver provides a simple tone interface to the built in speaker. 1377# The spkr driver provides a simple tone interface to the built in speaker.
1378options PCPPISPEAKER 
1379spkr0 at pcppi? # PC speaker 1378spkr0 at pcppi? # PC speaker
1380 1379
1381#options VAUDIOSPEAKER 1380#options VAUDIOSPEAKER
1382#spkr0 at audio0 # PC speaker (synthesized) 1381#spkr0 at audio0 # PC speaker (synthesized)
1383 1382
1384 1383
1385# FM-Radio devices 1384# FM-Radio devices
1386# ISA radio devices 1385# ISA radio devices
1387az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card 1386az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card
1388az1 at isa? port 0x358 1387az1 at isa? port 0x358
1389rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible 1388rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible
1390rt1 at isa? port 0x284 1389rt1 at isa? port 0x284
1391rt2 at isa? port 0x30c 1390rt2 at isa? port 0x30c
cvs diff -r1.444 -r1.445 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2016/12/08 11:31:09 1.444
+++ src/sys/arch/amd64/conf/GENERIC 2016/12/09 02:23:25 1.445
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.444 2016/12/08 11:31:09 nat Exp $ 1# $NetBSD: GENERIC,v 1.445 2016/12/09 02:23:25 christos Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/amd64/conf/std.amd64" 21include "arch/amd64/conf/std.amd64"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.444 $" 25#ident "GENERIC-$Revision: 1.445 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# delay between "rebooting ..." message and hardware reset, in milliseconds 29# delay between "rebooting ..." message and hardware reset, in milliseconds
30#options CPURESET_DELAY=2000 30#options CPURESET_DELAY=2000
31 31
32# This option allows you to force a serial console at the specified 32# This option allows you to force a serial console at the specified
33# I/O address. see console(4) for details. 33# I/O address. see console(4) for details.
34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
35# you don't want the option below ON iff you are using the 35# you don't want the option below ON iff you are using the
36# serial console option of the new boot strap code. 36# serial console option of the new boot strap code.
37#options CONS_OVERRIDE # Always use above! independent of boot info 37#options CONS_OVERRIDE # Always use above! independent of boot info
38 38
@@ -1099,27 +1099,26 @@ yds* at pci? dev ? function ? # Yamaha D @@ -1099,27 +1099,26 @@ yds* at pci? dev ? function ? # Yamaha D
1099opl* at cmpci? flags 1 1099opl* at cmpci? flags 1
1100opl* at eso? 1100opl* at eso?
1101opl* at fms? 1101opl* at fms?
1102opl* at sv? 1102opl* at sv?
1103 1103
1104# High Definition Audio 1104# High Definition Audio
1105hdaudio* at pci? dev ? function ? # High Definition Audio 1105hdaudio* at pci? dev ? function ? # High Definition Audio
1106hdafg* at hdaudiobus? 1106hdafg* at hdaudiobus?
1107 1107
1108# Audio support 1108# Audio support
1109audio* at audiobus? 1109audio* at audiobus?
1110 1110
1111# The spkr driver provides a simple tone interface to the built in speaker. 1111# The spkr driver provides a simple tone interface to the built in speaker.
1112options PCPPISPEAKER 
1113spkr0 at pcppi? # PC speaker 1112spkr0 at pcppi? # PC speaker
1114 1113
1115#options VAUDIOSPEAKER 1114#options VAUDIOSPEAKER
1116#spkr0 at audio0 # PC speaker (synthesized) 1115#spkr0 at audio0 # PC speaker (synthesized)
1117 1116
1118# MPU 401 UARTs 1117# MPU 401 UARTs
1119#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card 1118#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
1120mpu* at cmpci? 1119mpu* at cmpci?
1121mpu* at eso? 1120mpu* at eso?
1122mpu* at yds? 1121mpu* at yds?
1123 1122
1124# MIDI support 1123# MIDI support
1125midi* at midibus? 1124midi* at midibus?