diff options
| author | Cameron Grant <cg@FreeBSD.org> | 2000-09-01 20:09:24 +0000 |
|---|---|---|
| committer | Cameron Grant <cg@FreeBSD.org> | 2000-09-01 20:09:24 +0000 |
| commit | 33dbf14a176a5bdcd78deec75616b8ede1937e96 (patch) | |
| tree | de613fdf24f49d54b13e2071271879602e1f83e8 /sys/dev/sound/pci/t4dwave.c | |
| parent | 84a563762067d9b4f4bfa534c936519173acdd89 (diff) | |
| download | src-33dbf14a176a5bdcd78deec75616b8ede1937e96.tar.gz src-33dbf14a176a5bdcd78deec75616b8ede1937e96.zip | |
change mixer api slightly
change channel interface - kobj implementation coming soonish
make pcm_makelinks not panic if modular
add pcm_unregister()
these changes support newpcm kld unloading, but this is only implemented
by ds1.c
Notes
Notes:
svn path=/head/; revision=65340
Diffstat (limited to 'sys/dev/sound/pci/t4dwave.c')
| -rw-r--r-- | sys/dev/sound/pci/t4dwave.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 83b38aadcdce..f65bdb4cfc90 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -150,6 +150,14 @@ static pcm_channel tr_chantemplate = { trchan_trigger, trchan_getptr, trchan_getcaps, + NULL, /* free */ + NULL, /* nop1 */ + NULL, /* nop2 */ + NULL, /* nop3 */ + NULL, /* nop4 */ + NULL, /* nop5 */ + NULL, /* nop6 */ + NULL, /* nop7 */ }; /* -------------------------------------------------------------------- */ @@ -601,7 +609,6 @@ tr_pci_probe(device_t dev) static int tr_pci_attach(device_t dev) { - snddev_info *d; u_int32_t data; struct tr_info *tr; struct ac97_info *codec; @@ -609,7 +616,6 @@ tr_pci_attach(device_t dev) int mapped; char status[SND_STATUSLEN]; - d = device_get_softc(dev); if ((tr = malloc(sizeof(*tr), M_DEVBUF, M_NOWAIT)) == NULL) { device_printf(dev, "cannot allocate softc\n"); return ENXIO; @@ -655,7 +661,7 @@ tr_pci_attach(device_t dev) codec = ac97_create(dev, tr, NULL, tr_rdcd, tr_wrcd); if (codec == NULL) goto bad; - if (mixer_init(d, &ac97_mixer, codec) == -1) goto bad; + if (mixer_init(dev, &ac97_mixer, codec) == -1) goto bad; tr->irqid = 0; tr->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &tr->irqid, |