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

Use bus_addr_t instead of u_int for local variables that are derived from

Browse Source 
the per-channel bus_addr_t offset.  Also, cast the offset to (long long)
and use %#llx instead of %#x to fix printf warnings on architectures where
sizeof(bus_addr_t) != sizeof(int).
This commit is contained in:
John Baldwin 2002-04-15 19:16:37 +00:00
parent 9264fbc80a
commit e789153cfc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,10 +520,10 @@ agg_init(struct agg_info* ess)
static void static void
aggch_start_dac(struct agg_chinfo *ch) aggch_start_dac(struct agg_chinfo *ch)
{ {
u_int wpwa = APU_USE_SYSMEM | (ch->offset >> 9); bus_addr_t wpwa = APU_USE_SYSMEM | (ch->offset >> 9);
u_int size = ch->parent->bufsz >> 1; u_int size = ch->parent->bufsz >> 1;
u_int speed = ch->speed; u_int speed = ch->speed;
u_int offset = ch->offset >> 1; bus_addr_t offset = ch->offset >> 1;
u_int cp = 0; u_int cp = 0;
u_int16_t apuch = ch->num << 1; u_int16_t apuch = ch->num << 1;
u_int dv; u_int dv;
@ -663,7 +663,7 @@ aggch_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c,
ch->offset = physaddr - ess->baseaddr; ch->offset = physaddr - ess->baseaddr;
if (physaddr < ess->baseaddr || ch->offset > WPWA_MAXADDR) { if (physaddr < ess->baseaddr || ch->offset > WPWA_MAXADDR) {
device_printf(ess->dev, device_printf(ess->dev,
"offset %#x exceeds limit. ", ch->offset); "offset %#llx exceeds limit. ", (long long)ch->offset);
dma_free(ess, sndbuf_getbuf(b)); dma_free(ess, sndbuf_getbuf(b));
return NULL; return NULL;
} }
@ -673,9 +673,9 @@ aggch_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c,
if (dir == PCMDIR_PLAY) { if (dir == PCMDIR_PLAY) {
ess->playchns++; ess->playchns++;
if (bootverbose) if (bootverbose)
device_printf(ess->dev, "pch[%d].offset = %#x\n", ch->num, ch->offset); device_printf(ess->dev, "pch[%d].offset = %#llx\n", ch->num, (long long)ch->offset);
} else if (bootverbose) } else if (bootverbose)
device_printf(ess->dev, "rch.offset = %#x\n", ch->offset); device_printf(ess->dev, "rch.offset = %#llx\n", (long long)ch->offset);
return ch; return ch;
} }