32c32
< SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/channel.c 89774 2002-01-25 04:14:12Z scottl $");
---
> SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/channel.c 89834 2002-01-26 22:13:24Z cg $");
689c689
< b = sndbuf_create(c->name, "primary");
---
> b = sndbuf_create(c->dev, c->name, "primary");
692c692
< bs = sndbuf_create(c->name, "secondary");
---
> bs = sndbuf_create(c->dev, c->name, "secondary");
1034a1035
> int err;
1044,1046c1045,1051
< if (fc == NULL) {
< DEB(printf("can't find root feeder\n"));
< return EINVAL;
---
> KASSERT(fc != NULL, ("can't find root feeder"));
>
> err = chn_addfeeder(c, fc, NULL);
> if (err) {
> DEB(printf("can't add root feeder, err %d\n", err));
>
> return err;
1048,1051d1052
< if (chn_addfeeder(c, fc, NULL)) {
< DEB(printf("can't add root feeder\n"));
< return EINVAL;
< }
1061c1062,1063
< return EINVAL;
---
>
> return EOPNOTSUPP;
1063,1065c1065,1070
< if (chn_addfeeder(c, fc, &desc)) {
< DEB(printf("can't add vchan feeder\n"));
< return EINVAL;
---
>
> err = chn_addfeeder(c, fc, &desc);
> if (err) {
> DEB(printf("can't add vchan feeder, err %d\n", err));
>
> return err;
1070,1074c1075
< if ((c->flags & CHN_F_MAPPED) && (flags != 0)) {
< DEB(printf("can't build feeder chain on mapped channel\n"));
< return EINVAL;
< }
< DEB(printf("not mapped, flags %x\n", flags));
---
> DEB(printf("not mapped, feederflags %x\n", flags));
1087c1088,1089
< return EINVAL;
---
>
> return EOPNOTSUPP;
1096c1098,1099
< return EINVAL;
---
>
> return ENODEV;
1101,1103c1104,1108
< if (chn_addfeeder(c, fc, fc->desc)) {
< DEB(printf("can't add feeder %p, output %x\n", fc, fc->desc->out));
< return EINVAL;
---
> err = chn_addfeeder(c, fc, fc->desc);
> if (err) {
> DEB(printf("can't add feeder %p, output %x, err %d\n", fc, fc->desc->out, err));
>
> return err;
1122c1127
< return EINVAL;
---
> return ENODEV;
1124a1130
>