audio(9) cleanup demands removing a member from this struct, which is
cumbersome in our current tree as drivers initialise it inconsistently,
i.e. a simple removal of ".member_name = driver_func," is not always
possible.
Most drivers call their driver_*() functions like the member name,
- some vary slightly, e.g. ".allocm = driver_alloc,"
- some read vague, e.g. ".round_buffersize = driver_round," where
.round_blocksize also exists
- some have the member name as comment, on both functions and NULL lines
- some use 0 not NULL
Use C99 style everywhere for consistency and clarity, getting rid of all
annoying differences and allow for clear member removals/additions:
- dont change current order of members
- no explicit NULL members
- no comments or blank lines
- trailing comma in last member line
GENERIC.MP builds fine with this diff on arm64, amd64, i386 and sparc64.
I should be able to test macppc soon.
Feedback? Objection? OK?
NB: `git diff --word-diff --color' really helps seeing actual change.
---
sys/arch/hppa/gsc/harmony.c | 38 ++++++---------
sys/arch/luna88k/cbus/nec86.c | 5 --
sys/arch/macppc/dev/aoa.c | 36 ++++++--------
sys/arch/macppc/dev/awacs.c | 36 ++++++--------
sys/arch/macppc/dev/daca.c | 36 ++++++--------
sys/arch/macppc/dev/onyx.c | 36 ++++++--------
sys/arch/macppc/dev/snapper.c | 36 ++++++--------
sys/arch/macppc/dev/tumbler.c | 36 ++++++--------
sys/arch/sparc64/dev/ce4231.c | 37 ++++++--------
sys/dev/isa/ess.c | 76 ++++++++++++-----------------
sys/dev/isa/gus.c | 91 +++++++++++++----------------------
sys/dev/isa/pas.c | 38 ++++++---------
sys/dev/isa/sb.c | 38 ++++++---------
sys/dev/pci/auacer.c | 37 ++++++--------
14 files changed, 228 insertions(+), 348 deletions(-)
diff --git a/sys/arch/hppa/gsc/harmony.c b/sys/arch/hppa/gsc/harmony.c
index ade991c17c2..6823cda936e 100644
--- a/sys/arch/hppa/gsc/harmony.c
+++ b/sys/arch/hppa/gsc/harmony.c
@@ -74,28 +74,22 @@ int harmony_trigger_input(void *, void *, void *, int,
void (*intr)(void *), void *, struct audio_params *);
const struct audio_hw_if harmony_sa_hw_if = {
- harmony_open,
- harmony_close,
- harmony_set_params,
- harmony_round_blocksize,
- harmony_commit_settings,
- NULL,
- NULL,
- NULL,
- NULL,
- harmony_halt_output,
- harmony_halt_input,
- NULL,
- NULL,
- harmony_set_port,
- harmony_get_port,
- harmony_query_devinfo,
- harmony_allocm,
- harmony_freem,
- harmony_round_buffersize,
- harmony_get_props,
- harmony_trigger_output,
- harmony_trigger_input
+ .open = harmony_open,
+ .close = harmony_close,
+ .set_params = harmony_set_params,
+ .round_blocksize = harmony_round_blocksize,
+ .commit_settings = harmony_commit_settings,
+ .halt_output = harmony_halt_output,
+ .halt_input = harmony_halt_input,
+ .set_port = harmony_set_port,
+ .get_port = harmony_get_port,
+ .query_devinfo = harmony_query_devinfo,
+ .allocm = harmony_allocm,
+ .freem = harmony_freem,
+ .round_buffersize = harmony_round_buffersize,
+ .get_props = harmony_get_props,
+ .trigger_output = harmony_trigger_output,
+ .trigger_input = harmony_trigger_input,
};
int harmony_match(struct device *, void *, void *);
diff --git a/sys/arch/luna88k/cbus/nec86.c b/sys/arch/luna88k/cbus/nec86.c
index eec75a8f4ac..2d2d965d1bc 100644
--- a/sys/arch/luna88k/cbus/nec86.c
+++ b/sys/arch/luna88k/cbus/nec86.c
@@ -84,12 +84,7 @@ const struct audio_hw_if nec86_hw_if = {
.set_port = nec86hw_mixer_set_port,
.get_port = nec86hw_mixer_get_port,
.query_devinfo = nec86hw_mixer_query_devinfo,
- .allocm = NULL,
- .freem = NULL,
- .round_buffersize = NULL,
.get_props = nec86_get_props,
- .trigger_output = NULL,
- .trigger_input = NULL
};
/*
diff --git a/sys/arch/macppc/dev/aoa.c b/sys/arch/macppc/dev/aoa.c
index f6372876a4d..39dfaa526c3 100644
--- a/sys/arch/macppc/dev/aoa.c
+++ b/sys/arch/macppc/dev/aoa.c
@@ -66,28 +66,20 @@ struct cfdriver aoa_cd = {
};
const struct audio_hw_if aoa_hw_if = {
- i2s_open,
- i2s_close,
- i2s_set_params,
- i2s_round_blocksize,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- i2s_halt_output,
- i2s_halt_input,
- NULL,
- NULL,
- i2s_set_port,
- i2s_get_port,
- i2s_query_devinfo,
- i2s_allocm,
- NULL,
- i2s_round_buffersize,
- i2s_get_props,
- i2s_trigger_output,
- i2s_trigger_input
+ .open = i2s_open,
+ .close = i2s_close,
+ .set_params = i2s_set_params,
+ .round_blocksize = i2s_round_blocksize,
+ .halt_output = i2s_halt_output,
+ .halt_input = i2s_halt_input,
+ .set_port = i2s_set_port,
+ .get_port = i2s_get_port,
+ .query_devinfo = i2s_query_devinfo,
+ .allocm = i2s_allocm,
+ .round_buffersize = i2s_round_buffersize,
+ .get_props = i2s_get_props,
+ .trigger_output = i2s_trigger_output,
+ .trigger_input = i2s_trigger_input,
};
int
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c
index bd5dcbb2273..5e2b9d96c9b 100644
--- a/sys/arch/macppc/dev/awacs.c
+++ b/sys/arch/macppc/dev/awacs.c
@@ -127,28 +127,20 @@ struct cfdriver awacs_cd = {
};
const struct audio_hw_if awacs_hw_if = {
- awacs_open,
- awacs_close,
- awacs_set_params,
- awacs_round_blocksize,
- NULL, /* commit_setting */
- NULL, /* init_output */
- NULL, /* init_input */
- NULL, /* start_output */
- NULL, /* start_input */
- awacs_halt_output,
- awacs_halt_input,
- NULL, /* speaker_ctl */
- NULL, /* getfd */
- awacs_set_port,
- awacs_get_port,
- awacs_query_devinfo,
- awacs_allocm, /* allocm */
- NULL, /* freem */
- awacs_round_buffersize, /* round_buffersize */
- awacs_get_props,
- awacs_trigger_output,
- awacs_trigger_input
+ .open = awacs_open,
+ .close = awacs_close,
+ .set_params = awacs_set_params,
+ .round_blocksize = awacs_round_blocksize,
+ .halt_output = awacs_halt_output,
+ .halt_input = awacs_halt_input,
+ .set_port = awacs_set_port,
+ .get_port = awacs_get_port,
+ .query_devinfo = awacs_query_devinfo,
+ .allocm = awacs_allocm,
+ .round_buffersize = awacs_round_buffersize,
+ .get_props = awacs_get_props,
+ .trigger_output = awacs_trigger_output,
+ .trigger_input = awacs_trigger_input,
};
/* register offset */
diff --git a/sys/arch/macppc/dev/daca.c b/sys/arch/macppc/dev/daca.c
index 178b1daeb59..74f306125bc 100644
--- a/sys/arch/macppc/dev/daca.c
+++ b/sys/arch/macppc/dev/daca.c
@@ -72,28 +72,20 @@ struct cfdriver daca_cd = {
};
const struct audio_hw_if daca_hw_if = {
- i2s_open,
- i2s_close,
- i2s_set_params,
- i2s_round_blocksize,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- i2s_halt_output,
- i2s_halt_input,
- NULL,
- NULL,
- i2s_set_port,
- i2s_get_port,
- i2s_query_devinfo,
- i2s_allocm, /* allocm */
- NULL,
- i2s_round_buffersize,
- i2s_get_props,
- i2s_trigger_output,
- i2s_trigger_input
+ .open = i2s_open,
+ .close = i2s_close,
+ .set_params = i2s_set_params,
+ .round_blocksize = i2s_round_blocksize,
+ .halt_output = i2s_halt_output,
+ .halt_input = i2s_halt_input,
+ .set_port = i2s_set_port,
+ .get_port = i2s_get_port,
+ .query_devinfo = i2s_query_devinfo,
+ .allocm = i2s_allocm,
+ .round_buffersize = i2s_round_buffersize,
+ .get_props = i2s_get_props,
+ .trigger_output = i2s_trigger_output,
+ .trigger_input = i2s_trigger_input,
};
/* DAC3550A registers */
diff --git a/sys/arch/macppc/dev/onyx.c b/sys/arch/macppc/dev/onyx.c
index 989ed3db5d5..ee81b46c7eb 100644
--- a/sys/arch/macppc/dev/onyx.c
+++ b/sys/arch/macppc/dev/onyx.c
@@ -81,28 +81,20 @@ struct cfdriver onyx_cd = {
};
const struct audio_hw_if onyx_hw_if = {
- i2s_open,
- i2s_close,
- i2s_set_params,
- i2s_round_blocksize,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- i2s_halt_output,
- i2s_halt_input,
- NULL,
- NULL,
- i2s_set_port,
- i2s_get_port,
- i2s_query_devinfo,
- i2s_allocm,
- NULL,
- i2s_round_buffersize,
- i2s_get_props,
- i2s_trigger_output,
- i2s_trigger_input
+ .open = i2s_open,
+ .close = i2s_close,
+ .set_params = i2s_set_params,
+ .round_blocksize = i2s_round_blocksize,
+ .halt_output =i2s_halt_output,
+ .halt_input = i2s_halt_input,
+ .set_port = i2s_set_port,
+ .get_port = i2s_get_port,
+ .query_devinfo = i2s_query_devinfo,
+ .allocm = i2s_allocm,
+ .round_buffersize = i2s_round_buffersize,
+ .get_props = i2s_get_props,
+ .trigger_output = i2s_trigger_output,
+ .trigger_input = i2s_trigger_input,
};
int
diff --git a/sys/arch/macppc/dev/snapper.c b/sys/arch/macppc/dev/snapper.c
index e4ce4077064..3f933ab2d7b 100644
--- a/sys/arch/macppc/dev/snapper.c
+++ b/sys/arch/macppc/dev/snapper.c
@@ -78,28 +78,20 @@ struct cfdriver snapper_cd = {
};
const struct audio_hw_if snapper_hw_if = {
- i2s_open,
- i2s_close,
- i2s_set_params,
- i2s_round_blocksize,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- i2s_halt_output,
- i2s_halt_input,
- NULL,
- NULL,
- i2s_set_port,
- i2s_get_port,
- i2s_query_devinfo,
- i2s_allocm, /* allocm */
- NULL,
- i2s_round_buffersize,
- i2s_get_props,
- i2s_trigger_output,
- i2s_trigger_input
+ .open = i2s_open,
+ .close = i2s_close,
+ .set_params = i2s_set_params,
+ .round_blocksize = i2s_round_blocksize,
+ .halt_output = i2s_halt_output,
+ .halt_input = i2s_halt_input,
+ .set_port = i2s_set_port,
+ .get_port = i2s_get_port,
+ .query_devinfo = i2s_query_devinfo,
+ .allocm = i2s_allocm,
+ .round_buffersize = i2s_round_buffersize,
+ .get_props = i2s_get_props,
+ .trigger_output = i2s_trigger_output,
+ .trigger_input = i2s_trigger_input,
};
const uint8_t snapper_trebletab[] = {
diff --git a/sys/arch/macppc/dev/tumbler.c b/sys/arch/macppc/dev/tumbler.c
index fbc343b7c66..cac03238d7a 100644
--- a/sys/arch/macppc/dev/tumbler.c
+++ b/sys/arch/macppc/dev/tumbler.c
@@ -76,28 +76,20 @@ struct cfdriver tumbler_cd = {
};
const struct audio_hw_if tumbler_hw_if = {
- i2s_open,
- i2s_close,
- i2s_set_params,
- i2s_round_blocksize,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- i2s_halt_output,
- i2s_halt_input,
- NULL,
- NULL,
- i2s_set_port,
- i2s_get_port,
- i2s_query_devinfo,
- i2s_allocm, /* allocm */
- NULL,
- i2s_round_buffersize,
- i2s_get_props,
- i2s_trigger_output,
- i2s_trigger_input
+ .open = i2s_open,
+ .close = i2s_close,
+ .set_params = i2s_set_params,
+ .round_blocksize = i2s_round_blocksize,
+ .halt_output = i2s_halt_output,
+ .halt_input = i2s_halt_input,
+ .set_port = i2s_set_port,
+ .get_port = i2s_get_port,
+ .query_devinfo = i2s_query_devinfo,
+ .allocm = i2s_allocm,
+ .round_buffersize = i2s_round_buffersize,
+ .get_props = i2s_get_props,
+ .trigger_output = i2s_trigger_output,
+ .trigger_input = i2s_trigger_input,
};
const uint8_t tumbler_trebletab[] = {
diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c
index edd74d38c86..db370904fa8 100644
--- a/sys/arch/sparc64/dev/ce4231.c
+++ b/sys/arch/sparc64/dev/ce4231.c
@@ -151,28 +151,21 @@ int ce4231_trigger_input(void *, void *, void *,
int,
void (*intr)(void *), void *arg, struct audio_params *);
const struct audio_hw_if ce4231_sa_hw_if = {
- ce4231_open,
- ce4231_close,
- ce4231_set_params,
- ce4231_round_blocksize,
- ce4231_commit_settings,
- 0,
- 0,
- 0,
- 0,
- ce4231_halt_output,
- ce4231_halt_input,
- 0,
- 0,
- ce4231_set_port,
- ce4231_get_port,
- ce4231_query_devinfo,
- ce4231_alloc,
- ce4231_free,
- 0,
- ce4231_get_props,
- ce4231_trigger_output,
- ce4231_trigger_input
+ .open = ce4231_open,
+ .close = ce4231_close,
+ .set_params = ce4231_set_params,
+ .round_blocksize = ce4231_round_blocksize,
+ .commit_settings = ce4231_commit_settings,
+ .halt_output = ce4231_halt_output,
+ .halt_input = ce4231_halt_input,
+ .set_port = ce4231_set_port,
+ .get_port = ce4231_get_port,
+ .query_devinfo = ce4231_query_devinfo,
+ .allocm = ce4231_alloc,
+ .freem = ce4231_free,
+ .get_props = ce4231_get_props,
+ .trigger_output = ce4231_trigger_output,
+ .trigger_input = ce4231_trigger_input,
};
const struct cfattach audioce_ca = {
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index aab79005463..1165d8e474b 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -198,53 +198,41 @@ static char *essmodel[] = {
*/
const struct audio_hw_if ess_1788_hw_if = {
- ess_open,
- ess_1788_close,
- ess_set_params,
- ess_round_blocksize,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- ess_audio1_halt,
- ess_audio1_halt,
- ess_speaker_ctl,
- NULL,
- ess_set_port,
- ess_get_port,
- ess_query_devinfo,
- ess_malloc,
- ess_free,
- ess_round_buffersize,
- ess_1788_get_props,
- ess_audio1_trigger_output,
- ess_audio1_trigger_input
+ .open = ess_open,
+ .close = ess_1788_close,
+ .set_params = ess_set_params,
+ .round_blocksize = ess_round_blocksize,
+ .halt_output = ess_audio1_halt,
+ .halt_input = ess_audio1_halt,
+ .speaker_ctl = ess_speaker_ctl,
+ .set_port = ess_set_port,
+ .get_port = ess_get_port,
+ .query_devinfo = ess_query_devinfo,
+ .allocm = ess_malloc,
+ .freem = ess_free,
+ .round_buffersize = ess_round_buffersize,
+ .get_props = ess_1788_get_props,
+ .trigger_output = ess_audio1_trigger_output,
+ .trigger_input = ess_audio1_trigger_input,
};
const struct audio_hw_if ess_1888_hw_if = {
- ess_open,
- ess_1888_close,
- ess_set_params,
- ess_round_blocksize,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- ess_audio2_halt,
- ess_audio1_halt,
- ess_speaker_ctl,
- NULL,
- ess_set_port,
- ess_get_port,
- ess_query_devinfo,
- ess_malloc,
- ess_free,
- ess_round_buffersize,
- ess_1888_get_props,
- ess_audio2_trigger_output,
- ess_audio1_trigger_input
+ .open = ess_open,
+ .close = ess_1888_close,
+ .set_params = ess_set_params,
+ .round_blocksize = ess_round_blocksize,
+ .halt_output = ess_audio2_halt,
+ .halt_input = ess_audio1_halt,
+ .speaker_ctl = ess_speaker_ctl,
+ .set_port = ess_set_port,
+ .get_port = ess_get_port,
+ .query_devinfo = ess_query_devinfo,
+ .allocm = ess_malloc,
+ .freem = ess_free,
+ .round_buffersize = ess_round_buffersize,
+ .get_props = ess_1888_get_props,
+ .trigger_output = ess_audio2_trigger_output,
+ .trigger_input = ess_audio1_trigger_input,
};
#ifdef AUDIO_DEBUG
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 174989317d4..fe424497636 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -261,66 +261,43 @@ static const unsigned short gus_log_volumes[512] = {
* Interface to higher level audio driver
*/
const struct audio_hw_if gus_hw_if = {
- gusopen,
- gusclose,
- gus_set_params,
-
- gus_round_blocksize,
-
- gus_commit_settings,
-
- NULL,
- NULL,
-
- gus_dma_output,
- gus_dma_input,
- gus_halt_out_dma,
- gus_halt_in_dma,
- gus_speaker_ctl,
-
- NULL,
- gus_mixer_set_port,
- gus_mixer_get_port,
- gus_mixer_query_devinfo,
- gus_malloc,
- gus_free,
- gus_round,
- gus_get_props,
-
- NULL,
- NULL
+ .open = gusopen,
+ .close = gusclose,
+ .set_params = gus_set_params,
+ .round_blocksize = gus_round_blocksize,
+ .commit_settings = gus_commit_settings,
+ .start_output = gus_dma_output,
+ .start_input = gus_dma_input,
+ .halt_output = gus_halt_out_dma,
+ .halt_input = gus_halt_in_dma,
+ .speaker_ctl = gus_speaker_ctl,
+ .set_port = gus_mixer_set_port,
+ .get_port = gus_mixer_get_port,
+ .query_devinfo = gus_mixer_query_devinfo,
+ .allocm = gus_malloc,
+ .freem = gus_free,
+ .round_buffersize = gus_round,
+ .get_props = gus_get_props,
};
static const struct audio_hw_if gusmax_hw_if = {
- gusmaxopen,
- gusmax_close,
- gusmax_set_params,
-
- gusmax_round_blocksize,
-
- gusmax_commit_settings,
-
- NULL,
- NULL,
-
- gusmax_dma_output,
- gusmax_dma_input,
- gusmax_halt_out_dma,
- gusmax_halt_in_dma,
-
- gusmax_speaker_ctl,
-
- NULL,
- gusmax_mixer_set_port,
- gusmax_mixer_get_port,
- gusmax_mixer_query_devinfo,
- ad1848_malloc,
- ad1848_free,
- ad1848_round,
- gusmax_get_props,
-
- NULL,
- NULL
+ .open = gusmaxopen,
+ .close = gusmax_close,
+ .set_params = gusmax_set_params,
+ .round_blocksize = gusmax_round_blocksize,
+ .commit_settings = gusmax_commit_settings,
+ .start_output = gusmax_dma_output,
+ .start_input = gusmax_dma_input,
+ .halt_output = gusmax_halt_out_dma,
+ .halt_input = gusmax_halt_in_dma,
+ .speaker_ctl = gusmax_speaker_ctl,
+ .set_port = gusmax_mixer_set_port,
+ .get_port = gusmax_mixer_get_port,
+ .query_devinfo = gusmax_mixer_query_devinfo,
+ .allocm = ad1848_malloc,
+ .freem = ad1848_free,
+ .round_buffersize = ad1848_round,
+ .get_props = gusmax_get_props,
};
int
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index 4c9d01f294f..ee82aa31813 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -109,28 +109,22 @@ void pasconf(int, int, int, int);
*/
const struct audio_hw_if pas_hw_if = {
- sbdsp_open,
- sbdsp_close,
- sbdsp_set_params,
- sbdsp_round_blocksize,
- 0,
- 0,
- 0,
- 0,
- 0,
- sbdsp_haltdma,
- sbdsp_haltdma,
- sbdsp_speaker_ctl,
- 0,
- sbdsp_mixer_set_port,
- sbdsp_mixer_get_port,
- sbdsp_mixer_query_devinfo,
- sb_malloc,
- sb_free,
- sb_round,
- sbdsp_get_props,
- sbdsp_trigger_output,
- sbdsp_trigger_input
+ .open = sbdsp_open,
+ .close = sbdsp_close,
+ .set_params = sbdsp_set_params,
+ .round_blocksize = sbdsp_round_blocksize,
+ .halt_output = sbdsp_haltdma,
+ .halt_input = sbdsp_haltdma,
+ .speaker_ctl = sbdsp_speaker_ctl,
+ .set_port = sbdsp_mixer_set_port,
+ .get_port = sbdsp_mixer_get_port,
+ .query_devinfo = sbdsp_mixer_query_devinfo,
+ .allocm = sb_malloc,
+ .freem = sb_free,
+ .round_buffersize = sb_round,
+ .get_props = sbdsp_get_props,
+ .trigger_output = sbdsp_trigger_output,
+ .trigger_input = sbdsp_trigger_input,
};
/* The Address Translation code is used to convert I/O register addresses to
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 75779266311..ba6afe6e5b1 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -94,28 +94,22 @@ const struct midi_hw_if sb_mpu401_hw_if = {
*/
const struct audio_hw_if sb_hw_if = {
- sbdsp_open,
- sbdsp_close,
- sbdsp_set_params,
- sbdsp_round_blocksize,
- 0,
- 0,
- 0,
- 0,
- 0,
- sbdsp_haltdma,
- sbdsp_haltdma,
- sbdsp_speaker_ctl,
- 0,
- sbdsp_mixer_set_port,
- sbdsp_mixer_get_port,
- sbdsp_mixer_query_devinfo,
- sb_malloc,
- sb_free,
- sb_round,
- sbdsp_get_props,
- sbdsp_trigger_output,
- sbdsp_trigger_input
+ .open = sbdsp_open,
+ .close = sbdsp_close,
+ .set_params = sbdsp_set_params,
+ .round_blocksize = sbdsp_round_blocksize,
+ .halt_output = sbdsp_haltdma,
+ .halt_input = sbdsp_haltdma,
+ .speaker_ctl = sbdsp_speaker_ctl,
+ .set_port = sbdsp_mixer_set_port,
+ .get_port = sbdsp_mixer_get_port,
+ .query_devinfo = sbdsp_mixer_query_devinfo,
+ .allocm = sb_malloc,
+ .freem = sb_free,
+ .round_buffersize = sb_round,
+ .get_props = sbdsp_get_props,
+ .trigger_output = sbdsp_trigger_output,
+ .trigger_input = sbdsp_trigger_input,
};
#ifdef AUDIO_DEBUG
diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index ee26ab75569..bac46e878a9 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -180,28 +180,21 @@ void auacer_finish_attach(struct device *);
static void auacer_reset(struct auacer_softc *sc);
const struct audio_hw_if auacer_hw_if = {
- auacer_open,
- auacer_close,
- auacer_set_params,
- auacer_round_blocksize,
- NULL, /* commit_setting */
- NULL, /* init_output */
- NULL, /* init_input */
- NULL, /* start_output */
- NULL, /* start_input */
- auacer_halt_output,
- auacer_halt_input,
- NULL, /* speaker_ctl */
- NULL, /* getfd */
- auacer_set_port,
- auacer_get_port,
- auacer_query_devinfo,
- auacer_allocm,
- auacer_freem,
- auacer_round_buffersize,
- auacer_get_props,
- auacer_trigger_output,
- auacer_trigger_input
+ .open = auacer_open,
+ .close = auacer_close,
+ .set_params = auacer_set_params,
+ .round_blocksize = auacer_round_blocksize,
+ .halt_output = auacer_halt_output,
+ .halt_input = auacer_halt_input,
+ .set_port = auacer_set_port,
+ .get_port = auacer_get_port,
+ .query_devinfo = auacer_query_devinfo,
+ .allocm = auacer_allocm,
+ .freem = auacer_freem,
+ .round_buffersize = auacer_round_buffersize,
+ .get_props = auacer_get_props,
+ .trigger_output = auacer_trigger_output,
+ .trigger_input = auacer_trigger_input,
};
int auacer_attach_codec(void *, struct ac97_codec_if *);
--
2.38.0
