25c25
< * $FreeBSD: head/sys/dev/sound/pci/solo.c 67652 2000-10-26 20:46:58Z cg $
---
> * $FreeBSD: head/sys/dev/sound/pci/solo.c 70134 2000-12-18 01:36:41Z cg $
35a36,37
> #include "mixer_if.h"
>
45,53d46
< /* channel interface for ESS */
< static void *esschan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir);
< static int esschan_setformat(void *data, u_int32_t format);
< static int esschan_setspeed(void *data, u_int32_t speed);
< static int esschan_setblocksize(void *data, u_int32_t blocksize);
< static int esschan_trigger(void *data, int go);
< static int esschan_getptr(void *data);
< static pcmchan_caps *esschan_getcaps(void *data);
<
83,101d75
< static pcm_channel ess_chantemplate = {
< esschan_init,
< NULL, /* setdir */
< esschan_setformat,
< esschan_setspeed,
< esschan_setblocksize,
< esschan_trigger,
< esschan_getptr,
< esschan_getcaps,
< NULL, /* free */
< NULL, /* nop1 */
< NULL, /* nop2 */
< NULL, /* nop3 */
< NULL, /* nop4 */
< NULL, /* nop5 */
< NULL, /* nop6 */
< NULL, /* nop7 */
< };
<
144,156d117
< static int essmix_init(snd_mixer *m);
< static int essmix_set(snd_mixer *m, unsigned dev, unsigned left, unsigned right);
< static int essmix_setrecsrc(snd_mixer *m, u_int32_t src);
<
< static snd_mixer ess_mixer = {
< "ESS mixer",
< essmix_init,
< NULL,
< NULL,
< essmix_set,
< essmix_setrecsrc,
< };
<
548a510
> /* -------------------------------------------------------------------- */
551c513
< esschan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir)
---
> esschan_init(kobj_t obj, void *devinfo, snd_dbuf *b, pcm_channel *c, int dir)
571c533
< esschan_setformat(void *data, u_int32_t format)
---
> esschan_setformat(kobj_t obj, void *data, u_int32_t format)
580c542
< esschan_setspeed(void *data, u_int32_t speed)
---
> esschan_setspeed(kobj_t obj, void *data, u_int32_t speed)
594c556
< esschan_setblocksize(void *data, u_int32_t blocksize)
---
> esschan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize)
600c562
< esschan_trigger(void *data, int go)
---
> esschan_trigger(kobj_t obj, void *data, int go)
626c588
< esschan_getptr(void *data)
---
> esschan_getptr(kobj_t obj, void *data)
635c597
< esschan_getcaps(void *data)
---
> esschan_getcaps(kobj_t obj, void *data)
641a604,615
> static kobj_method_t esschan_methods[] = {
> KOBJMETHOD(channel_init, esschan_init),
> KOBJMETHOD(channel_setformat, esschan_setformat),
> KOBJMETHOD(channel_setspeed, esschan_setspeed),
> KOBJMETHOD(channel_setblocksize, esschan_setblocksize),
> KOBJMETHOD(channel_trigger, esschan_trigger),
> KOBJMETHOD(channel_getptr, esschan_getptr),
> KOBJMETHOD(channel_getcaps, esschan_getcaps),
> { 0, 0 }
> };
> CHANNEL_DECLARE(esschan);
>
751a726,733
> static kobj_method_t solomixer_methods[] = {
> KOBJMETHOD(mixer_init, essmix_init),
> KOBJMETHOD(mixer_set, essmix_set),
> KOBJMETHOD(mixer_setrecsrc, essmix_setrecsrc),
> { 0, 0 }
> };
> MIXER_DECLARE(solomixer);
>
945c927,928
< mixer_init(dev, &ess_mixer, sc);
---
> if (mixer_init(dev, &solomixer_class, sc))
> goto no;
983,984c966,967
< pcm_addchan(dev, PCMDIR_REC, &ess_chantemplate, sc);
< pcm_addchan(dev, PCMDIR_PLAY, &ess_chantemplate, sc);
---
> pcm_addchan(dev, PCMDIR_REC, &esschan_class, sc);
> pcm_addchan(dev, PCMDIR_PLAY, &esschan_class, sc);