ALSA: firewire-lib: Add 'direction' member to 'cmp_connection' structure

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>

diff --git a/sound/firewire/cmp.c b/sound/firewire/cmp.c
index deb494d6e78553d625c1772f5e79a9704e5ae3ed..c7f7a3164390e6c746b1e77e3fa27769a953d92a 100644 (file)
--- 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;

diff --git a/sound/firewire/cmp.h b/sound/firewire/cmp.h
index 2320cd44d49954b16df2109212dcbd51e9b7ab40..9b58448d5791ab2ca705b090023eae50693409c5 100644 (file)
--- 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 58e7ab010c602aa57a0860bcbf916e5466589af3..dd9983b98607da4859aa56a7bdba4c7e8275403c 100644 (file)
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -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;