summaryrefslogtreecommitdiff
path: root/sound/firewire/cmp.h
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-04-25 22:44:54 +0900
committerTakashi Iwai <tiwai@suse.de>2014-05-26 14:21:57 +0200
commita7fa0d047f879bf3c744e9005769183abdf2ec4b (patch)
treebcc2d44b46bd9cb04dd9041cdf23a77f79686bd8 /sound/firewire/cmp.h
parentc8de6dbbbb422030d3c174146b2137e69a528d69 (diff)
ALSA: firewire-lib: Rename macros, variables and functions for CMP
Referring to IEC 61883-1, oMPR and iMPR, oPCR and iPCR have some fields with the same role in the same position. This patch renames some macros, variables and function arguments with "i" in its prefix to reuse them between oMPR and iMPR, oPCR and iPCR. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/cmp.h')
-rw-r--r--sound/firewire/cmp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/firewire/cmp.h b/sound/firewire/cmp.h
index f47de08feb12..2320cd44d499 100644
--- a/sound/firewire/cmp.h
+++ b/sound/firewire/cmp.h
@@ -11,8 +11,8 @@ struct fw_unit;
* 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.
@@ -30,7 +30,7 @@ struct cmp_connection {
int cmp_connection_init(struct cmp_connection *connection,
struct fw_unit *unit,
- unsigned int ipcr_index);
+ unsigned int pcr_index);
void cmp_connection_destroy(struct cmp_connection *connection);
int cmp_connection_establish(struct cmp_connection *connection,