mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-18 10:35:55 +00:00
fix for -fno-builtin
PR: kern/14278
This commit is contained in:
parent
1a7c256983
commit
e479a8af2a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=53512
@ -35,6 +35,8 @@
|
||||
/* board-specific include files */
|
||||
#include <dev/sound/isa/mss.h>
|
||||
|
||||
#define abs(x) (((x) < 0) ? -(x) : (x))
|
||||
|
||||
struct mss_info;
|
||||
|
||||
struct mss_chinfo {
|
||||
@ -1154,7 +1156,7 @@ mss_speed(struct mss_chinfo *ch, int speed)
|
||||
ad_enter_MCE(mss);
|
||||
if (mss->bd_id == MD_AD1845) { /* Use alternate speed select regs */
|
||||
ad_write(mss, 22, (speed >> 8) & 0xff); /* Speed MSB */
|
||||
ad_write(mss, 23, speed & 0xff); /* Speed LSB */
|
||||
ad_write(mss, 23, speed & 0xff); /* Speed LSB */
|
||||
/* XXX must also do something in I27 for the ad1845 */
|
||||
} else {
|
||||
int i, sel = 0; /* assume entry 0 does not contain -1 */
|
||||
|
@ -178,7 +178,7 @@ ac97_setmixer(struct ac97_info *codec, unsigned channel, unsigned left, unsigned
|
||||
{
|
||||
struct ac97mixtable_entry *e = &codec->mix[channel];
|
||||
if (e->reg != 0) {
|
||||
int max, val;
|
||||
int max, val, reg = (e->reg >= 0)? e->reg : -e->reg;
|
||||
|
||||
if (!e->stereo) right = left;
|
||||
if (e->reg > 0) {
|
||||
@ -209,7 +209,7 @@ ac97_setmixer(struct ac97_info *codec, unsigned channel, unsigned left, unsigned
|
||||
}
|
||||
}
|
||||
if (left == 0 && right == 0 && e->mute == 1) val = AC97_MUTE;
|
||||
codec->write(codec->devinfo, abs(e->reg), val);
|
||||
codec->write(codec->devinfo, reg, val);
|
||||
return left | (right << 8);
|
||||
} else return -1;
|
||||
}
|
||||
|
@ -715,7 +715,7 @@ chn_setblocksize(pcm_channel *c, int blksz)
|
||||
if (CANCHANGE(c)) {
|
||||
c->flags &= ~CHN_F_HAS_SIZE;
|
||||
if (blksz >= 2) c->flags |= CHN_F_HAS_SIZE;
|
||||
blksz = abs(blksz);
|
||||
if (blksz < 0) blksz = -blksz;
|
||||
if (blksz < 2) blksz = (c->buffer.sample_size * c->speed) >> 2;
|
||||
RANGE(blksz, 1024, c->buffer.bufsize / 4);
|
||||
blksz &= ~3;
|
||||
|
Loading…
Reference in New Issue
Block a user