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

argh, forgot the bus_dma_tag_creates.

Browse Source 
also, panic if channel init fails instead of derefing null.
This commit is contained in:
Cameron Grant 2000-01-05 04:01:34 +00:00
parent 24870fab24
commit 2abc85f0c0
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -890,7 +890,7 @@ mss_doattach(device_t dev, struct mss_info *mss)
/*lowaddr*/BUS_SPACE_MAXADDR_24BIT,
/*highaddr*/BUS_SPACE_MAXADDR,
/*filter*/NULL, /*filterarg*/NULL,
/*maxsize*/DSP_BUFFSIZE, /*nsegments*/1,
/*maxsize*/MSS_BUFFSIZE, /*nsegments*/1,
/*maxsegz*/0x3ffff,
/*flags*/0, &mss->parent_dmat) != 0) {
device_printf(dev, "unable to create dma tag\n");

3
sys/dev/sound/isa/sb.c
View File

@ -464,6 +464,7 @@ sb_doattach(device_t dev, struct sb_info *sb)
snddev_info *d = device_get_softc(dev);
void *ih;
char status[SND_STATUSLEN];
int bs = (sb->bd_flags & BD_F_ESS)? ESS_BUFFSIZE : DSP_BUFFSIZE;
if (sb_alloc_resources(sb, dev)) goto no;
if (sb_reset_dsp(sb)) goto no;
@ -482,7 +483,7 @@ sb_doattach(device_t dev, struct sb_info *sb)
/*lowaddr*/BUS_SPACE_MAXADDR_24BIT,
/*highaddr*/BUS_SPACE_MAXADDR,
/*filter*/NULL, /*filterarg*/NULL,
/*maxsize*/DSP_BUFFSIZE, /*nsegments*/1,
/*maxsize*/bs, /*nsegments*/1,
/*maxsegz*/0x3ffff,
/*flags*/0, &sb->parent_dmat) != 0) {
device_printf(dev, "unable to create dma tag\n");

3
sys/dev/sound/isa/sb16.c
View File

@ -464,6 +464,7 @@ sb_doattach(device_t dev, struct sb_info *sb)
snddev_info *d = device_get_softc(dev);
void *ih;
char status[SND_STATUSLEN];
int bs = (sb->bd_flags & BD_F_ESS)? ESS_BUFFSIZE : DSP_BUFFSIZE;
if (sb_alloc_resources(sb, dev)) goto no;
if (sb_reset_dsp(sb)) goto no;
@ -482,7 +483,7 @@ sb_doattach(device_t dev, struct sb_info *sb)
/*lowaddr*/BUS_SPACE_MAXADDR_24BIT,
/*highaddr*/BUS_SPACE_MAXADDR,
/*filter*/NULL, /*filterarg*/NULL,
/*maxsize*/DSP_BUFFSIZE, /*nsegments*/1,
/*maxsize*/bs, /*nsegments*/1,
/*maxsegz*/0x3ffff,
/*flags*/0, &sb->parent_dmat) != 0) {
device_printf(dev, "unable to create dma tag\n");

3
sys/dev/sound/isa/sb8.c
View File

@ -464,6 +464,7 @@ sb_doattach(device_t dev, struct sb_info *sb)
snddev_info *d = device_get_softc(dev);
void *ih;
char status[SND_STATUSLEN];
int bs = (sb->bd_flags & BD_F_ESS)? ESS_BUFFSIZE : DSP_BUFFSIZE;
if (sb_alloc_resources(sb, dev)) goto no;
if (sb_reset_dsp(sb)) goto no;
@ -482,7 +483,7 @@ sb_doattach(device_t dev, struct sb_info *sb)
/*lowaddr*/BUS_SPACE_MAXADDR_24BIT,
/*highaddr*/BUS_SPACE_MAXADDR,
/*filter*/NULL, /*filterarg*/NULL,
/*maxsize*/DSP_BUFFSIZE, /*nsegments*/1,
/*maxsize*/bs, /*nsegments*/1,
/*maxsegz*/0x3ffff,
/*flags*/0, &sb->parent_dmat) != 0) {
device_printf(dev, "unable to create dma tag\n");

1
sys/dev/sound/pcm/channel.c
View File

@ -1021,6 +1021,7 @@ chn_init(pcm_channel *c, void *devinfo, int dir)
c->feeder = &feeder_root;
c->buffer.chan = -1;
c->devinfo = c->init(devinfo, &c->buffer, c, dir);
if (c->devinfo == NULL) panic("c->init() failed");
chn_setdir(c, dir);
/* And the secondary buffer. */