aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2014-11-18 09:59:40 -0500
committerTakashi Iwai <tiwai@suse.de>2014-11-18 12:10:23 -0500
commit5f217f905bc5e9d609d0aac830736bcfc087c7f5 (patch)
treed973e91b15e146c39e8daad26824107b078496ca /sound/firewire
parent1ea7a568c63a4735872fc091efbd22d2e4d9c972 (diff)
ALSA: firewire-lib: fix kerneldoc errors
Complete missing parameters, correct wrong reference, and add an explaination about the differences between the latest specification and our implementation. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/amdtp.h24
-rw-r--r--sound/firewire/cmp.c2
2 files changed, 24 insertions, 2 deletions
diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
index 4823c08196ac..e6e8926275b0 100644
--- a/sound/firewire/amdtp.h
+++ b/sound/firewire/amdtp.h
@@ -23,7 +23,7 @@
23 * corresponds to the end of event in the packet. Out of IEC 61883. 23 * corresponds to the end of event in the packet. Out of IEC 61883.
24 * @CIP_WRONG_DBS: Only for in-stream. The value of dbs is wrong in in-packets. 24 * @CIP_WRONG_DBS: Only for in-stream. The value of dbs is wrong in in-packets.
25 * The value of data_block_quadlets is used instead of reported value. 25 * The value of data_block_quadlets is used instead of reported value.
26 * @SKIP_DBC_ZERO_CHECK: Only for in-stream. Packets with zero in dbc is 26 * @CIP_SKIP_DBC_ZERO_CHECK: Only for in-stream. Packets with zero in dbc is
27 * skipped for detecting discontinuity. 27 * skipped for detecting discontinuity.
28 * @CIP_SKIP_INIT_DBC_CHECK: Only for in-stream. The value of dbc in first 28 * @CIP_SKIP_INIT_DBC_CHECK: Only for in-stream. The value of dbc in first
29 * packet is not continuous from an initial value. 29 * packet is not continuous from an initial value.
@@ -43,7 +43,27 @@ enum cip_flags {
43}; 43};
44 44
45/** 45/**
46 * enum cip_sfc - a stream's sample rate 46 * enum cip_sfc - supported Sampling Frequency Codes (SFCs)
47 * @CIP_SFC_32000: 32,000 data blocks
48 * @CIP_SFC_44100: 44,100 data blocks
49 * @CIP_SFC_48000: 48,000 data blocks
50 * @CIP_SFC_88200: 88,200 data blocks
51 * @CIP_SFC_96000: 96,000 data blocks
52 * @CIP_SFC_176400: 176,400 data blocks
53 * @CIP_SFC_192000: 192,000 data blocks
54 * @CIP_SFC_COUNT: the number of supported SFCs
55 *
56 * These values are used to show nominal Sampling Frequency Code in
57 * Format Dependent Field (FDF) of AMDTP packet header. In IEC 61883-6:2002,
58 * this code means the number of events per second. Actually the code
59 * represents the number of data blocks transferred per second in an AMDTP
60 * stream.
61 *
62 * In IEC 61883-6:2005, some extensions were added to support more types of
63 * data such as 'One Bit LInear Audio', therefore the meaning of SFC became
64 * different depending on the types.
65 *
66 * Currently our implementation is compatible with IEC 61883-6:2002.
47 */ 67 */
48enum cip_sfc { 68enum cip_sfc {
49 CIP_SFC_32000 = 0, 69 CIP_SFC_32000 = 0,
diff --git a/sound/firewire/cmp.c b/sound/firewire/cmp.c
index ba8df5a1be39..ae3bc1940efa 100644
--- a/sound/firewire/cmp.c
+++ b/sound/firewire/cmp.c
@@ -114,6 +114,7 @@ static int pcr_modify(struct cmp_connection *c,
114 * cmp_connection_init - initializes a connection manager 114 * cmp_connection_init - initializes a connection manager
115 * @c: the connection manager to initialize 115 * @c: the connection manager to initialize
116 * @unit: a unit of the target device 116 * @unit: a unit of the target device
117 * @direction: input or output
117 * @pcr_index: the index of the iPCR/oPCR on the target device 118 * @pcr_index: the index of the iPCR/oPCR on the target device
118 */ 119 */
119int cmp_connection_init(struct cmp_connection *c, 120int cmp_connection_init(struct cmp_connection *c,
@@ -154,6 +155,7 @@ EXPORT_SYMBOL(cmp_connection_init);
154/** 155/**
155 * cmp_connection_check_used - check connection is already esablished or not 156 * cmp_connection_check_used - check connection is already esablished or not
156 * @c: the connection manager to be checked 157 * @c: the connection manager to be checked
158 * @used: the pointer to store the result of checking the connection
157 */ 159 */
158int cmp_connection_check_used(struct cmp_connection *c, bool *used) 160int cmp_connection_check_used(struct cmp_connection *c, bool *used)
159{ 161{