From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
To: clemens@ladisch.de, tiwai@suse.de, perex@perex.cz
Cc: alsa-devel@alsa-project.org, ffado-devel@lists.sf.net
Subject: [PATCH 13/39] firewire-lib: Add 'direction' member to 'cmp_connection' structure
Date: Wed, 5 Mar 2014 19:48:01 +0900 [thread overview]
Message-ID: <1394016507-15761-14-git-send-email-o-takashi@sakamocchi.jp> (raw)
In-Reply-To: <1394016507-15761-1-git-send-email-o-takashi@sakamocchi.jp>
This patch adds 'direction' member to 'cmp_connection' structure to indicate
the direction of connection. This patch also adds 'direction' argument to
cmp_connection_init() function to determine the direction.
The cmp_connection_init() function is exported and used in snd-firewire-speakers
so this patch also affect it.
This patch just add them. Actual implementation will be done by followed
patches.
---
sound/firewire/cmp.c | 3 ++-
sound/firewire/cmp.h | 7 +++++++
sound/firewire/speakers.c | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sound/firewire/cmp.c b/sound/firewire/cmp.c
index 17ad4f2..c7f7a31 100644
--- a/sound/firewire/cmp.c
+++ b/sound/firewire/cmp.c
@@ -94,6 +94,7 @@ static int pcr_modify(struct cmp_connection *c,
*/
int cmp_connection_init(struct cmp_connection *c,
struct fw_unit *unit,
+ enum cmp_direction direction,
unsigned int pcr_index)
{
__be32 mpr_be;
@@ -153,7 +154,7 @@ static __be32 ipcr_set_modify(struct cmp_connection *c, __be32 ipcr)
static int pcr_set_check(struct cmp_connection *c, __be32 pcr)
{
if (pcr & cpu_to_be32(PCR_BCAST_CONN |
- PCR_P2P_CONN_MASK)) {
+ PCR_P2P_CONN_MASK)) {
cmp_error(c, "plug is already in use\n");
return -EBUSY;
}
diff --git a/sound/firewire/cmp.h b/sound/firewire/cmp.h
index 2320cd4..9b58448 100644
--- a/sound/firewire/cmp.h
+++ b/sound/firewire/cmp.h
@@ -7,6 +7,11 @@
struct fw_unit;
+enum cmp_direction {
+ CMP_INPUT = 0,
+ CMP_OUTPUT,
+};
+
/**
* struct cmp_connection - manages an isochronous connection to a device
* @speed: the connection's actual speed
@@ -26,10 +31,12 @@ struct cmp_connection {
__be32 last_pcr_value;
unsigned int pcr_index;
unsigned int max_speed;
+ enum cmp_direction direction;
};
int cmp_connection_init(struct cmp_connection *connection,
struct fw_unit *unit,
+ enum cmp_direction direction,
unsigned int pcr_index);
void cmp_connection_destroy(struct cmp_connection *connection);
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index c07e7cd..4a9b48b 100644
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -679,7 +679,7 @@ static int fwspk_probe(struct fw_unit *unit,
fwspk->unit = fw_unit_get(unit);
fwspk->device_info = (const struct device_info *)id->driver_data;
- err = cmp_connection_init(&fwspk->connection, unit, 0);
+ err = cmp_connection_init(&fwspk->connection, unit, CMP_INPUT, 0);
if (err < 0)
goto err_unit;
--
1.8.3.2
next prev parent reply other threads:[~2014-03-05 10:49 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <5316963F.1000206@sakamocchi.jp>
2014-03-05 6:14 ` [GIT PULL v2] Enhancement of support for Firewire devices Takashi Iwai
2014-03-05 11:00 ` Takashi Sakamoto
2014-03-05 11:09 ` Takashi Iwai
2014-03-05 11:23 ` Takashi Sakamoto
2014-03-05 10:47 ` [GIT PULL][PATCH 00/39 " Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 01/39] firewire-lib: Rename functions, structure, member for AMDTP Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 02/39] firewire-lib: Add macros instead of fixed value " Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 03/39] firewire-lib: Add 'direction' member to 'amdtp_stream' structure Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 04/39] firewire-lib: Split some codes into functions to reuse for both streams Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 05/39] firewire-lib: Add support for AMDTP in-stream and PCM capture Takashi Sakamoto
2014-03-09 20:37 ` Clemens Ladisch
2014-03-10 3:55 ` Takashi Sakamoto
2014-03-12 2:00 ` Takashi Sakamoto
2014-03-14 13:50 ` Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 06/39] firewire-lib: Add support for MIDI capture/playback Takashi Sakamoto
2014-03-09 20:48 ` Clemens Ladisch
2014-03-10 4:13 ` Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 07/39] firewire-lib: Give syt value as parameter to handle_out_packet() Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 08/39] firewire-lib: Add support for duplex streams synchronization in blocking mode Takashi Sakamoto
2014-03-09 20:55 ` Clemens Ladisch
2014-03-10 12:21 ` Takashi Sakamoto
2014-03-05 10:47 ` [PATCH 09/39] firewire-lib: Add sort function for transmitted packet Takashi Sakamoto
2014-03-09 21:07 ` Clemens Ladisch
2014-03-10 13:29 ` Takashi Sakamoto
2014-03-11 8:11 ` Clemens Ladisch
2014-03-12 1:23 ` Takashi Sakamoto
2014-03-12 7:21 ` Takashi Iwai
2014-03-05 10:47 ` [PATCH 10/39] firewire-lib: Add transfer delay to synchronized duplex streams Takashi Sakamoto
2014-03-09 21:13 ` Clemens Ladisch
2014-03-10 13:43 ` Takashi Sakamoto
2014-03-11 8:13 ` Clemens Ladisch
2014-03-05 10:47 ` [PATCH 11/39] firewire-lib: Add support for channel mapping Takashi Sakamoto
2014-03-09 21:20 ` Clemens Ladisch
2014-03-10 12:28 ` Takashi Sakamoto
2014-03-10 12:58 ` Takashi Sakamoto
2014-03-11 8:23 ` Clemens Ladisch
2014-03-11 16:03 ` Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 12/39] firewire-lib: Rename macros, variables and functions for CMP Takashi Sakamoto
2014-03-05 10:48 ` Takashi Sakamoto [this message]
2014-03-05 10:48 ` [PATCH 14/39] firewire-lib: Add handling output connection by CMP Takashi Sakamoto
2014-03-09 21:27 ` Clemens Ladisch
2014-03-10 12:30 ` Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 15/39] firewire-lib: Add a new function to check others' connection Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 16/39] firewire-lib: Add some AV/C general commands Takashi Sakamoto
2014-03-09 21:32 ` Clemens Ladisch
2014-03-10 12:46 ` Takashi Sakamoto
2014-03-14 14:10 ` Takashi Sakamoto
2014-03-14 22:18 ` Clemens Ladisch
2014-03-05 10:48 ` [PATCH 17/39] firewire-lib: Add quirks for Fireworks Takashi Sakamoto
2014-03-09 21:39 ` Clemens Ladisch
2014-03-10 12:40 ` Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 18/39] firewire-lib: Add a fallback at RCODE_CANCELLED Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 19/39] fireworks: Add skelton for Fireworks based devices Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 20/39] fireworks: Add transaction and some commands Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 21/39] fireworks: Add connection and stream management Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 22/39] fireworks: Add proc interface for debugging purpose Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 23/39] fireworks: Add MIDI interface Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 24/39] fireworks: Add PCM interface Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 25/39] fireworks: Add hwdep interface Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 26/39] fireworks: Add command/response functionality into " Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 27/39] bebob: Add skelton for BeBoB based devices Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 28/39] bebob: Add commands and connections/streams management Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 29/39] bebob: Add proc interface for debugging purpose Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 30/39] bebob: Add MIDI interface Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 31/39] bebob: Add PCM interface Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 32/39] bebob: Add hwdep interface Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 33/39] bebob: Prepare for device specific operations Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 34/39] bebob: Add support for Terratec PHASE, EWS series and Aureon Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 35/39] bebob: Add support for Yamaha GO series Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 36/39] bebob: Add support for Focusrite Saffire/SaffirePro series Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 37/39] bebob: Add support for M-Audio usual Firewire series Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 38/39] bebob: Add support for M-Audio special " Takashi Sakamoto
2014-03-05 10:48 ` [PATCH 39/39] bebob: Send a cue to load firmware for M-Audio " Takashi Sakamoto
2014-03-07 11:44 ` [GIT PULL v2] Enhancement of support for Firewire devices Takashi Iwai
2014-03-07 14:46 ` Clemens Ladisch
2014-02-28 3:27 [GIT PULL][PATCH 00/39] " Takashi Sakamoto
2014-02-28 3:27 ` [PATCH 13/39] firewire-lib: Add 'direction' member to 'cmp_connection' structure Takashi Sakamoto
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=1394016507-15761-14-git-send-email-o-takashi@sakamocchi.jp \
--to=o-takashi@sakamocchi.jp \
--cc=alsa-devel@alsa-project.org \
--cc=clemens@ladisch.de \
--cc=ffado-devel@lists.sf.net \
--cc=perex@perex.cz \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).