Page MenuHomeFreeBSD
Differential D34671

Retire ISA sound card drivers
ClosedPublic
Actions

Authored by emaste on Mar 25 2022, 1:51 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 25, 11:12 AM
Unknown Object (File)
Fri, Mar 21, 3:17 AM
Unknown Object (File)
Mon, Mar 17, 2:56 AM
Unknown Object (File)
Tue, Mar 11, 9:32 AM
Unknown Object (File)
Tue, Mar 11, 8:11 AM
Unknown Object (File)
Feb 23 2025, 3:47 AM
Unknown Object (File)
Feb 20 2025, 1:32 AM
Unknown Object (File)
Feb 17 2025, 4:40 AM
View All Files
Subscribers
None

Details

Reviewers
imp
mav
cy
Commits
rG9054e296819f: Retire ISA sound card DMA support
rGdf51e63eb5d7: Retire snd_ad1816 ISA sound card driver
rGaa83e9b189d6: Retire snd_ess ISA sound card driver
rG754decef384a: Retire snd_gusc ISA sound card driver
rG5126e5eeeb5e: Retire snd_mss ISA sound card driver
rG716924cb4832: Retire snd_sbc ISA sound card driver
Summary

These ISA sound cards are obsolete, and deprecation notices were added in e39ec8933be4.

Delete the now-unused files, but retain isa/sb.h as it is used by some PCI drivers.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste requested review of this revision.Mar 25 2022, 1:51 PM
emaste created this revision.

D34604 for deprecation notices

emaste updated this revision to Diff 104188.Mar 25 2022, 2:00 PM

Delete the leftover files

emaste added inline comments.Mar 25 2022, 4:46 PM
sys/modules/sound/driver/Makefile
8–9

ess again removed locally
(accidentally reappeared in a rebase)

emaste updated this revision to Diff 104216.Mar 26 2022, 1:05 AM
emaste retitled this revision from Disconnect ISA sound cards from the to Retire ISA sound card drivers.
emaste edited the summary of this revision. (Show Details)
emaste added reviewers: imp, mav, cy.
mav added inline comments.Mar 26 2022, 1:31 AM
sys/dev/sound/pcm/buffer.h
34

SNDBUF_F_DMA and SND_DMA() are no longer used. SNDBUF_F_XRUN and SNDBUF_F_RUNNING seems just not used.

sys/dev/sound/pcm/channel.c
32

I guess this is no longer used?

sys/modules/sound/sound/Makefile
42

I guess if we remove opt_isa.h inclusion from channel.c we no longer need this.

emaste updated this revision to Diff 104222.Mar 26 2022, 1:36 AM

Fixups from @mav

mav accepted this revision.Mar 26 2022, 1:52 AM
mav added inline comments.
sys/dev/sound/pcm/buffer.h
52

dmachan and dir seem also no longer used, but I don't insist.

This revision is now accepted and ready to land.Mar 26 2022, 1:52 AM
emaste added a comment.Mar 31 2022, 5:45 PM

I will split this into a series of individual commits so that we could revert a single driver if desired

Closed by commit rG716924cb4832: Retire snd_sbc ISA sound card driver (authored by emaste). · Explain WhyJul 2 2022, 4:13 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rG716924cb4832: Retire snd_sbc ISA sound card driver.
emaste added a commit: rG5126e5eeeb5e: Retire snd_mss ISA sound card driver.Jul 2 2022, 4:23 PM
emaste added a commit: rG754decef384a: Retire snd_gusc ISA sound card driver.Jul 2 2022, 4:27 PM
emaste added a commit: rGaa83e9b189d6: Retire snd_ess ISA sound card driver.Jul 2 2022, 4:32 PM
emaste added a commit: rGdf51e63eb5d7: Retire snd_ad1816 ISA sound card driver.Jul 27 2022, 6:36 PM
emaste added a commit: rG9054e296819f: Retire ISA sound card DMA support.Sep 15 2022, 2:08 PM

Revision Contents
Changeset List

PathSize
9 lines
share/
man/
man4/
7 lines
19 lines
5 lines
sys/
conf/
18 lines
8 lines
dev/
sound/
7 lines
isa/
pcm/
6 lines
7 lines
modules/
sound/
driver/
8 lines
ad1816/
ess/
mss/
sb16/
sb8/
sbc/
sound/
12 lines

Diff 104216

View Options

ObsoleteFiles.inc

Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Lines
#define _NET_VNET_H_ #define _NET_VNET_H_
/* /*
* struct vnet describes a virtualized network stack, and is primarily a * struct vnet describes a virtualized network stack, and is primarily a
* pointer to storage for virtualized global variables. Expose to userspace * pointer to storage for virtualized global variables. Expose to userspace
* as required for libkvm. * as required for libkvm.
*/ */
#if defined(_KERNEL) || defined(_WANT_VNET) #if defined(_KERNEL) || defined(_WANT_VNET)
#include <machine/param.h> /* for CACHE_LINE_SIZE */
glebiusUnsubmitted
Not Done
Inline Actions

Why is this change in here?

glebius: Why is this change in here?
karelsAuthorUnsubmitted
Done
Inline Actions

It was required to get in.c to compile with vnet.h. It could be in a separate commit, although it would not make vnet.h self-sufficient.

karels: It was required to get in.c to compile with vnet.h. It could be in a separate commit, although…
bzUnsubmitted
Not Done
Inline Actions

What was the error that cannot be fixed in the in.c code itself? It seems wrong here.

bz: What was the error that cannot be fixed in the in.c code itself? It seems wrong here.
karelsAuthorUnsubmitted
Done
Inline Actions

Correction: in.c compiles without this include, but other users of in.h fail if it includes vnet.h, such as nlm/sm_inter_xdr.c.

karels: Correction: in.c compiles without this include, but other users of in.h fail if it includes…
bzUnsubmitted
Not Done
Inline Actions

Well, that file clearly violates FreeBSD expectations (being generated or not). The problem needs to be fixed there.

style.9:

Kernel include files (sys/*.h) come first.  If <sys/cdefs.h> is needed
for __FBSDID(), include it first.  If either <sys/types.h> or
<sys/param.h> is needed, include it before other include files.
(<sys/param.h> includes <sys/types.h>; do not include both.) Next,
include <sys/systm.h>, if needed.  The remaining kernel headers should be
sorted alphabetically.

and nlm/sm_inter_xdr.c.

#include <nlm/sm_inter.h>
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");

and them all the way down to sys/rpc/rpc.h and from there to netinet/in.h L423. Sad this is all so IPv4-only stuff still .. but that's a different problem.

bz: Well, that file clearly violates FreeBSD expectations (being generated or not). The problem…
#include <sys/queue.h> #include <sys/queue.h>
struct vnet { struct vnet {
LIST_ENTRY(vnet) vnet_le; /* all vnets list */ LIST_ENTRY(vnet) vnet_le; /* all vnets list */
u_int vnet_magic_n; u_int vnet_magic_n;
u_int vnet_ifcnt; u_int vnet_ifcnt;
u_int vnet_sockcnt; u_int vnet_sockcnt;
u_int vnet_state; /* SI_SUB_* */ u_int vnet_state; /* SI_SUB_* */
▲ Show 20 Lines • Show All 387 Lines • Show Last 20 Lines
View Options

share/man/man4/Makefile

Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Lines
#define _NET_VNET_H_ #define _NET_VNET_H_
/* /*
* struct vnet describes a virtualized network stack, and is primarily a * struct vnet describes a virtualized network stack, and is primarily a
* pointer to storage for virtualized global variables. Expose to userspace * pointer to storage for virtualized global variables. Expose to userspace
* as required for libkvm. * as required for libkvm.
*/ */
#if defined(_KERNEL) || defined(_WANT_VNET) #if defined(_KERNEL) || defined(_WANT_VNET)
#include <machine/param.h> /* for CACHE_LINE_SIZE */
glebiusUnsubmitted
Not Done
Inline Actions

Why is this change in here?

glebius: Why is this change in here?
karelsAuthorUnsubmitted
Done
Inline Actions

It was required to get in.c to compile with vnet.h. It could be in a separate commit, although it would not make vnet.h self-sufficient.

karels: It was required to get in.c to compile with vnet.h. It could be in a separate commit, although…
bzUnsubmitted
Not Done
Inline Actions

What was the error that cannot be fixed in the in.c code itself? It seems wrong here.

bz: What was the error that cannot be fixed in the in.c code itself? It seems wrong here.
karelsAuthorUnsubmitted
Done
Inline Actions

Correction: in.c compiles without this include, but other users of in.h fail if it includes vnet.h, such as nlm/sm_inter_xdr.c.

karels: Correction: in.c compiles without this include, but other users of in.h fail if it includes…
bzUnsubmitted
Not Done
Inline Actions

Well, that file clearly violates FreeBSD expectations (being generated or not). The problem needs to be fixed there.

style.9:

Kernel include files (sys/*.h) come first.  If <sys/cdefs.h> is needed
for __FBSDID(), include it first.  If either <sys/types.h> or
<sys/param.h> is needed, include it before other include files.
(<sys/param.h> includes <sys/types.h>; do not include both.) Next,
include <sys/systm.h>, if needed.  The remaining kernel headers should be
sorted alphabetically.

and nlm/sm_inter_xdr.c.

#include <nlm/sm_inter.h>
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");

and them all the way down to sys/rpc/rpc.h and from there to netinet/in.h L423. Sad this is all so IPv4-only stuff still .. but that's a different problem.

bz: Well, that file clearly violates FreeBSD expectations (being generated or not). The problem…
#include <sys/queue.h> #include <sys/queue.h>
struct vnet { struct vnet {
LIST_ENTRY(vnet) vnet_le; /* all vnets list */ LIST_ENTRY(vnet) vnet_le; /* all vnets list */
u_int vnet_magic_n; u_int vnet_magic_n;
u_int vnet_ifcnt; u_int vnet_ifcnt;
u_int vnet_sockcnt; u_int vnet_sockcnt;
u_int vnet_state; /* SI_SUB_* */ u_int vnet_state; /* SI_SUB_* */
▲ Show 20 Lines • Show All 387 Lines • Show Last 20 Lines
View Options

share/man/man4/pcm.4

Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Lines
#define _NET_VNET_H_ #define _NET_VNET_H_
/* /*
* struct vnet describes a virtualized network stack, and is primarily a * struct vnet describes a virtualized network stack, and is primarily a
* pointer to storage for virtualized global variables. Expose to userspace * pointer to storage for virtualized global variables. Expose to userspace
* as required for libkvm. * as required for libkvm.
*/ */
#if defined(_KERNEL) || defined(_WANT_VNET) #if defined(_KERNEL) || defined(_WANT_VNET)
#include <machine/param.h> /* for CACHE_LINE_SIZE */
glebiusUnsubmitted
Not Done
Inline Actions

Why is this change in here?

glebius: Why is this change in here?
karelsAuthorUnsubmitted
Done
Inline Actions

It was required to get in.c to compile with vnet.h. It could be in a separate commit, although it would not make vnet.h self-sufficient.

karels: It was required to get in.c to compile with vnet.h. It could be in a separate commit, although…
bzUnsubmitted
Not Done
Inline Actions

What was the error that cannot be fixed in the in.c code itself? It seems wrong here.

bz: What was the error that cannot be fixed in the in.c code itself? It seems wrong here.
karelsAuthorUnsubmitted
Done
Inline Actions

Correction: in.c compiles without this include, but other users of in.h fail if it includes vnet.h, such as nlm/sm_inter_xdr.c.

karels: Correction: in.c compiles without this include, but other users of in.h fail if it includes…
bzUnsubmitted
Not Done
Inline Actions

Well, that file clearly violates FreeBSD expectations (being generated or not). The problem needs to be fixed there.

style.9:

Kernel include files (sys/*.h) come first.  If <sys/cdefs.h> is needed
for __FBSDID(), include it first.  If either <sys/types.h> or
<sys/param.h> is needed, include it before other include files.
(<sys/param.h> includes <sys/types.h>; do not include both.) Next,
include <sys/systm.h>, if needed.  The remaining kernel headers should be
sorted alphabetically.

and nlm/sm_inter_xdr.c.

#include <nlm/sm_inter.h>
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");

and them all the way down to sys/rpc/rpc.h and from there to netinet/in.h L423. Sad this is all so IPv4-only stuff still .. but that's a different problem.

bz: Well, that file clearly violates FreeBSD expectations (being generated or not). The problem…
#include <sys/queue.h> #include <sys/queue.h>
struct vnet { struct vnet {
LIST_ENTRY(vnet) vnet_le; /* all vnets list */ LIST_ENTRY(vnet) vnet_le; /* all vnets list */
u_int vnet_magic_n; u_int vnet_magic_n;
u_int vnet_ifcnt; u_int vnet_ifcnt;
u_int vnet_sockcnt; u_int vnet_sockcnt;
u_int vnet_state; /* SI_SUB_* */ u_int vnet_state; /* SI_SUB_* */
▲ Show 20 Lines • Show All 387 Lines • Show Last 20 Lines
View Options

share/man/man4/snd_ad1816.4

Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Lines
#define _NET_VNET_H_ #define _NET_VNET_H_
/* /*
* struct vnet describes a virtualized network stack, and is primarily a * struct vnet describes a virtualized network stack, and is primarily a
* pointer to storage for virtualized global variables. Expose to userspace * pointer to storage for virtualized global variables. Expose to userspace
* as required for libkvm. * as required for libkvm.
*/ */
#if defined(_KERNEL) || defined(_WANT_VNET) #if defined(_KERNEL) || defined(_WANT_VNET)
#include <machine/param.h> /* for CACHE_LINE_SIZE */
glebiusUnsubmitted
Not Done
Inline Actions

Why is this change in here?

glebius: Why is this change in here?
karelsAuthorUnsubmitted
Done
Inline Actions

It was required to get in.c to compile with vnet.h. It could be in a separate commit, although it would not make vnet.h self-sufficient.

karels: It was required to get in.c to compile with vnet.h. It could be in a separate commit, although…
bzUnsubmitted
Not Done
Inline Actions

What was the error that cannot be fixed in the in.c code itself? It seems wrong here.

bz: What was the error that cannot be fixed in the in.c code itself? It seems wrong here.
karelsAuthorUnsubmitted
Done
Inline Actions

Correction: in.c compiles without this include, but other users of in.h fail if it includes vnet.h, such as nlm/sm_inter_xdr.c.

karels: Correction: in.c compiles without this include, but other users of in.h fail if it includes…
bzUnsubmitted
Not Done
Inline Actions

Well, that file clearly violates FreeBSD expectations (being generated or not). The problem needs to be fixed there.

style.9:

Kernel include files (sys/*.h) come first.  If <sys/cdefs.h> is needed
for __FBSDID(), include it first.  If either <sys/types.h> or
<sys/param.h> is needed, include it before other include files.
(<sys/param.h> includes <sys/types.h>; do not include both.) Next,
include <sys/systm.h>, if needed.  The remaining kernel headers should be
sorted alphabetically.

and nlm/sm_inter_xdr.c.

#include <nlm/sm_inter.h>
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");

and them all the way down to sys/rpc/rpc.h and from there to netinet/in.h L423. Sad this is all so IPv4-only stuff still .. but that's a different problem.

bz: Well, that file clearly violates FreeBSD expectations (being generated or not). The problem…
#include <sys/queue.h> #include <sys/queue.h>
struct vnet { struct vnet {
LIST_ENTRY(vnet) vnet_le; /* all vnets list */ LIST_ENTRY(vnet) vnet_le; /* all vnets list */
u_int vnet_magic_n; u_int vnet_magic_n;
u_int vnet_ifcnt; u_int vnet_ifcnt;
u_int vnet_sockcnt; u_int vnet_sockcnt;
u_int vnet_state; /* SI_SUB_* */ u_int vnet_state; /* SI_SUB_* */
▲ Show 20 Lines • Show All 387 Lines • Show Last 20 Lines
View Options

share/man/man4/snd_ess.4

Loading...
View Options

share/man/man4/snd_gusc.4

Loading...
View Options

share/man/man4/snd_mss.4

Loading...
View Options

share/man/man4/snd_sbc.4

Loading...
View Options

share/man/man4/snd_solo.4

Loading...
View Options

sys/conf/NOTES

Loading...
View Options

sys/conf/files

Loading...
View Options

sys/dev/sound/driver.c

Loading...
View Options

sys/dev/sound/isa/ad1816.h

Loading...
View Options

sys/dev/sound/isa/ad1816.c

Loading...
View Options

sys/dev/sound/isa/ess.c

Loading...
View Options

sys/dev/sound/isa/gusc.c

Loading...
View Options

sys/dev/sound/isa/mss.h

Loading...
View Options

sys/dev/sound/isa/mss.c

Loading...
View Options

sys/dev/sound/isa/sb16.c

Loading...
View Options

sys/dev/sound/isa/sb8.c

Loading...
View Options

sys/dev/sound/isa/sbc.c

Loading...
View Options

sys/dev/sound/isa/sndbuf_dma.c

Loading...
View Options

sys/dev/sound/pcm/buffer.h

Loading...
View Options

sys/dev/sound/pcm/channel.c

Loading...
View Options

sys/modules/sound/driver/Makefile

Loading...
View Options

sys/modules/sound/driver/ad1816/Makefile

Loading...
View Options

sys/modules/sound/driver/ess/Makefile

Loading...
View Options

sys/modules/sound/driver/mss/Makefile

Loading...
View Options

sys/modules/sound/driver/sb16/Makefile

Loading...
View Options

sys/modules/sound/driver/sb8/Makefile

Loading...
View Options

sys/modules/sound/driver/sbc/Makefile

Loading...
View Options

sys/modules/sound/sound/Makefile

Loading...