From: Clemens Ladisch <clemens@ladisch.de>
To: Takashi Iwai <tiwai@suse.de>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
alsa-devel@alsa-project.org
Subject: [RFC PATCH 04/11] ALSA: implement MEDIA_IOC_ENUM_LINKS (1)
Date: Tue, 28 Aug 2012 00:31:19 +0200 [thread overview]
Message-ID: <503BF537.8060107@ladisch.de> (raw)
In-Reply-To: <503BF48E.1090100@ladisch.de>
Allow to retrieve pad information.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
---
sound/core/media.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/sound/core/media.c b/sound/core/media.c
index aa94175..96b09a3 100644
--- a/sound/core/media.c
+++ b/sound/core/media.c
@@ -161,6 +161,48 @@ static int snd_media_enum_entities(struct snd_card *card,
return copy_to_user(descp, &desc, sizeof(desc));
}
+static int snd_media_enum_links(struct snd_card *card,
+ struct media_links_enum __user *linksp)
+{
+ struct media_links_enum links;
+ struct snd_media_entity *entity;
+
+ if (copy_from_user(&links, linksp, sizeof(links)))
+ return -EFAULT;
+
+ mutex_lock(&card->media_mutex);
+ entity = search_entity(card, links.entity);
+ mutex_unlock(&card->media_mutex);
+ if (!entity)
+ return -EINVAL;
+
+ if (links.pads) {
+ struct media_pad_desc pad;
+ unsigned int i;
+
+ memset(&pad, 0, sizeof(pad));
+ pad.entity = entity->id;
+
+ pad.flags = MEDIA_PAD_FL_SINK;
+ for (i = 0; i < entity->sinks; i++) {
+ if (copy_to_user(links.pads, &pad, sizeof(pad)))
+ return -EFAULT;
+ links.pads++;
+ pad.index++;
+ }
+
+ pad.flags = MEDIA_PAD_FL_SOURCE;
+ for (i = 0; i < entity->sources; i++) {
+ if (copy_to_user(links.pads, &pad, sizeof(pad)))
+ return -EFAULT;
+ links.pads++;
+ pad.index++;
+ }
+ }
+
+ return 0;
+}
+
static int snd_media_control_ioctl(struct snd_card *card,
struct snd_ctl_file *ctl_file,
unsigned int cmd, unsigned long arg)
@@ -172,6 +214,8 @@ static int snd_media_control_ioctl(struct snd_card *card,
return snd_media_device_info(card, argp);
case MEDIA_IOC_ENUM_ENTITIES:
return snd_media_enum_entities(card, argp);
+ case MEDIA_IOC_ENUM_LINKS:
+ return snd_media_enum_links(card, argp);
default:
return -ENOIOCTLCMD;
}
next prev parent reply other threads:[~2012-08-27 22:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-27 22:28 [RFC PATCH 1/11] expose sound device topology information Clemens Ladisch
2012-08-27 22:29 ` [RFC PATCH 01/11] ALSA: implement MEDIA_IOC_DEVICE_INFO Clemens Ladisch
2012-09-07 2:13 ` Mark Brown
2012-09-07 7:14 ` Clemens Ladisch
2012-09-07 10:40 ` Takashi Iwai
2012-08-27 22:30 ` [RFC PATCH 02/11] ALSA: implement MEDIA_IOC_ENUM_ENTITIES Clemens Ladisch
2012-08-27 22:30 ` [RFC PATCH 03/11] ALSA: pcm: add ALSA PCM device entities Clemens Ladisch
2012-08-27 22:31 ` Clemens Ladisch [this message]
2012-08-27 22:31 ` [RFC PATCH 05/11] ALSA: implement MEDIA_IOC_ENUM_LINKS (2) Clemens Ladisch
2012-08-27 22:32 ` [RFC PATCH 06/11] ALSA: implement MEDIA_IOC_SETUP_LINK Clemens Ladisch
2012-08-27 22:33 ` [RFC PATCH 07/11] [media] media: add entity types for ALSA Clemens Ladisch
2012-08-27 22:33 ` [RFC PATCH 08/11] ALSA: usb-audio: implement card get_info callback Clemens Ladisch
2012-08-27 22:34 ` [RFC PATCH 09/11] ALSA: usb-audio: create PCM device entities Clemens Ladisch
2012-08-27 22:35 ` [RFC PATCH 10/11] ALSA: usb-audio: add terminal/unit entities and links Clemens Ladisch
2012-08-27 22:36 ` [RFC PATCH 11/11] ALSA: hda-intel: implement card get_info callback Clemens Ladisch
2012-09-04 15:56 ` [RFC PATCH 1/11] expose sound device topology information Takashi Iwai
2012-09-04 18:02 ` Clemens Ladisch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=503BF537.8060107@ladisch.de \
--to=clemens@ladisch.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.