[11/15] oxfw: Add a quirk for Griffin FireWave

Commit Message

Takashi Sakamoto May 13, 2014, 2:27 p.m. UTC

Griffin FireWave has 7 entries for stream formation. But via 'LIST'
subfunction of AV/C Stream Format Information command, 6 of
them can be retrieved. The rest can be retrieved via 'SINGLE'
subfunction of the command.

This commit adds a workaround for this quirk.

Signed-off-by: Takashi Sakamoto <[e-mail]>
---
 sound/firewire/oxfw/oxfw_stream.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

Patch

diff --git a/sound/firewire/oxfw/oxfw_stream.c b/sound/firewire/oxfw/oxfw_stream.c
index 0d81bba..4d66648 100644
--- a/sound/firewire/oxfw/oxfw_stream.c
+++ b/sound/firewire/oxfw/oxfw_stream.c
@@ -365,8 +365,8 @@  static int fill_stream_formations(struct snd_oxfw *oxfw,
 				  unsigned short pid)
 {
 	u8 *buf;
-	struct snd_oxfw_stream_formation *formations;
-	unsigned int len, eid = 0;
+	struct snd_oxfw_stream_formation *formations, tmp;
+	unsigned int i, len, eid = 0;
 	int err;
 
 	buf = kmalloc(AVC_GENERIC_FRAME_MAXIMUM_BYTES, GFP_KERNEL);
@@ -416,6 +416,25 @@  static int fill_stream_formations(struct snd_oxfw *oxfw,
 			break;
 		}
 	}
+
+	if (eid >= SND_OXFW_STREAM_FORMAT_ENTRIES)
+		goto end;
+
+	/* Griffin FireWave have another entry in current formation. */
+	len = AVC_GENERIC_FRAME_MAXIMUM_BYTES;
+	err = avc_stream_get_format_single(oxfw->unit, dir, 0, buf, &len);
+	if (err < 0)
+		goto end;
+	err = parse_stream_formation(buf, len, &tmp);
+	if (err < 0)
+		goto end;
+	/* Store this if no duplicates. */
+	for (i = 0; i < SND_OXFW_STREAM_FORMAT_ENTRIES; i++) {
+		if (memcmp(&formations[i], &tmp, sizeof(tmp)) == 0)
+			break;
+	}
+	if (i == SND_OXFW_STREAM_FORMAT_ENTRIES)
+		formations[eid] = tmp;
 end:
 	kfree(buf);
 	return err;