aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/sound/pcm/channel.h
diff options
context:
space:
mode:
authorChristos Margiolis <christos@FreeBSD.org>2024-05-06 18:26:37 +0000
committerChristos Margiolis <christos@FreeBSD.org>2024-05-06 18:26:37 +0000
commit2e9962ef57044b191431fe9228841e1415574d82 (patch)
tree7a461487f36f864c66615093ad9408df79044740 /sys/dev/sound/pcm/channel.h
parent308caa38cdf5db4d688b7243d74ecd301b77945f (diff)
downloadsrc-2e9962ef57044b191431fe9228841e1415574d82.tar.gz
src-2e9962ef57044b191431fe9228841e1415574d82.zip
sound: Merge pcm_chn_create() and chn_init()
Follow-up of b3ea087c05d8c75978a302cbb3fa92ce1afa3e49 ("sound: Merge pcm_chn_destroy() and chn_kill()") While here, add device_printf()'s to all failure points. Also fix an existing bug where we'd unlock an already unlocked channel, in case we went to "out" (now "out2") before locking the channel. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D44993
Diffstat (limited to 'sys/dev/sound/pcm/channel.h')
-rw-r--r--sys/dev/sound/pcm/channel.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 698a1186924f..6aca089a7c4d 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -259,7 +259,8 @@ int chn_sync(struct pcm_channel *c, int threshold);
int chn_flush(struct pcm_channel *c);
int chn_poll(struct pcm_channel *c, int ev, struct thread *td);
-int chn_init(struct pcm_channel *c, void *devinfo, int dir, int direction);
+struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent,
+ kobj_class_t cls, int dir, int num, void *devinfo);
void chn_kill(struct pcm_channel *c);
void chn_shutdown(struct pcm_channel *c);
int chn_release(struct pcm_channel *c);