git: 95439b803fce - main - sound: Stop using legacy u_int types
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 26 Jul 2026 22:18:38 UTC
The branch main has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=95439b803fce86958e1db1927a8405bf939edda4
commit 95439b803fce86958e1db1927a8405bf939edda4
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-07-23 21:05:42 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-07-26 22:16:47 +0000
sound: Stop using legacy u_int types
No functional change intended.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
---
sys/dev/sound/macio/aoa.c | 26 ++---
sys/dev/sound/macio/davbus.c | 58 +++++-----
sys/dev/sound/macio/i2s.c | 28 ++---
sys/dev/sound/macio/onyx.c | 10 +-
sys/dev/sound/macio/snapper.c | 14 +--
sys/dev/sound/macio/tumbler.c | 14 +--
sys/dev/sound/pci/als4000.c | 92 ++++++++--------
sys/dev/sound/pci/cmi.c | 96 ++++++++---------
sys/dev/sound/pci/cs4281.c | 96 ++++++++---------
sys/dev/sound/pci/csa.c | 36 +++----
sys/dev/sound/pci/csamidi.c | 4 +-
sys/dev/sound/pci/csapcm.c | 30 +++---
sys/dev/sound/pci/csareg.h | 4 +-
sys/dev/sound/pci/csavar.h | 16 +--
sys/dev/sound/pci/emu10k1.c | 130 +++++++++++-----------
sys/dev/sound/pci/emu10kx-pcm.c | 10 +-
sys/dev/sound/pci/envy24.c | 214 ++++++++++++++++++-------------------
sys/dev/sound/pci/envy24ht.c | 200 +++++++++++++++++-----------------
sys/dev/sound/pci/fm801.c | 46 ++++----
sys/dev/sound/pci/hda/hdaa.c | 2 +-
sys/dev/sound/pci/maestro3.c | 168 ++++++++++++++---------------
sys/dev/sound/pci/neomagic-coeff.h | 2 +-
sys/dev/sound/pci/neomagic.c | 68 ++++++------
sys/dev/sound/pci/solo.c | 62 +++++------
sys/dev/sound/pci/spicds.c | 2 +-
sys/dev/sound/pci/t4dwave.c | 82 +++++++-------
sys/dev/sound/pci/via82c686.c | 32 +++---
sys/dev/sound/pci/vibes.c | 98 ++++++++---------
sys/dev/sound/pcm/ac97.c | 58 +++++-----
sys/dev/sound/pcm/ac97.h | 18 ++--
sys/dev/sound/pcm/ac97_if.m | 6 +-
sys/dev/sound/pcm/buffer.c | 22 ++--
sys/dev/sound/pcm/buffer.h | 30 +++---
sys/dev/sound/pcm/channel.c | 42 ++++----
sys/dev/sound/pcm/channel.h | 32 +++---
sys/dev/sound/pcm/channel_if.m | 28 ++---
sys/dev/sound/pcm/dsp.c | 2 +-
sys/dev/sound/pcm/feeder.c | 34 +++---
sys/dev/sound/pcm/feeder.h | 8 +-
sys/dev/sound/pcm/feeder_if.m | 4 +-
sys/dev/sound/pcm/mixer.c | 56 +++++-----
sys/dev/sound/pcm/mixer.h | 44 ++++----
sys/dev/sound/pcm/mixer_if.m | 4 +-
sys/dev/sound/pcm/sound.h | 4 +-
44 files changed, 1016 insertions(+), 1016 deletions(-)
diff --git a/sys/dev/sound/macio/aoa.c b/sys/dev/sound/macio/aoa.c
index e0a6206c19a6..ff8f17224384 100644
--- a/sys/dev/sound/macio/aoa.c
+++ b/sys/dev/sound/macio/aoa.c
@@ -60,20 +60,20 @@ struct aoa_dma {
bus_dma_tag_t tag; /* bus_dma tag */
struct pcm_channel *pcm; /* PCM channel */
struct snd_dbuf *buf; /* PCM buffer */
- u_int slots; /* # of slots */
- u_int slot; /* current slot */
- u_int bufsz; /* buffer size */
- u_int blksz; /* block size */
+ unsigned int slots; /* # of slots */
+ unsigned int slot; /* current slot */
+ unsigned int bufsz; /* buffer size */
+ unsigned int blksz; /* block size */
int running;
};
static void
aoa_dma_set_program(struct aoa_dma *dma)
{
- u_int32_t addr;
+ uint32_t addr;
int i;
- addr = (u_int32_t)dma->buf->buf_addr;
+ addr = (uint32_t)dma->buf->buf_addr;
KASSERT(dma->bufsz == dma->buf->bufsize, ("bad size"));
dma->slots = dma->bufsz / dma->blksz;
@@ -144,8 +144,8 @@ aoa_dma_delete(struct aoa_dma *dma)
free(dma, M_DEVBUF);
}
-static u_int32_t
-aoa_chan_setblocksize(kobj_t obj, void *data, u_int32_t blocksz)
+static uint32_t
+aoa_chan_setblocksize(kobj_t obj, void *data, uint32_t blocksz)
{
struct aoa_dma *dma = data;
int err, lz;
@@ -188,7 +188,7 @@ aoa_chan_setblocksize(kobj_t obj, void *data, u_int32_t blocksz)
}
static int
-aoa_chan_setformat(kobj_t obj, void *data, u_int32_t format)
+aoa_chan_setformat(kobj_t obj, void *data, uint32_t format)
{
DPRINTF(("aoa_chan_setformat: format = %u\n", format));
@@ -198,15 +198,15 @@ aoa_chan_setformat(kobj_t obj, void *data, u_int32_t format)
return (0);
}
-static u_int32_t
-aoa_chan_setspeed(kobj_t obj, void *data, u_int32_t speed)
+static uint32_t
+aoa_chan_setspeed(kobj_t obj, void *data, uint32_t speed)
{
DPRINTF(("aoa_chan_setspeed: speed = %u\n", speed));
return (44100);
}
-static u_int32_t
+static uint32_t
aoa_chan_getptr(kobj_t obj, void *data)
{
struct aoa_dma *dma = data;
@@ -336,7 +336,7 @@ aoa_interrupt(void *xsc)
mtx_unlock(&dma->mutex);
}
-static u_int32_t sc_fmt[] = {
+static uint32_t sc_fmt[] = {
SND_FORMAT(AFMT_S16_BE, 2, 0),
0
};
diff --git a/sys/dev/sound/macio/davbus.c b/sys/dev/sound/macio/davbus.c
index 8e9fe78317cb..de15806e6d5c 100644
--- a/sys/dev/sound/macio/davbus.c
+++ b/sys/dev/sound/macio/davbus.c
@@ -63,9 +63,9 @@ struct davbus_softc {
struct resource *reg;
struct mtx mutex;
int device_id;
- u_int output_mask;
- u_int (*read_status)(struct davbus_softc *, u_int);
- void (*set_outputs)(struct davbus_softc *, u_int);
+ unsigned int output_mask;
+ unsigned int (*read_status)(struct davbus_softc *, unsigned int);
+ void (*set_outputs)(struct davbus_softc *, unsigned int);
};
static int davbus_probe(device_t);
@@ -115,12 +115,12 @@ davbus_probe(device_t self)
static int burgundy_init(struct snd_mixer *m);
static int burgundy_uninit(struct snd_mixer *m);
static int burgundy_reinit(struct snd_mixer *m);
-static void burgundy_write_locked(struct davbus_softc *, u_int, u_int);
-static void burgundy_set_outputs(struct davbus_softc *d, u_int mask);
-static u_int burgundy_read_status(struct davbus_softc *d, u_int status);
+static void burgundy_write_locked(struct davbus_softc *, unsigned int, unsigned int);
+static void burgundy_set_outputs(struct davbus_softc *d, unsigned int mask);
+static unsigned int burgundy_read_status(struct davbus_softc *d, unsigned int status);
static int burgundy_set(struct snd_mixer *m, unsigned dev, unsigned left,
unsigned right);
-static u_int32_t burgundy_setrecsrc(struct snd_mixer *m, u_int32_t src);
+static uint32_t burgundy_setrecsrc(struct snd_mixer *m, uint32_t src);
static kobj_method_t burgundy_mixer_methods[] = {
KOBJMETHOD(mixer_init, burgundy_init),
@@ -200,9 +200,9 @@ burgundy_reinit(struct snd_mixer *m)
}
static void
-burgundy_write_locked(struct davbus_softc *d, u_int reg, u_int val)
+burgundy_write_locked(struct davbus_softc *d, unsigned int reg, unsigned int val)
{
- u_int size, addr, offset, data, i;
+ unsigned int size, addr, offset, data, i;
size = (reg & 0x00FF0000) >> 16;
addr = (reg & 0x0000FF00) >> 8;
@@ -226,9 +226,9 @@ burgundy_write_locked(struct davbus_softc *d, u_int reg, u_int val)
/* Must be called with d->mutex held. */
static void
-burgundy_set_outputs(struct davbus_softc *d, u_int mask)
+burgundy_set_outputs(struct davbus_softc *d, unsigned int mask)
{
- u_int x = 0;
+ unsigned int x = 0;
if (mask == d->output_mask)
return;
@@ -259,8 +259,8 @@ burgundy_set_outputs(struct davbus_softc *d, u_int mask)
d->output_mask = mask;
}
-static u_int
-burgundy_read_status(struct davbus_softc *d, u_int status)
+static unsigned int
+burgundy_read_status(struct davbus_softc *d, unsigned int status)
{
if (status & 0x4)
return (1 << 1);
@@ -298,8 +298,8 @@ burgundy_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
return (0);
}
-static u_int32_t
-burgundy_setrecsrc(struct snd_mixer *m, u_int32_t src)
+static uint32_t
+burgundy_setrecsrc(struct snd_mixer *m, uint32_t src)
{
return (0);
}
@@ -311,12 +311,12 @@ burgundy_setrecsrc(struct snd_mixer *m, u_int32_t src)
static int screamer_init(struct snd_mixer *m);
static int screamer_uninit(struct snd_mixer *m);
static int screamer_reinit(struct snd_mixer *m);
-static void screamer_write_locked(struct davbus_softc *, u_int, u_int);
-static void screamer_set_outputs(struct davbus_softc *d, u_int mask);
-static u_int screamer_read_status(struct davbus_softc *d, u_int status);
+static void screamer_write_locked(struct davbus_softc *, unsigned int, unsigned int);
+static void screamer_set_outputs(struct davbus_softc *d, unsigned int mask);
+static unsigned int screamer_read_status(struct davbus_softc *d, unsigned int status);
static int screamer_set(struct snd_mixer *m, unsigned dev, unsigned left,
unsigned right);
-static u_int32_t screamer_setrecsrc(struct snd_mixer *m, u_int32_t src);
+static uint32_t screamer_setrecsrc(struct snd_mixer *m, uint32_t src);
static kobj_method_t screamer_mixer_methods[] = {
KOBJMETHOD(mixer_init, screamer_init),
@@ -372,9 +372,9 @@ screamer_reinit(struct snd_mixer *m)
}
static void
-screamer_write_locked(struct davbus_softc *d, u_int reg, u_int val)
+screamer_write_locked(struct davbus_softc *d, unsigned int reg, unsigned int val)
{
- u_int x;
+ unsigned int x;
KASSERT(val == (val & 0xfff), ("bad val"));
@@ -392,9 +392,9 @@ screamer_write_locked(struct davbus_softc *d, u_int reg, u_int val)
/* Must be called with d->mutex held. */
static void
-screamer_set_outputs(struct davbus_softc *d, u_int mask)
+screamer_set_outputs(struct davbus_softc *d, unsigned int mask)
{
- u_int x;
+ unsigned int x;
if (mask == d->output_mask) {
return;
@@ -430,8 +430,8 @@ screamer_set_outputs(struct davbus_softc *d, u_int mask)
d->output_mask = mask;
}
-static u_int
-screamer_read_status(struct davbus_softc *d, u_int status)
+static unsigned int
+screamer_read_status(struct davbus_softc *d, unsigned int status)
{
int headphones;
@@ -483,8 +483,8 @@ screamer_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
return (0);
}
-static u_int32_t
-screamer_setrecsrc(struct snd_mixer *m, u_int32_t src)
+static uint32_t
+screamer_setrecsrc(struct snd_mixer *m, uint32_t src)
{
return (0);
}
@@ -539,7 +539,7 @@ davbus_attach(device_t self)
bzero(compat, sizeof(compat));
OF_getprop(sc->soundnode, "compatible", compat, sizeof(compat));
- OF_getprop(sc->soundnode, "device-id", &sc->device_id, sizeof(u_int));
+ OF_getprop(sc->soundnode, "device-id", &sc->device_id, sizeof(unsigned int));
mtx_init(&sc->mutex, "DAVbus", NULL, MTX_DEF);
@@ -575,7 +575,7 @@ static void
davbus_cint(void *ptr)
{
struct davbus_softc *d = ptr;
- u_int reg, status, mask;
+ unsigned int reg, status, mask;
mtx_lock(&d->mutex);
diff --git a/sys/dev/sound/macio/i2s.c b/sys/dev/sound/macio/i2s.c
index 2c134f8f97fe..327fbe5fc0bd 100644
--- a/sys/dev/sound/macio/i2s.c
+++ b/sys/dev/sound/macio/i2s.c
@@ -87,18 +87,18 @@ struct i2s_softc {
phandle_t node;
phandle_t soundnode;
struct resource *reg;
- u_int output_mask;
+ unsigned int output_mask;
struct mtx port_mtx;
};
static int i2s_probe(device_t);
static int i2s_attach(device_t);
static void i2s_postattach(void *);
-static int i2s_setup(struct i2s_softc *, u_int, u_int, u_int);
+static int i2s_setup(struct i2s_softc *, unsigned int, unsigned int, unsigned int);
static void i2s_mute_headphone (struct i2s_softc *, int);
static void i2s_mute_lineout (struct i2s_softc *, int);
static void i2s_mute_speaker (struct i2s_softc *, int);
-static void i2s_set_outputs(void *, u_int);
+static void i2s_set_outputs(void *, unsigned int);
static struct intr_config_hook *i2s_delayed_attach = NULL;
@@ -425,8 +425,8 @@ aoagpio_attach(device_t gpio)
/* Number of clock sources we can use. */
#define NCLKS 3
static const struct i2s_clksrc {
- u_int cs_clock;
- u_int cs_reg;
+ unsigned int cs_clock;
+ unsigned int cs_reg;
} clksrc[NCLKS] = {
{49152000, CLKSRC_49MHz},
{45158400, CLKSRC_45MHz},
@@ -440,11 +440,11 @@ static const struct i2s_clksrc {
or greater to the number of bits per frame. */
static int
-i2s_setup(struct i2s_softc *sc, u_int rate, u_int wordsize, u_int sclk_fs)
+i2s_setup(struct i2s_softc *sc, unsigned int rate, unsigned int wordsize, unsigned int sclk_fs)
{
- u_int mclk, mdiv, sdiv;
- u_int reg = 0, x, wordformat;
- u_int i;
+ unsigned int mclk, mdiv, sdiv;
+ unsigned int reg = 0, x, wordformat;
+ unsigned int i;
/* Make sure the settings are consistent... */
if ((wordsize * 2) > sclk_fs)
@@ -592,7 +592,7 @@ of_find_firstchild_byname(phandle_t node, const char *req_name)
return (-1);
}
-static u_int
+static unsigned int
gpio_read(enum gpio_ctrl ctrl)
{
struct aoagpio_softc *sc;
@@ -604,10 +604,10 @@ gpio_read(enum gpio_ctrl ctrl)
}
static void
-gpio_write(enum gpio_ctrl ctrl, u_int x)
+gpio_write(enum gpio_ctrl ctrl, unsigned int x)
{
struct aoagpio_softc *sc;
- u_int reg;
+ unsigned int reg;
if ((sc = gpio_ctrls[ctrl]) == NULL)
return;
@@ -622,7 +622,7 @@ gpio_write(enum gpio_ctrl ctrl, u_int x)
static void
i2s_cint(struct i2s_softc *sc)
{
- u_int mask = 0;
+ unsigned int mask = 0;
if (gpio_ctrls[HEADPHONE_DETECT] &&
gpio_ctrls[HEADPHONE_DETECT]->level)
@@ -691,7 +691,7 @@ MUTE_CONTROL(headphone, HEADPHONE)
MUTE_CONTROL(lineout, LINEOUT)
static void
-i2s_set_outputs(void *ptr, u_int mask)
+i2s_set_outputs(void *ptr, unsigned int mask)
{
struct i2s_softc *sc = ptr;
diff --git a/sys/dev/sound/macio/onyx.c b/sys/dev/sound/macio/onyx.c
index 5ba22dd7c495..745f861790db 100644
--- a/sys/dev/sound/macio/onyx.c
+++ b/sys/dev/sound/macio/onyx.c
@@ -74,7 +74,7 @@ static int onyx_uninit(struct snd_mixer *m);
static int onyx_reinit(struct snd_mixer *m);
static int onyx_set(struct snd_mixer *m, unsigned dev, unsigned left,
unsigned right);
-static u_int32_t onyx_setrecsrc(struct snd_mixer *m, u_int32_t src);
+static uint32_t onyx_setrecsrc(struct snd_mixer *m, uint32_t src);
static device_method_t onyx_methods[] = {
/* Device interface. */
@@ -168,7 +168,7 @@ static const struct onyx_reg onyx_initdata = {
static int
onyx_write(struct onyx_softc *sc, uint8_t reg, const uint8_t value)
{
- u_int size;
+ unsigned int size;
uint8_t buf[16];
struct iic_msg msg[] = {
@@ -226,7 +226,7 @@ static int
onyx_init(struct snd_mixer *m)
{
struct onyx_softc *sc;
- u_int x = 0;
+ unsigned int x = 0;
sc = device_get_softc(mix_getdevinfo(m));
@@ -289,8 +289,8 @@ onyx_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
return (0);
}
-static u_int32_t
-onyx_setrecsrc(struct snd_mixer *m, u_int32_t src)
+static uint32_t
+onyx_setrecsrc(struct snd_mixer *m, uint32_t src)
{
return (0);
}
diff --git a/sys/dev/sound/macio/snapper.c b/sys/dev/sound/macio/snapper.c
index ed83990d563b..c68ce20ee0b6 100644
--- a/sys/dev/sound/macio/snapper.c
+++ b/sys/dev/sound/macio/snapper.c
@@ -100,7 +100,7 @@ static int snapper_uninit(struct snd_mixer *m);
static int snapper_reinit(struct snd_mixer *m);
static int snapper_set(struct snd_mixer *m, unsigned dev, unsigned left,
unsigned right);
-static u_int32_t snapper_setrecsrc(struct snd_mixer *m, u_int32_t src);
+static uint32_t snapper_setrecsrc(struct snd_mixer *m, uint32_t src);
static device_method_t snapper_methods[] = {
/* Device interface. */
@@ -289,7 +289,7 @@ static const char snapper_regsize[] = {
};
/* dB = 20 * log (x) table. */
-static u_int snapper_volume_table[100] = {
+static unsigned int snapper_volume_table[100] = {
0x00000148, 0x0000015C, 0x00000171, 0x00000186, // -46.0, -45.5, -45.0, -44.5,
0x0000019E, 0x000001B6, 0x000001D0, 0x000001EB, // -44.0, -43.5, -43.0, -42.5,
0x00000209, 0x00000227, 0x00000248, 0x0000026B, // -42.0, -41.5, -41.0, -40.5,
@@ -320,7 +320,7 @@ static u_int snapper_volume_table[100] = {
static int
snapper_write(struct snapper_softc *sc, uint8_t reg, const void *data)
{
- u_int size;
+ unsigned int size;
uint8_t buf[16];
struct iic_msg msg[] = {
@@ -381,7 +381,7 @@ static int
snapper_init(struct snd_mixer *m)
{
struct snapper_softc *sc;
- u_int x = 0;
+ unsigned int x = 0;
sc = device_get_softc(mix_getdevinfo(m));
@@ -436,7 +436,7 @@ static int
snapper_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
{
struct snapper_softc *sc;
- u_int l, r;
+ unsigned int l, r;
u_char reg[6];
sc = device_get_softc(mix_getdevinfo(m));
@@ -464,8 +464,8 @@ snapper_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
return (0);
}
-static u_int32_t
-snapper_setrecsrc(struct snd_mixer *m, u_int32_t src)
+static uint32_t
+snapper_setrecsrc(struct snd_mixer *m, uint32_t src)
{
return (0);
}
diff --git a/sys/dev/sound/macio/tumbler.c b/sys/dev/sound/macio/tumbler.c
index 89af4434e7fe..0bb619f2fd90 100644
--- a/sys/dev/sound/macio/tumbler.c
+++ b/sys/dev/sound/macio/tumbler.c
@@ -100,7 +100,7 @@ static int tumbler_uninit(struct snd_mixer *m);
static int tumbler_reinit(struct snd_mixer *m);
static int tumbler_set(struct snd_mixer *m, unsigned dev, unsigned left,
unsigned right);
-static u_int32_t tumbler_setrecsrc(struct snd_mixer *m, u_int32_t src);
+static uint32_t tumbler_setrecsrc(struct snd_mixer *m, uint32_t src);
static device_method_t tumbler_methods[] = {
/* Device interface. */
@@ -250,7 +250,7 @@ const char tumbler_regsize[] = {
};
/* dB = 20 * log (x) table. */
-static u_int tumbler_volume_table[100] = {
+static unsigned int tumbler_volume_table[100] = {
0x00000148, 0x0000015C, 0x00000171, 0x00000186, // -46.0, -45.5, -45.0, -44.5,
0x0000019E, 0x000001B6, 0x000001D0, 0x000001EB, // -44.0, -43.5, -43.0, -42.5,
0x00000209, 0x00000227, 0x00000248, 0x0000026B, // -42.0, -41.5, -41.0, -40.5,
@@ -281,7 +281,7 @@ static u_int tumbler_volume_table[100] = {
static int
tumbler_write(struct tumbler_softc *sc, uint8_t reg, const void *data)
{
- u_int size;
+ unsigned int size;
uint8_t buf[16];
struct iic_msg msg[] = {
@@ -336,7 +336,7 @@ static int
tumbler_init(struct snd_mixer *m)
{
struct tumbler_softc *sc;
- u_int x = 0;
+ unsigned int x = 0;
sc = device_get_softc(mix_getdevinfo(m));
@@ -383,7 +383,7 @@ static int
tumbler_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
{
struct tumbler_softc *sc;
- u_int l, r;
+ unsigned int l, r;
u_char reg[6];
sc = device_get_softc(mix_getdevinfo(m));
@@ -411,8 +411,8 @@ tumbler_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
return (0);
}
-static u_int32_t
-tumbler_setrecsrc(struct snd_mixer *m, u_int32_t src)
+static uint32_t
+tumbler_setrecsrc(struct snd_mixer *m, uint32_t src)
{
return (0);
}
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index c6cbd61c927c..0613f3ec2b97 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -65,9 +65,9 @@ struct sc_chinfo {
struct sc_info *parent;
struct pcm_channel *channel;
struct snd_dbuf *buffer;
- u_int32_t format, speed, phys_buf, bps;
- u_int32_t dma_active:1, dma_was_active:1;
- u_int8_t gcr_fifo_status;
+ uint32_t format, speed, phys_buf, bps;
+ uint32_t dma_active:1, dma_was_active:1;
+ uint8_t gcr_fifo_status;
int dir;
};
@@ -87,7 +87,7 @@ struct sc_info {
/* Channel caps */
-static u_int32_t als_format[] = {
+static uint32_t als_format[] = {
SND_FORMAT(AFMT_U8, 1, 0),
SND_FORMAT(AFMT_U8, 2, 0),
SND_FORMAT(AFMT_S16_LE, 1, 0),
@@ -104,7 +104,7 @@ static struct pcmchan_caps als_caps = { 4000, 44100, als_format, 0 };
/* ------------------------------------------------------------------------- */
/* Register Utilities */
-static u_int32_t
+static uint32_t
als_gcr_rd(struct sc_info *sc, int index)
{
bus_space_write_1(sc->st, sc->sh, ALS_GCR_INDEX, index);
@@ -118,36 +118,36 @@ als_gcr_wr(struct sc_info *sc, int index, int data)
bus_space_write_4(sc->st, sc->sh, ALS_GCR_DATA, data);
}
-static u_int8_t
+static uint8_t
als_intr_rd(struct sc_info *sc)
{
return bus_space_read_1(sc->st, sc->sh, ALS_SB_MPU_IRQ);
}
static void
-als_intr_wr(struct sc_info *sc, u_int8_t data)
+als_intr_wr(struct sc_info *sc, uint8_t data)
{
bus_space_write_1(sc->st, sc->sh, ALS_SB_MPU_IRQ, data);
}
-static u_int8_t
-als_mix_rd(struct sc_info *sc, u_int8_t index)
+static uint8_t
+als_mix_rd(struct sc_info *sc, uint8_t index)
{
bus_space_write_1(sc->st, sc->sh, ALS_MIXER_INDEX, index);
return bus_space_read_1(sc->st, sc->sh, ALS_MIXER_DATA);
}
static void
-als_mix_wr(struct sc_info *sc, u_int8_t index, u_int8_t data)
+als_mix_wr(struct sc_info *sc, uint8_t index, uint8_t data)
{
bus_space_write_1(sc->st, sc->sh, ALS_MIXER_INDEX, index);
bus_space_write_1(sc->st, sc->sh, ALS_MIXER_DATA, data);
}
static void
-als_esp_wr(struct sc_info *sc, u_int8_t data)
+als_esp_wr(struct sc_info *sc, uint8_t data)
{
- u_int32_t tries, v;
+ uint32_t tries, v;
tries = 1000;
do {
@@ -166,7 +166,7 @@ als_esp_wr(struct sc_info *sc, u_int8_t data)
static int
als_esp_reset(struct sc_info *sc)
{
- u_int32_t tries, u, v;
+ uint32_t tries, u, v;
bus_space_write_1(sc->st, sc->sh, ALS_ESP_RST, 1);
DELAY(10);
@@ -191,10 +191,10 @@ als_esp_reset(struct sc_info *sc)
return 1;
}
-static u_int8_t
-als_ack_read(struct sc_info *sc, u_int8_t addr)
+static uint8_t
+als_ack_read(struct sc_info *sc, uint8_t addr)
{
- u_int8_t r = bus_space_read_1(sc->st, sc->sh, addr);
+ uint8_t r = bus_space_read_1(sc->st, sc->sh, addr);
return r;
}
@@ -232,7 +232,7 @@ alschan_init(kobj_t obj, void *devinfo,
}
static int
-alschan_setformat(kobj_t obj, void *data, u_int32_t format)
+alschan_setformat(kobj_t obj, void *data, uint32_t format)
{
struct sc_chinfo *ch = data;
@@ -240,8 +240,8 @@ alschan_setformat(kobj_t obj, void *data, u_int32_t format)
return 0;
}
-static u_int32_t
-alschan_setspeed(kobj_t obj, void *data, u_int32_t speed)
+static uint32_t
+alschan_setspeed(kobj_t obj, void *data, uint32_t speed)
{
struct sc_chinfo *ch = data, *other;
struct sc_info *sc = ch->parent;
@@ -258,8 +258,8 @@ alschan_setspeed(kobj_t obj, void *data, u_int32_t speed)
return speed;
}
-static u_int32_t
-alschan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
+static uint32_t
+alschan_setblocksize(kobj_t obj, void *data, uint32_t blocksize)
{
struct sc_chinfo *ch = data;
struct sc_info *sc = ch->parent;
@@ -271,7 +271,7 @@ alschan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
return blocksize;
}
-static u_int32_t
+static uint32_t
alschan_getptr(kobj_t obj, void *data)
{
struct sc_chinfo *ch = data;
@@ -314,10 +314,10 @@ als_set_speed(struct sc_chinfo *ch)
#define ALS_16BIT_CMD(x, y) { (x), (y), DSP_DMA16, DSP_CMD_DMAPAUSE_16 }
struct playback_command {
- u_int32_t pcm_format; /* newpcm format */
- u_int8_t format_val; /* sb16 format value */
- u_int8_t dma_prog; /* sb16 dma program */
- u_int8_t dma_stop; /* sb16 stop register */
+ uint32_t pcm_format; /* newpcm format */
+ uint8_t format_val; /* sb16 format value */
+ uint8_t dma_prog; /* sb16 dma program */
+ uint8_t dma_stop; /* sb16 stop register */
} static const playback_cmds[] = {
ALS_8BIT_CMD(SND_FORMAT(AFMT_U8, 1, 0), DSP_MODE_U8MONO),
ALS_8BIT_CMD(SND_FORMAT(AFMT_U8, 2, 0), DSP_MODE_U8STEREO),
@@ -326,9 +326,9 @@ struct playback_command {
};
static const struct playback_command*
-als_get_playback_command(u_int32_t format)
+als_get_playback_command(uint32_t format)
{
- u_int32_t i, n;
+ uint32_t i, n;
n = sizeof(playback_cmds) / sizeof(playback_cmds[0]);
for (i = 0; i < n; i++) {
@@ -346,7 +346,7 @@ als_playback_start(struct sc_chinfo *ch)
{
const struct playback_command *p;
struct sc_info *sc = ch->parent;
- u_int32_t buf, bufsz, count, dma_prog;
+ uint32_t buf, bufsz, count, dma_prog;
buf = ch->buffer->buf_addr;
bufsz = ch->buffer->bufsize;
@@ -377,7 +377,7 @@ als_playback_stop(struct sc_chinfo *ch)
{
const struct playback_command *p;
struct sc_info *sc = ch->parent;
- u_int32_t active;
+ uint32_t active;
active = ch->dma_active;
if (active) {
@@ -428,8 +428,8 @@ CHANNEL_DECLARE(alspchan);
/* ------------------------------------------------------------------------- */
/* Capture channel implementation */
-static u_int8_t
-als_get_fifo_format(struct sc_info *sc, u_int32_t format)
+static uint8_t
+als_get_fifo_format(struct sc_info *sc, uint32_t format)
{
switch (format) {
case SND_FORMAT(AFMT_U8, 1, 0):
@@ -449,7 +449,7 @@ static void
als_capture_start(struct sc_chinfo *ch)
{
struct sc_info *sc = ch->parent;
- u_int32_t buf, bufsz, count, dma_prog;
+ uint32_t buf, bufsz, count, dma_prog;
buf = ch->buffer->buf_addr;
bufsz = ch->buffer->bufsize;
@@ -477,7 +477,7 @@ static int
als_capture_stop(struct sc_chinfo *ch)
{
struct sc_info *sc = ch->parent;
- u_int32_t active;
+ uint32_t active;
active = ch->dma_active;
if (active) {
@@ -528,11 +528,11 @@ CHANNEL_DECLARE(alsrchan);
*/
struct sb16props {
- u_int8_t lreg;
- u_int8_t rreg;
- u_int8_t bits;
- u_int8_t oselect;
- u_int8_t iselect; /* left input mask */
+ uint8_t lreg;
+ uint8_t rreg;
+ uint8_t bits;
+ uint8_t oselect;
+ uint8_t iselect; /* left input mask */
} static const amt[SOUND_MIXER_NRDEVICES] = {
[SOUND_MIXER_VOLUME] = { 0x30, 0x31, 5, 0x00, 0x00 },
[SOUND_MIXER_PCM] = { 0x32, 0x33, 5, 0x00, 0x00 },
@@ -551,7 +551,7 @@ struct sb16props {
static int
alsmix_init(struct snd_mixer *m)
{
- u_int32_t i, v;
+ uint32_t i, v;
for (i = v = 0; i < SOUND_MIXER_NRDEVICES; i++) {
if (amt[i].bits) v |= 1 << i;
@@ -569,7 +569,7 @@ static int
alsmix_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
{
struct sc_info *sc = mix_getdevinfo(m);
- u_int32_t r, l, v, mask;
+ uint32_t r, l, v, mask;
/* Fill upper n bits in mask with 1's */
mask = ((1 << amt[dev].bits) - 1) << (8 - amt[dev].bits);
@@ -597,11 +597,11 @@ alsmix_set(struct snd_mixer *m, unsigned dev, unsigned left, unsigned right)
return 0;
}
-static u_int32_t
-alsmix_setrecsrc(struct snd_mixer *m, u_int32_t src)
+static uint32_t
+alsmix_setrecsrc(struct snd_mixer *m, uint32_t src)
{
struct sc_info *sc = mix_getdevinfo(m);
- u_int32_t i, l, r;
+ uint32_t i, l, r;
for (i = l = r = 0; i < SOUND_MIXER_NRDEVICES; i++) {
if (src & (1 << i)) {
@@ -635,7 +635,7 @@ static void
als_intr(void *p)
{
struct sc_info *sc = (struct sc_info *)p;
- u_int8_t intr, sb_status;
+ uint8_t intr, sb_status;
mtx_lock(&sc->lock);
intr = als_intr_rd(sc);
@@ -677,7 +677,7 @@ als_intr(void *p)
static int
als_init(struct sc_info *sc)
{
- u_int32_t i, v;
+ uint32_t i, v;
/* Reset Chip */
if (als_esp_reset(sc)) {
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 4ff58cb04b8e..58ab961b74e1 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -102,8 +102,8 @@ struct sc_chinfo {
struct sc_info *parent;
struct pcm_channel *channel;
struct snd_dbuf *buffer;
- u_int32_t fmt, spd, phys_buf, bps;
- u_int32_t dma_active:1, dma_was_active:1;
+ uint32_t fmt, spd, phys_buf, bps;
+ uint32_t dma_active:1, dma_was_active:1;
int dir;
};
@@ -132,7 +132,7 @@ struct sc_info {
/* Channel caps */
-static u_int32_t cmi_fmt[] = {
+static uint32_t cmi_fmt[] = {
SND_FORMAT(AFMT_U8, 1, 0),
SND_FORMAT(AFMT_U8, 2, 0),
SND_FORMAT(AFMT_S16_LE, 1, 0),
@@ -145,7 +145,7 @@ static struct pcmchan_caps cmi_caps = {5512, 48000, cmi_fmt, 0};
/* ------------------------------------------------------------------------- */
/* Register Utilities */
-static u_int32_t
+static uint32_t
cmi_rd(struct sc_info *sc, int regno, int size)
{
switch (size) {
@@ -162,7 +162,7 @@ cmi_rd(struct sc_info *sc, int regno, int size)
}
static void
-cmi_wr(struct sc_info *sc, int regno, u_int32_t data, int size)
+cmi_wr(struct sc_info *sc, int regno, uint32_t data, int size)
{
switch (size) {
case 1:
@@ -179,9 +179,9 @@ cmi_wr(struct sc_info *sc, int regno, u_int32_t data, int size)
static void
cmi_partial_wr4(struct sc_info *sc,
- int reg, int shift, u_int32_t mask, u_int32_t val)
+ int reg, int shift, uint32_t mask, uint32_t val)
{
- u_int32_t r;
+ uint32_t r;
r = cmi_rd(sc, reg, 4);
r &= ~(mask << shift);
@@ -190,9 +190,9 @@ cmi_partial_wr4(struct sc_info *sc,
}
static void
-cmi_clr4(struct sc_info *sc, int reg, u_int32_t mask)
+cmi_clr4(struct sc_info *sc, int reg, uint32_t mask)
{
- u_int32_t r;
+ uint32_t r;
r = cmi_rd(sc, reg, 4);
r &= ~mask;
@@ -200,9 +200,9 @@ cmi_clr4(struct sc_info *sc, int reg, u_int32_t mask)
}
static void
-cmi_set4(struct sc_info *sc, int reg, u_int32_t mask)
+cmi_set4(struct sc_info *sc, int reg, uint32_t mask)
{
- u_int32_t r;
+ uint32_t r;
r = cmi_rd(sc, reg, 4);
r |= mask;
@@ -219,7 +219,7 @@ static int cmi_rates[] = {5512, 8000, 11025, 16000,
/* cmpci_rate_to_regvalue returns sampling freq selector for FCR1
* register - reg order is 5k,11k,22k,44k,8k,16k,32k,48k */
-static u_int32_t
+static uint32_t
cmpci_rate_to_regvalue(int rate)
{
int i, r;
@@ -237,7 +237,7 @@ cmpci_rate_to_regvalue(int rate)
}
static int
-cmpci_regvalue_to_rate(u_int32_t r)
+cmpci_regvalue_to_rate(uint32_t r)
{
int i;
@@ -251,14 +251,14 @@ cmpci_regvalue_to_rate(u_int32_t r)
* playback or capture. We use ch0 for playback and ch1 for capture. */
static void
-cmi_dma_prog(struct sc_info *sc, struct sc_chinfo *ch, u_int32_t base)
+cmi_dma_prog(struct sc_info *sc, struct sc_chinfo *ch, uint32_t base)
{
- u_int32_t s, i, sz;
+ uint32_t s, i, sz;
ch->phys_buf = ch->buffer->buf_addr;
cmi_wr(sc, base, ch->phys_buf, 4);
- sz = (u_int32_t)ch->buffer->bufsize;
+ sz = (uint32_t)ch->buffer->bufsize;
s = sz / ch->bps - 1;
cmi_wr(sc, base + 4, s, 2);
@@ -279,10 +279,10 @@ cmi_ch0_start(struct sc_info *sc, struct sc_chinfo *ch)
ch->dma_active = 1;
}
-static u_int32_t
+static uint32_t
cmi_ch0_stop(struct sc_info *sc, struct sc_chinfo *ch)
{
- u_int32_t r = ch->dma_active;
+ uint32_t r = ch->dma_active;
cmi_clr4(sc, CMPCI_REG_INTR_CTRL, CMPCI_REG_CH0_INTR_ENABLE);
cmi_clr4(sc, CMPCI_REG_FUNC_0, CMPCI_REG_CH0_ENABLE);
@@ -304,10 +304,10 @@ cmi_ch1_start(struct sc_info *sc, struct sc_chinfo *ch)
ch->dma_active = 1;
}
-static u_int32_t
+static uint32_t
cmi_ch1_stop(struct sc_info *sc, struct sc_chinfo *ch)
{
- u_int32_t r = ch->dma_active;
+ uint32_t r = ch->dma_active;
cmi_clr4(sc, CMPCI_REG_INTR_CTRL, CMPCI_REG_CH1_INTR_ENABLE);
cmi_clr4(sc, CMPCI_REG_FUNC_0, CMPCI_REG_CH1_ENABLE);
@@ -319,7 +319,7 @@ cmi_ch1_stop(struct sc_info *sc, struct sc_chinfo *ch)
static void
cmi_spdif_speed(struct sc_info *sc, int speed) {
- u_int32_t fcr1, lcr, mcr;
*** 5721 LINES SKIPPED ***