From 100044adf505a4d3825eed40ec34ffa1c2397863 Mon Sep 17 00:00:00 2001 From: cg Date: Tue, 26 Nov 2002 18:16:27 +0000 Subject: (hopefully) fix build breakage some people are seeing Approved by: re --- sys/dev/sound/isa/ad1816.c | 4 ++-- sys/dev/sound/isa/mss.c | 2 +- sys/dev/sound/isa/sbc.c | 2 +- sys/dev/sound/pci/aureal.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/ds1.c | 2 +- sys/dev/sound/pci/emu10k1.c | 2 +- sys/dev/sound/pci/maestro.c | 2 +- sys/dev/sound/pci/t4dwave.c | 4 ++-- sys/dev/sound/pcm/ac97.c | 18 +++++++++--------- sys/dev/sound/pcm/channel.h | 2 +- sys/dev/sound/pcm/mixer.c | 2 +- sys/dev/sound/pcm/sound.c | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) (limited to 'sys') diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c index ba8059f..7871240 100644 --- a/sys/dev/sound/isa/ad1816.c +++ b/sys/dev/sound/isa/ad1816.c @@ -53,7 +53,7 @@ struct ad1816_info { int drq2_rid; void *ih; bus_dma_tag_t parent_dmat; - void *lock; + struct mtx *lock; unsigned int bufsize; struct ad1816_chinfo pch, rch; @@ -372,7 +372,7 @@ ad1816chan_setformat(kobj_t obj, void *data, u_int32_t format) return format; #else return 0; -#endif +#endif } static int diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c index d946b38..01d9bee 100644 --- a/sys/dev/sound/isa/mss.c +++ b/sys/dev/sound/isa/mss.c @@ -66,7 +66,7 @@ struct mss_info { int drq2_rid; void *ih; bus_dma_tag_t parent_dmat; - void *lock; + struct mtx *lock; char mss_indexed_regs[MSS_INDEXED_REGS]; char opl_indexed_regs[OPL_INDEXED_REGS]; diff --git a/sys/dev/sound/isa/sbc.c b/sys/dev/sound/isa/sbc.c index 5a7ec48..d57ed7e 100644 --- a/sys/dev/sound/isa/sbc.c +++ b/sys/dev/sound/isa/sbc.c @@ -64,7 +64,7 @@ struct sbc_softc { void *ih[IRQ_MAX]; - void *lock; + struct mtx *lock; u_int32_t bd_ver; }; diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index d79626b..96c2c66 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -73,7 +73,7 @@ struct au_info { bus_space_handle_t sh[3]; bus_dma_tag_t parent_dmat; - void *lock; + struct mtx *lock; u_int32_t x[32], y[128]; char z[128]; diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 973c8f6..4afdd9e 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -107,7 +107,7 @@ struct sc_info { struct resource *reg, *irq; int regid, irqid; void *ih; - void *lock; + struct mtx *lock; int spdif_enabled; unsigned int bufsz; diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index d548377..896a8af 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -116,7 +116,7 @@ struct sc_info { struct resource *reg, *irq; int regid, irqid; void *ih; - void *lock; + struct mtx *lock; void *regbase; u_int32_t *pbase, pbankbase, pbanksize; diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index 0448e8a..e9c99cb 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -96,7 +96,7 @@ struct sc_info { struct resource *reg, *irq; void *ih; - void *lock; + struct mtx *lock; unsigned int bufsz; int timer, timerinterval; diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index 8b1343f..c479171 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -110,7 +110,7 @@ struct agg_info { bus_addr_t baseaddr; struct ac97_info *codec; - void *lock; + struct mtx *lock; unsigned int bufsz; u_int playchns, active; diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index c34fe39..1e88667 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -81,7 +81,7 @@ struct tr_info { int regtype, regid, irqid; void *ih; - void *lock; + struct mtx *lock; u_int32_t playchns; unsigned int bufsz; @@ -262,7 +262,7 @@ tr_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data) } } if (tr->type != ALI_PCI_ID || i > 0) { - for (i=TR_TIMEOUT_CDC; (i>0) && (j & trw); i--) + for (i=TR_TIMEOUT_CDC; (i>0) && (j & trw); i--) j=tr_rd(tr, treg, 4); if (tr->type == ALI_PCI_ID && tr->rev > 0x01) trw |= 0x0100; diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c index 4dcfb9e..427fb98 100644 --- a/sys/dev/sound/pcm/ac97.c +++ b/sys/dev/sound/pcm/ac97.c @@ -55,7 +55,7 @@ struct ac97_info { u_int32_t flags; struct ac97mixtable_entry mix[32]; char name[AC97_NAMELEN]; - void *lock; + struct mtx *lock; }; struct ac97_codecid { @@ -207,7 +207,7 @@ ac97_reset(struct ac97_info *codec) wrcd(codec, AC97_REG_RESET, 0); for (i = 0; i < 500; i++) { ps = rdcd(codec, AC97_REG_POWER) & AC97_POWER_STATUS; - if (ps == AC97_POWER_STATUS) + if (ps == AC97_POWER_STATUS) return; DELAY(1000); } @@ -220,10 +220,10 @@ ac97_setrate(struct ac97_info *codec, int which, int rate) u_int16_t v; switch(which) { - case AC97_REGEXT_FDACRATE: + case AC97_REGEXT_FDACRATE: case AC97_REGEXT_SDACRATE: case AC97_REGEXT_LDACRATE: - case AC97_REGEXT_LADCRATE: + case AC97_REGEXT_LADCRATE: case AC97_REGEXT_MADCRATE: break; @@ -250,7 +250,7 @@ ac97_setextmode(struct ac97_info *codec, u_int16_t mode) { mode &= AC97_EXTCAPS; if ((mode & ~codec->extcaps) != 0) { - device_printf(codec->dev, "ac97 invalid mode set 0x%04x\n", + device_printf(codec->dev, "ac97 invalid mode set 0x%04x\n", mode); return -1; } @@ -371,7 +371,7 @@ ac97_getmixer(struct ac97_info *codec, int channel) static void ac97_fix_auxout(struct ac97_info *codec) { - /* Determine what AUXOUT really means, it can be: + /* Determine what AUXOUT really means, it can be: * * 1. Headphone out. * 2. 4-Channel Out @@ -380,7 +380,7 @@ ac97_fix_auxout(struct ac97_info *codec) * See Sections 5.2.1 and 5.27 for AUX_OUT Options in AC97r2.{2,3}. */ if (codec->caps & AC97_CAP_HEADPHONE) { - /* XXX We should probably check the AUX_OUT initial value. + /* XXX We should probably check the AUX_OUT initial value. * Leave AC97_MIX_AUXOUT - SOUND_MIXER_MONITOR relationship */ return; } else if (codec->extcaps & AC97_EXTCAP_SDAC && @@ -388,12 +388,12 @@ ac97_fix_auxout(struct ac97_info *codec) /* 4-Channel Out, add an additional gain setting. */ codec->mix[SOUND_MIXER_OGAIN] = codec->mix[SOUND_MIXER_MONITOR]; } else { - /* Master volume is/maybe fixed in h/w, not sufficiently + /* Master volume is/maybe fixed in h/w, not sufficiently * clear in spec to blat SOUND_MIXER_MASTER. */ codec->mix[SOUND_MIXER_OGAIN] = codec->mix[SOUND_MIXER_MONITOR]; } /* Blat monitor, inappropriate label if we get here */ - bzero(&codec->mix[SOUND_MIXER_MONITOR], + bzero(&codec->mix[SOUND_MIXER_MONITOR], sizeof(codec->mix[SOUND_MIXER_MONITOR])); } diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 87149a5..4db60cb 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -62,7 +62,7 @@ struct pcm_channel { void *devinfo; device_t dev; char name[CHN_NAMELEN]; - void *lock; + struct mtx *lock; SLIST_HEAD(, pcmchan_children) children; }; diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 7c1bd04..182d290 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -47,7 +47,7 @@ struct snd_mixer { u_int32_t recsrc; u_int16_t level[32]; char name[MIXER_NAMELEN]; - void *lock; + struct mtx *lock; }; static u_int16_t snd_mixerdefaults[SOUND_MIXER_NRDEVICES] = { diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 1284947..2b77684 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -50,7 +50,7 @@ struct snddev_info { char status[SND_STATUSLEN]; struct sysctl_ctx_list sysctl_tree; struct sysctl_oid *sysctl_tree_top; - void *lock; + struct mtx *lock; }; devclass_t pcm_devclass; -- cgit v1.1