aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-04-25 09:44:57 -0400
committerTakashi Iwai <tiwai@suse.de>2014-05-26 08:22:46 -0400
commitb04479fb8540c906f0ad17f21e4c2715f6e8e7a3 (patch)
tree4fc9162da6a97bcc5db9e8aee49e19620cab081e /sound/firewire
parent44aff6980af107cccda4d6677995c88b9dad3482 (diff)
ALSA: firewire-lib: Add a new function to check others' connection
Plug Control Registers have two fields related to the number of established connections, one is 'Broadcast connection counter' and another is 'Point-to-point connection counter'. The driver can know there are established connections or not to check these fields. This commit is for considering about JACK/FFADO streaming. Currently, when JACK/FFADO starts its streaming to the device, cmp_connection_establish() is failed expectedly. This seems to be enough but there are some devices which needs to change sampling frequency before trying to establish connections. For such devices, this functionality is needed. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/cmp.c18
-rw-r--r--sound/firewire/cmp.h1
2 files changed, 19 insertions, 0 deletions
diff --git a/sound/firewire/cmp.c b/sound/firewire/cmp.c
index 9da40d9e79da..d31a403ac539 100644
--- a/sound/firewire/cmp.c
+++ b/sound/firewire/cmp.c
@@ -152,6 +152,24 @@ int cmp_connection_init(struct cmp_connection *c,
152EXPORT_SYMBOL(cmp_connection_init); 152EXPORT_SYMBOL(cmp_connection_init);
153 153
154/** 154/**
155 * cmp_connection_check_used - check connection is already esablished or not
156 * @c: the connection manager to be checked
157 */
158int cmp_connection_check_used(struct cmp_connection *c, bool *used)
159{
160 __be32 pcr;
161 int err;
162
163 err = snd_fw_transaction(
164 c->resources.unit, TCODE_READ_QUADLET_REQUEST,
165 pcr_address(c), &pcr, 4, 0);
166 if (err >= 0)
167 *used = (pcr & cpu_to_be32(PCR_BCAST_CONN | PCR_P2P_CONN_MASK));
168 return err;
169}
170EXPORT_SYMBOL(cmp_connection_check_used);
171
172/**
155 * cmp_connection_destroy - free connection manager resources 173 * cmp_connection_destroy - free connection manager resources
156 * @c: the connection manager 174 * @c: the connection manager
157 */ 175 */
diff --git a/sound/firewire/cmp.h b/sound/firewire/cmp.h
index 9b58448d5791..ebcb48484fca 100644
--- a/sound/firewire/cmp.h
+++ b/sound/firewire/cmp.h
@@ -38,6 +38,7 @@ int cmp_connection_init(struct cmp_connection *connection,
38 struct fw_unit *unit, 38 struct fw_unit *unit,
39 enum cmp_direction direction, 39 enum cmp_direction direction,
40 unsigned int pcr_index); 40 unsigned int pcr_index);
41int cmp_connection_check_used(struct cmp_connection *connection, bool *used);
41void cmp_connection_destroy(struct cmp_connection *connection); 42void cmp_connection_destroy(struct cmp_connection *connection);
42 43
43int cmp_connection_establish(struct cmp_connection *connection, 44int cmp_connection_establish(struct cmp_connection *connection,