Skip to content

Commit

Permalink
ALSA: firewire-lib: Add 'direction' member to 'cmp_connection' structure
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Sakamoto authored and Takashi Iwai committed May 26, 2014
1 parent a7fa0d0 commit c68a1c6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions sound/firewire/cmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions sound/firewire/cmp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion sound/firewire/speakers.c
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,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;

Expand Down

0 comments on commit c68a1c6

Please sign in to comment.