diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2014-04-25 09:44:44 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-05-26 08:11:42 -0400 |
commit | 3ff7e8f0d455d7c1d8417ad3e71c324d8e704fc9 (patch) | |
tree | 63972214fdc48d1b29c73abd138d7dadef7e974c /sound/firewire/amdtp.c | |
parent | b445db440cf77ead4312b1918545abe06f6ee75b (diff) |
ALSA: firewire-lib: Add 'direction' member to 'amdtp_stream' structure
This patch adds 'direction' member to amdtp_stream structure to indicate its
direction. This patch also adds 'direction' argument to amdtp_stream_init()
function to determine its direction.
The amdtp_stream_init() function is exported and used by firewire-speakers and
dice so this patch also affects them.
This patch just add them. Actual implementation will be done by followed
patches.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/amdtp.c')
-rw-r--r-- | sound/firewire/amdtp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c index 38013f918869..95c5a1515dad 100644 --- a/sound/firewire/amdtp.c +++ b/sound/firewire/amdtp.c | |||
@@ -53,12 +53,14 @@ static void pcm_period_tasklet(unsigned long data); | |||
53 | * amdtp_stream_init - initialize an AMDTP stream structure | 53 | * amdtp_stream_init - initialize an AMDTP stream structure |
54 | * @s: the AMDTP stream to initialize | 54 | * @s: the AMDTP stream to initialize |
55 | * @unit: the target of the stream | 55 | * @unit: the target of the stream |
56 | * @dir: the direction of stream | ||
56 | * @flags: the packet transmission method to use | 57 | * @flags: the packet transmission method to use |
57 | */ | 58 | */ |
58 | int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit, | 59 | int amdtp_stream_init(struct amdtp_stream *s, struct fw_unit *unit, |
59 | enum cip_flags flags) | 60 | enum amdtp_stream_direction dir, enum cip_flags flags) |
60 | { | 61 | { |
61 | s->unit = fw_unit_get(unit); | 62 | s->unit = fw_unit_get(unit); |
63 | s->direction = dir; | ||
62 | s->flags = flags; | 64 | s->flags = flags; |
63 | s->context = ERR_PTR(-1); | 65 | s->context = ERR_PTR(-1); |
64 | mutex_init(&s->mutex); | 66 | mutex_init(&s->mutex); |