Merge tag 'clk-for-linus-3.16-part2' of git://git.linaro.org/people/mike.turquette...

[deliverable/linux.git] / sound / firewire / cmp.h

diff --git a/sound/firewire/cmp.h b/sound/firewire/cmp.h
index f47de08feb12c0c09c5478f532ccf721322602d1..ebcb48484fca30ec8f906720032a1146590ada1d 100644 (file)
--- a/sound/firewire/cmp.h
+++ b/sound/firewire/cmp.h
@@ -7,12 +7,17 @@
 
 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
  *
- * This structure manages (using CMP) an isochronous stream from the local
- * computer to a device's input plug (iPCR).
+ * This structure manages (using CMP) an isochronous stream between the local
+ * computer and a device's input plug (iPCR) and output plug (oPCR).
  *
  * There is no corresponding oPCR created on the local computer, so it is not
  * possible to overlay connections on top of this one.
@@ -26,11 +31,14 @@ 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,
-                       unsigned int ipcr_index);
+                       enum cmp_direction direction,
+                       unsigned int pcr_index);
+int cmp_connection_check_used(struct cmp_connection *connection, bool *used);
 void cmp_connection_destroy(struct cmp_connection *connection);
 
 int cmp_connection_establish(struct cmp_connection *connection,