d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(hopefully) fix build breakage some people are seeing

Browse Source 
Approved by:	re
This commit is contained in:
Cameron Grant 2002-11-26 18:16:27 +00:00
parent 8b5f8b061a
commit 00acb1337e
13 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/sound/isa/ad1816.c
View File

@ -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

2
sys/dev/sound/isa/mss.c
View File

@ -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];

2
sys/dev/sound/isa/sbc.c
View File

@ -64,7 +64,7 @@ struct sbc_softc {
void *ih[IRQ_MAX];
void *lock;
struct mtx *lock;
u_int32_t bd_ver;
};

2
sys/dev/sound/pci/aureal.c
View File

@ -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];

2
sys/dev/sound/pci/cmi.c
View File

@ -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;

2
sys/dev/sound/pci/ds1.c
View File

@ -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;

2
sys/dev/sound/pci/emu10k1.c
View File

@ -96,7 +96,7 @@ struct sc_info {
struct resource *reg, *irq;
void *ih;
void *lock;
struct mtx *lock;
unsigned int bufsz;
int timer, timerinterval;

2
sys/dev/sound/pci/maestro.c
View File

@ -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;

4
sys/dev/sound/pci/t4dwave.c
View File

@ -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;

18
sys/dev/sound/pcm/ac97.c
View File

@ -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]));
}

2
sys/dev/sound/pcm/channel.h
View File

@ -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;
};

2
sys/dev/sound/pcm/mixer.c
View File

@ -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] = {

2
sys/dev/sound/pcm/sound.c
View File

@ -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;