Module Name: src
Committed By: jmcneill
Date: Sun Feb 9 16:06:18 UTC 2020
Modified Files:
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/modules: md.amd64 md.i386
src/doc: CHANGES
src/share/man/man4: Makefile
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/i386/conf: ALL GENERIC
src/sys/dev: DEVNAMES
src/sys/dev/pci: files.pci
src/sys/modules: Makefile
Removed Files:
src/share/man/man4: azalia.4
src/sys/dev/pci: azalia.c azalia.h azalia_codec.c
src/sys/modules/azalia: Makefile azalia.ioconf
Log Message:
Retire azalia(4).
To generate a diff of this commit:
cvs rdiff -u -r1.1679 -r1.1680 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.2648 -r1.2649 src/doc/CHANGES
cvs rdiff -u -r1.701 -r1.702 src/share/man/man4/Makefile
cvs rdiff -u -r1.7 -r0 src/share/man/man4/azalia.4
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.561 -r1.562 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.174 -r1.175 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.488 -r1.489 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1223 -r1.1224 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.326 -r1.327 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.88 -r0 src/sys/dev/pci/azalia.c
cvs rdiff -u -r1.22 -r0 src/sys/dev/pci/azalia.h
cvs rdiff -u -r1.81 -r0 src/sys/dev/pci/azalia_codec.c
cvs rdiff -u -r1.425 -r1.426 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.237 -r1.238 src/sys/modules/Makefile
cvs rdiff -u -r1.3 -r0 src/sys/modules/azalia/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/azalia/azalia.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1679 src/distrib/sets/lists/man/mi:1.1680
--- src/distrib/sets/lists/man/mi:1.1679 Sun Feb 2 21:49:44 2020
+++ src/distrib/sets/lists/man/mi Sun Feb 9 16:06:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1679 2020/02/02 21:49:44 kamil Exp $
+# $NetBSD: mi,v 1.1680 2020/02/09 16:06:17 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -936,7 +936,7 @@
./usr/share/man/cat4/axe.0 man-sys-catman .cat
./usr/share/man/cat4/axen.0 man-sys-catman .cat
./usr/share/man/cat4/az.0 man-sys-catman .cat
-./usr/share/man/cat4/azalia.0 man-sys-catman .cat
+./usr/share/man/cat4/azalia.0 man-obsolete obsolete
./usr/share/man/cat4/battery_pmu.0 man-sys-catman .cat
./usr/share/man/cat4/bba.0 man-sys-catman .cat
./usr/share/man/cat4/bce.0 man-sys-catman .cat
@@ -4125,7 +4125,7 @@
./usr/share/man/html4/axe.html man-sys-htmlman html
./usr/share/man/html4/axen.html man-sys-htmlman html
./usr/share/man/html4/az.html man-sys-htmlman html
-./usr/share/man/html4/azalia.html man-sys-htmlman html
+./usr/share/man/html4/azalia.html man-obsolete obsolete
./usr/share/man/html4/battery_pmu.html man-sys-htmlman html
./usr/share/man/html4/bba.html man-sys-htmlman html
./usr/share/man/html4/bce.html man-sys-htmlman html
@@ -7080,7 +7080,7 @@
./usr/share/man/man4/axe.4 man-sys-man .man
./usr/share/man/man4/axen.4 man-sys-man .man
./usr/share/man/man4/az.4 man-sys-man .man
-./usr/share/man/man4/azalia.4 man-sys-man .man
+./usr/share/man/man4/azalia.4 man-obsolete obsolete
./usr/share/man/man4/battery_pmu.4 man-sys-man .man
./usr/share/man/man4/bba.4 man-sys-man .man
./usr/share/man/man4/bce.4 man-sys-man .man
Index: src/distrib/sets/lists/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.82 src/distrib/sets/lists/modules/md.amd64:1.83
--- src/distrib/sets/lists/modules/md.amd64:1.82 Wed Dec 4 11:47:17 2019
+++ src/distrib/sets/lists/modules/md.amd64 Sun Feb 9 16:06:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.82 2019/12/04 11:47:17 jmcneill Exp $
+# $NetBSD: md.amd64,v 1.83 2020/02/09 16:06:17 jmcneill Exp $
#
# NOTE that there are two sets of files here:
# @MODULEDIR@ and amd64-xen
@@ -45,8 +45,8 @@
./@MODULEDIR@/au8522/au8522.kmod base-kernel-modules kmod
./@MODULEDIR@/auvitek base-kernel-modules kmod
./@MODULEDIR@/auvitek/auvitek.kmod base-kernel-modules kmod
-./@MODULEDIR@/azalia base-kernel-modules kmod
-./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
+./@MODULEDIR@/azalia base-obsolete obsolete
+./@MODULEDIR@/azalia/azalia.kmod base-obsolete obsolete
./@MODULEDIR@/bpfjit base-kernel-modules kmod,sljit
./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod,sljit
./@MODULEDIR@/compat_linux base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.83 src/distrib/sets/lists/modules/md.i386:1.84
--- src/distrib/sets/lists/modules/md.i386:1.83 Wed Dec 4 11:47:17 2019
+++ src/distrib/sets/lists/modules/md.i386 Sun Feb 9 16:06:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.83 2019/12/04 11:47:17 jmcneill Exp $
+# $NetBSD: md.i386,v 1.84 2020/02/09 16:06:17 jmcneill Exp $
#
# NOTE that there are two sets of files here: @MODULEDIR@ and i386pae-xen
#
@@ -47,8 +47,8 @@
./@MODULEDIR@/au8522/au8522.kmod base-kernel-modules kmod
./@MODULEDIR@/auvitek base-kernel-modules kmod
./@MODULEDIR@/auvitek/auvitek.kmod base-kernel-modules kmod
-./@MODULEDIR@/azalia base-kernel-modules kmod
-./@MODULEDIR@/azalia/azalia.kmod base-kernel-modules kmod
+./@MODULEDIR@/azalia base-obsolete obsolete
+./@MODULEDIR@/azalia/azalia.kmod base-obsolete obsolete
./@MODULEDIR@/bpfjit base-kernel-modules kmod,sljit
./@MODULEDIR@/bpfjit/bpfjit.kmod base-kernel-modules kmod,sljit
./@MODULEDIR@/cac_eisa base-obsolete obsolete
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2648 src/doc/CHANGES:1.2649
--- src/doc/CHANGES:1.2648 Sun Feb 2 21:50:21 2020
+++ src/doc/CHANGES Sun Feb 9 16:06:17 2020
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2648 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2649 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -142,3 +142,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
Collect network interface statistics using per-cpu counters
that are collated when they are queried. [thorpej 20200201]
realpath(1): Ported from FreeBSD. [kamil 20200202]
+ kernel: Remove azalia(4). [jmcneill 20200209]
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.701 src/share/man/man4/Makefile:1.702
--- src/share/man/man4/Makefile:1.701 Wed Jan 29 18:39:04 2020
+++ src/share/man/man4/Makefile Sun Feb 9 16:06:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.701 2020/01/29 18:39:04 maya Exp $
+# $NetBSD: Makefile,v 1.702 2020/02/09 16:06:17 jmcneill Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -9,7 +9,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
an.4 aq.4 arcmsr.4 arcofi.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \
ath.4 athn.4 atphy.4 atppc.4 attimer.4 atw.4 \
auacer.4 audio.4 audiocs.4 auich.4 \
- auixp.4 autri.4 auvia.4 awi.4 azalia.4 \
+ auixp.4 autri.4 auvia.4 awi.4 \
battery_pmu.4 bba.4 bce.4 bcsp.4 be.4 bge.4 bnx.4 bha.4 \
bio.4 bktr.4 bluetooth.4 bmtphy.4 bpf.4 bpfjit.4 \
brgphy.4 bridge.4 bthidev.4 bthub.4 btkbd.4 \
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.145 src/sys/arch/amd64/conf/ALL:1.146
--- src/sys/arch/amd64/conf/ALL:1.145 Sat Feb 8 07:07:06 2020
+++ src/sys/arch/amd64/conf/ALL Sun Feb 9 16:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.145 2020/02/08 07:07:06 maxv Exp $
+# $NetBSD: ALL,v 1.146 2020/02/09 16:06:18 jmcneill Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.145 $"
+#ident "ALL-$Revision: 1.146 $"
maxusers 64 # estimated number of users
@@ -1377,7 +1377,6 @@ auich* at pci? dev ? function ? # Intel
auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
-azalia* at pci? dev ? function ? # High Definition Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.561 src/sys/arch/amd64/conf/GENERIC:1.562
--- src/sys/arch/amd64/conf/GENERIC:1.561 Sat Feb 8 07:07:06 2020
+++ src/sys/arch/amd64/conf/GENERIC Sun Feb 9 16:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.561 2020/02/08 07:07:06 maxv Exp $
+# $NetBSD: GENERIC,v 1.562 2020/02/09 16:06:18 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.561 $"
+#ident "GENERIC-$Revision: 1.562 $"
maxusers 64 # estimated number of users
@@ -958,7 +958,6 @@ auich* at pci? dev ? function ? # Intel/
auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
auvia* at pci? dev ? function ? # VIA AC'97 audio
-#azalia* at pci? dev ? function ? # High Definition Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.174 src/sys/arch/amd64/conf/XEN3_DOM0:1.175
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.174 Wed Jan 29 18:39:00 2020
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sun Feb 9 16:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.174 2020/01/29 18:39:00 maya Exp $
+# $NetBSD: XEN3_DOM0,v 1.175 2020/02/09 16:06:18 jmcneill Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.174 $"
+#ident "XEN3_DOM0-$Revision: 1.175 $"
maxusers 32 # estimated number of users
@@ -706,7 +706,6 @@ auich* at pci? dev ? function ? # Intel
auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
-#azalia* at pci? dev ? function ? # High Definition Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.488 src/sys/arch/i386/conf/ALL:1.489
--- src/sys/arch/i386/conf/ALL:1.488 Mon Feb 3 19:37:42 2020
+++ src/sys/arch/i386/conf/ALL Sun Feb 9 16:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.488 2020/02/03 19:37:42 maya Exp $
+# $NetBSD: ALL,v 1.489 2020/02/09 16:06:18 jmcneill Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.488 $"
+#ident "ALL-$Revision: 1.489 $"
maxusers 64 # estimated number of users
@@ -1482,7 +1482,6 @@ auich* at pci? dev ? function ? # Intel
auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
-azalia* at pci? dev ? function ? # High Definition Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1223 src/sys/arch/i386/conf/GENERIC:1.1224
--- src/sys/arch/i386/conf/GENERIC:1.1223 Sat Jan 25 18:38:36 2020
+++ src/sys/arch/i386/conf/GENERIC Sun Feb 9 16:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1223 2020/01/25 18:38:36 thorpej Exp $
+# $NetBSD: GENERIC,v 1.1224 2020/02/09 16:06:18 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1223 $"
+#ident "GENERIC-$Revision: 1.1224 $"
maxusers 64 # estimated number of users
@@ -1203,7 +1203,6 @@ auich* at pci? dev ? function ? # Intel
auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio
autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
-#azalia* at pci? dev ? function ? # High Definition Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.326 src/sys/dev/DEVNAMES:1.327
--- src/sys/dev/DEVNAMES:1.326 Fri Jan 17 15:00:20 2020
+++ src/sys/dev/DEVNAMES Sun Feb 9 16:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.326 2020/01/17 15:00:20 maya Exp $
+# $NetBSD: DEVNAMES,v 1.327 2020/02/09 16:06:18 jmcneill Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -150,7 +150,6 @@ avmebus atari
awi MI
axe MI
az MI
-azalia MI
bah MI
bandit macppc
bba MI
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.425 src/sys/dev/pci/files.pci:1.426
--- src/sys/dev/pci/files.pci:1.425 Sat Jan 25 18:59:43 2020
+++ src/sys/dev/pci/files.pci Sun Feb 9 16:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.425 2020/01/25 18:59:43 thorpej Exp $
+# $NetBSD: files.pci,v 1.426 2020/02/09 16:06:18 jmcneill Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -500,12 +500,6 @@ device auixp: audiobus, ac97, aurateconv
attach auixp at pci
file dev/pci/auixp.c auixp
-# High Definition Audio
-device azalia: audiobus, ac97, aurateconv
-attach azalia at pci
-file dev/pci/azalia.c azalia
-file dev/pci/azalia_codec.c azalia
-
# AMD Geode CS5536 Companion Audio
device gcscaudio: audiobus, ac97, aurateconv
attach gcscaudio at pci
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.237 src/sys/modules/Makefile:1.238
--- src/sys/modules/Makefile:1.237 Tue Jan 21 02:37:16 2020
+++ src/sys/modules/Makefile Sun Feb 9 16:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.237 2020/01/21 02:37:16 pgoyette Exp $
+# $NetBSD: Makefile,v 1.238 2020/02/09 16:06:18 jmcneill Exp $
.include <bsd.own.mk>
@@ -327,7 +327,6 @@ SUBDIR+= viadrmums
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
-SUBDIR+= azalia
SUBDIR+= compat_linux
SUBDIR+= drm
SUBDIR+= drmkms
