Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81720c6d authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-motu: add a flag for chunks for main 1/2 out 



This driver explicitly assumes that all of supported models have main data
chunk separated from chunk for analog ports. However, MOTU Traveler doesn't
support the separated main data chunk.

This commit adds a flag for the separated main data chunk.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6c1549c4

sound/firewire/motu/motu-protocol-v2.c

+9 −5
Original line number Diff line number Diff line
@@ -149,11 +149,15 @@ static void calculate_fixed_part(struct snd_motu_packet_format *formats, 
			pcm_chunks[1] += 2;

		}

	} else {

		/*

		 * Packets to v2 units transfer main-out-1/2 and phone-out-1/2.

		 */

		pcm_chunks[0] += 4;

		pcm_chunks[1] += 4;

		if (flags & SND_MOTU_SPEC_RX_SEPARETED_MAIN) {

			pcm_chunks[0] += 2;

			pcm_chunks[1] += 2;

		}



		// Packets to v2 units include 2 chunks for phone 1/2, except

		// for 176.4/192.0 kHz.

		pcm_chunks[0] += 2;

		pcm_chunks[1] += 2;

	}



	/*

sound/firewire/motu/motu-protocol-v3.c

+9 −5
Original line number Diff line number Diff line
@@ -188,11 +188,15 @@ static void calculate_fixed_part(struct snd_motu_packet_format *formats, 
			pcm_chunks[1] += 2;

		}

	} else {

		/*

		 * Packets to v2 units transfer main-out-1/2 and phone-out-1/2.

		 */

		pcm_chunks[0] += 4;

		pcm_chunks[1] += 4;

		if (flags & SND_MOTU_SPEC_RX_SEPARETED_MAIN) {

			pcm_chunks[0] += 2;

			pcm_chunks[1] += 2;

		}



		// Packets to v3 units include 2 chunks for phone 1/2, except

		// for 176.4/192.0 kHz.

		pcm_chunks[0] += 2;

		pcm_chunks[1] += 2;

	}



	/*

sound/firewire/motu/motu.c

+3 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ static const struct snd_motu_spec motu_828mk2 = { 
	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_RX_SEPARETED_MAIN |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_A |

		 SND_MOTU_SPEC_RX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_TX_MIDI_2ND_Q,
@@ -216,6 +217,7 @@ static const struct snd_motu_spec motu_828mk3 = { 
		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_TX_REVERB_CHUNK |

		 SND_MOTU_SPEC_RX_SEPARETED_MAIN |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_A |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_B |

		 SND_MOTU_SPEC_RX_MIDI_3RD_Q |
@@ -231,6 +233,7 @@ static const struct snd_motu_spec motu_audio_express = { 
	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_RX_SEPARETED_MAIN |

		 SND_MOTU_SPEC_RX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_TX_MIDI_3RD_Q,

	.analog_in_ports = 2,

sound/firewire/motu/motu.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ enum snd_motu_spec_flags { 
	SND_MOTU_SPEC_RX_MIDI_3RD_Q	= 0x0200,

	SND_MOTU_SPEC_TX_MIDI_2ND_Q	= 0x0400,

	SND_MOTU_SPEC_TX_MIDI_3RD_Q	= 0x0800,

	SND_MOTU_SPEC_RX_SEPARETED_MAIN	= 0x1000,

};



#define SND_MOTU_CLOCK_RATE_COUNT	6