Commit 739bdbae authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-motu: remove obsoleted codes 



The way to decide CIP payload size by calculation with any flag is now
obsoleted. This commit removes the codes.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20200519111641.123211-12-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 88e8f89d

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

+5 −122
Original line number Diff line number Diff line
@@ -186,86 +186,6 @@ int snd_motu_protocol_v2_switch_fetching_mode(struct snd_motu *motu, 
					  sizeof(reg));

}



static void calculate_fixed_part(struct snd_motu_packet_format *formats,

				 enum amdtp_stream_direction dir,

				 enum snd_motu_spec_flags flags,

				 unsigned char analog_ports)

{

	unsigned char pcm_chunks[3] = {0, 0, 0};



	pcm_chunks[0] = analog_ports;

	pcm_chunks[1] = analog_ports;

	if (flags & SND_MOTU_SPEC_SUPPORT_CLOCK_X4)

		pcm_chunks[2] = analog_ports;



	if (dir == AMDTP_IN_STREAM) {

		if (flags & SND_MOTU_SPEC_TX_MICINST_CHUNK) {

			pcm_chunks[0] += 2;

			pcm_chunks[1] += 2;

		}

		if (flags & SND_MOTU_SPEC_TX_RETURN_CHUNK) {

			pcm_chunks[0] += 2;

			pcm_chunks[1] += 2;

		}

	} else {

		if (flags & SND_MOTU_SPEC_RX_SEPARATED_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;

	}



	if (flags & SND_MOTU_SPEC_HAS_AESEBU_IFACE) {

		pcm_chunks[0] += 2;

		pcm_chunks[1] += 2;

	}



	/*

	 * All of v2 models have a pair of coaxial interfaces for digital in/out

	 * port. At 44.1/48.0/88.2/96.0 kHz, packets includes PCM from these

	 * ports.

	 */

	pcm_chunks[0] += 2;

	pcm_chunks[1] += 2;



	formats->fixed_part_pcm_chunks[0] = pcm_chunks[0];

	formats->fixed_part_pcm_chunks[1] = pcm_chunks[1];

	formats->fixed_part_pcm_chunks[2] = pcm_chunks[2];

}



static void calculate_differed_part(struct snd_motu_packet_format *formats,

				    enum snd_motu_spec_flags flags,

				    u32 data, u32 mask, u32 shift)

{

	unsigned char pcm_chunks[2] = {0, 0};



	/*

	 * When optical interfaces are configured for S/PDIF (TOSLINK),

	 * the above PCM frames come from them, instead of coaxial

	 * interfaces.

	 */

	data = (data & mask) >> shift;

	if (data == V2_OPT_IFACE_MODE_ADAT) {

		if (flags & SND_MOTU_SPEC_HAS_OPT_IFACE_A) {

			pcm_chunks[0] += 8;

			pcm_chunks[1] += 4;

		}

		// 8pre has two sets of optical interface and doesn't reduce

		// chunks for ADAT signals.

		if (flags & SND_MOTU_SPEC_HAS_OPT_IFACE_B) {

			pcm_chunks[1] += 4;

		}

	}



	/* At mode x4, no data chunks are supported in this part. */

	formats->differed_part_pcm_chunks[0] = pcm_chunks[0];

	formats->differed_part_pcm_chunks[1] = pcm_chunks[1];

}



static int detect_packet_formats_828mk2(struct snd_motu *motu, u32 data)

{

	if (((data & V2_OPT_IN_IFACE_MASK) >> V2_OPT_IN_IFACE_SHIFT) ==
@@ -335,16 +255,6 @@ int snd_motu_protocol_v2_cache_packet_formats(struct snd_motu *motu) 
		return err;

	data = be32_to_cpu(reg);



	calculate_fixed_part(&motu->tx_packet_formats, AMDTP_IN_STREAM,

			     motu->spec->flags, motu->spec->analog_in_ports);

	calculate_differed_part(&motu->tx_packet_formats, motu->spec->flags,

			data, V2_OPT_IN_IFACE_MASK, V2_OPT_IN_IFACE_SHIFT);



	calculate_fixed_part(&motu->rx_packet_formats, AMDTP_OUT_STREAM,

			     motu->spec->flags, motu->spec->analog_out_ports);

	calculate_differed_part(&motu->rx_packet_formats, motu->spec->flags,

			data, V2_OPT_OUT_IFACE_MASK, V2_OPT_OUT_IFACE_SHIFT);



	memcpy(motu->tx_packet_formats.pcm_chunks,

	       motu->spec->tx_fixed_pcm_chunks,

	       sizeof(motu->tx_packet_formats.pcm_chunks));
@@ -365,62 +275,35 @@ int snd_motu_protocol_v2_cache_packet_formats(struct snd_motu *motu) 
const struct snd_motu_spec snd_motu_spec_828mk2 = {

	.name = "828mk2",

	.protocol_version = SND_MOTU_PROTOCOL_V2,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_RX_SEPARATED_MAIN |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_A |

		 SND_MOTU_SPEC_RX_MIDI_2ND_Q |

	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_TX_MIDI_2ND_Q,

	.tx_fixed_pcm_chunks = {14, 14, 0},

	.rx_fixed_pcm_chunks = {14, 14, 0},

	.analog_in_ports = 8,

	.analog_out_ports = 8,

};



const struct snd_motu_spec snd_motu_spec_traveler = {

	.name = "Traveler",

	.protocol_version = SND_MOTU_PROTOCOL_V2,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_SUPPORT_CLOCK_X4 |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_HAS_AESEBU_IFACE |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_A |

		 SND_MOTU_SPEC_RX_MIDI_2ND_Q |

	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_TX_MIDI_2ND_Q,

	.tx_fixed_pcm_chunks = {14, 14, 8},

	.rx_fixed_pcm_chunks = {14, 14, 8},

	.analog_in_ports = 8,

	.analog_out_ports = 8,

};



const struct snd_motu_spec snd_motu_spec_ultralite = {

	.name = "UltraLite",

	.protocol_version = SND_MOTU_PROTOCOL_V2,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK | // padding.

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_RX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_TX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_RX_SEPARATED_MAIN,

	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_TX_MIDI_2ND_Q,

	.tx_fixed_pcm_chunks = {14, 14, 0},

	.rx_fixed_pcm_chunks = {14, 14, 0},

	.analog_in_ports = 8,

	.analog_out_ports = 8,

};



const struct snd_motu_spec snd_motu_spec_8pre = {

	.name = "8pre",

	.protocol_version = SND_MOTU_PROTOCOL_V2,

	// In tx, use coax chunks for mix-return 1/2. In rx, use coax chunks for

	// dummy 1/2.

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_A |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_B |

		 SND_MOTU_SPEC_RX_MIDI_2ND_Q |

	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_TX_MIDI_2ND_Q,

	.tx_fixed_pcm_chunks = {10, 6, 0},

	.rx_fixed_pcm_chunks = {10, 6, 0},

	.analog_in_ports = 8,

	.analog_out_ports = 2,

};

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

+2 −156
Original line number Diff line number Diff line
@@ -158,124 +158,6 @@ int snd_motu_protocol_v3_switch_fetching_mode(struct snd_motu *motu, 
					  sizeof(reg));

}



static void calculate_fixed_part(struct snd_motu_packet_format *formats,

				 enum amdtp_stream_direction dir,

				 enum snd_motu_spec_flags flags,

				 unsigned char analog_ports)

{

	unsigned char pcm_chunks[3] = {0, 0, 0};



	pcm_chunks[0] = analog_ports;

	pcm_chunks[1] = analog_ports;

	if (flags & SND_MOTU_SPEC_SUPPORT_CLOCK_X4)

		pcm_chunks[2] = analog_ports;



	if (dir == AMDTP_IN_STREAM) {

		if (flags & SND_MOTU_SPEC_TX_MICINST_CHUNK) {

			pcm_chunks[0] += 2;

			pcm_chunks[1] += 2;

			if (flags & SND_MOTU_SPEC_SUPPORT_CLOCK_X4)

				pcm_chunks[2] += 2;

		}



		if (flags & SND_MOTU_SPEC_TX_RETURN_CHUNK) {

			pcm_chunks[0] += 2;

			pcm_chunks[1] += 2;

			if (flags & SND_MOTU_SPEC_SUPPORT_CLOCK_X4)

				pcm_chunks[2] += 2;

		}



		if (flags & SND_MOTU_SPEC_TX_REVERB_CHUNK) {

			pcm_chunks[0] += 2;

			pcm_chunks[1] += 2;

		}

	} else {

		if (flags & SND_MOTU_SPEC_RX_SEPARATED_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;

	}



	if (flags & SND_MOTU_SPEC_HAS_AESEBU_IFACE) {

		pcm_chunks[0] += 2;

		pcm_chunks[1] += 2;

	}



	/*

	 * At least, packets have two data chunks for S/PDIF on coaxial

	 * interface.

	 */

	pcm_chunks[0] += 2;

	pcm_chunks[1] += 2;



	/*

	 * Fixed part consists of PCM chunks multiple of 4, with msg chunks. As

	 * a result, this part can includes empty data chunks.

	 */

	formats->fixed_part_pcm_chunks[0] = round_up(2 + pcm_chunks[0], 4) - 2;

	formats->fixed_part_pcm_chunks[1] = round_up(2 + pcm_chunks[1], 4) - 2;

	if (flags & SND_MOTU_SPEC_SUPPORT_CLOCK_X4)

		formats->fixed_part_pcm_chunks[2] =

					round_up(2 + pcm_chunks[2], 4) - 2;

}



static void calculate_differed_part(struct snd_motu_packet_format *formats,

				    enum snd_motu_spec_flags flags, u32 data,

				    u32 a_enable_mask, u32 a_no_adat_mask,

				    u32 b_enable_mask, u32 b_no_adat_mask)

{

	unsigned char pcm_chunks[3] = {0, 0, 0};

	int i;



	if ((flags & SND_MOTU_SPEC_HAS_OPT_IFACE_A) && (data & a_enable_mask)) {

		if (data & a_no_adat_mask) {

			/*

			 * Additional two data chunks for S/PDIF on optical

			 * interface A. This includes empty data chunks.

			 */

			pcm_chunks[0] += 4;

			pcm_chunks[1] += 4;

		} else {

			/*

			 * Additional data chunks for ADAT on optical interface

			 * A.

			 */

			pcm_chunks[0] += 8;

			pcm_chunks[1] += 4;

		}

	}



	if ((flags & SND_MOTU_SPEC_HAS_OPT_IFACE_B) && (data & b_enable_mask)) {

		if (data & b_no_adat_mask) {

			/*

			 * Additional two data chunks for S/PDIF on optical

			 * interface B. This includes empty data chunks.

			 */

			pcm_chunks[0] += 4;

			pcm_chunks[1] += 4;

		} else {

			/*

			 * Additional data chunks for ADAT on optical interface

			 * B.

			 */

			pcm_chunks[0] += 8;

			pcm_chunks[1] += 4;

		}

	}



	for (i = 0; i < 3; ++i) {

		if (pcm_chunks[i] > 0)

			pcm_chunks[i] = round_up(pcm_chunks[i], 4);



		formats->differed_part_pcm_chunks[i] = pcm_chunks[i];

	}

}



static int detect_packet_formats_828mk3(struct snd_motu *motu, u32 data)

{

	if (data & V3_ENABLE_OPT_IN_IFACE_A) {
@@ -339,20 +221,6 @@ int snd_motu_protocol_v3_cache_packet_formats(struct snd_motu *motu) 
		return err;

	data = be32_to_cpu(reg);



	calculate_fixed_part(&motu->tx_packet_formats, AMDTP_IN_STREAM,

			     motu->spec->flags, motu->spec->analog_in_ports);

	calculate_differed_part(&motu->tx_packet_formats,

			motu->spec->flags, data,

			V3_ENABLE_OPT_IN_IFACE_A, V3_NO_ADAT_OPT_IN_IFACE_A,

			V3_ENABLE_OPT_IN_IFACE_B, V3_NO_ADAT_OPT_IN_IFACE_B);



	calculate_fixed_part(&motu->rx_packet_formats, AMDTP_OUT_STREAM,

			     motu->spec->flags, motu->spec->analog_out_ports);

	calculate_differed_part(&motu->rx_packet_formats,

			motu->spec->flags, data,

			V3_ENABLE_OPT_OUT_IFACE_A, V3_NO_ADAT_OPT_OUT_IFACE_A,

			V3_ENABLE_OPT_OUT_IFACE_B, V3_NO_ADAT_OPT_OUT_IFACE_B);



	memcpy(motu->tx_packet_formats.pcm_chunks,

	       motu->spec->tx_fixed_pcm_chunks,

	       sizeof(motu->tx_packet_formats.pcm_chunks));
@@ -370,46 +238,24 @@ int snd_motu_protocol_v3_cache_packet_formats(struct snd_motu *motu) 
const struct snd_motu_spec snd_motu_spec_828mk3 = {

	.name = "828mk3",

	.protocol_version = SND_MOTU_PROTOCOL_V3,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_SUPPORT_CLOCK_X4 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_TX_REVERB_CHUNK |

		 SND_MOTU_SPEC_RX_SEPARATED_MAIN |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_A |

		 SND_MOTU_SPEC_HAS_OPT_IFACE_B |

		 SND_MOTU_SPEC_RX_MIDI_3RD_Q |

	.flags = SND_MOTU_SPEC_RX_MIDI_3RD_Q |

		 SND_MOTU_SPEC_TX_MIDI_3RD_Q,

	.tx_fixed_pcm_chunks = {18, 18, 14},

	.rx_fixed_pcm_chunks = {14, 14, 10},

	.analog_in_ports = 8,

	.analog_out_ports = 8,

};



const struct snd_motu_spec snd_motu_spec_audio_express = {

	.name = "AudioExpress",

	.protocol_version = SND_MOTU_PROTOCOL_V3,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_RX_SEPARATED_MAIN |

		 SND_MOTU_SPEC_RX_MIDI_2ND_Q |

	.flags = SND_MOTU_SPEC_RX_MIDI_2ND_Q |

		 SND_MOTU_SPEC_TX_MIDI_3RD_Q,

	.tx_fixed_pcm_chunks = {10, 10, 0},

	.rx_fixed_pcm_chunks = {10, 10, 0},

	.analog_in_ports = 2,

	.analog_out_ports = 4,

};



const struct snd_motu_spec snd_motu_spec_4pre = {

	.name = "4pre",

	.protocol_version = SND_MOTU_PROTOCOL_V3,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

		 SND_MOTU_SPEC_RX_SEPARATED_MAIN,

	.tx_fixed_pcm_chunks = {10, 10, 0},

	.rx_fixed_pcm_chunks = {10, 10, 0},

	.analog_in_ports = 2,

	.analog_out_ports = 2,

};

sound/firewire/motu/motu.h

+4 −18
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ struct snd_motu_packet_format { 


	unsigned char msg_chunks;

	unsigned char pcm_chunks[3];

	unsigned char fixed_part_pcm_chunks[3];

	unsigned char differed_part_pcm_chunks[3];

};



struct snd_motu {
@@ -75,19 +73,10 @@ struct snd_motu { 
};



enum snd_motu_spec_flags {

	SND_MOTU_SPEC_SUPPORT_CLOCK_X2	= 0x0001,

	SND_MOTU_SPEC_SUPPORT_CLOCK_X4	= 0x0002,

	SND_MOTU_SPEC_TX_MICINST_CHUNK	= 0x0004,

	SND_MOTU_SPEC_TX_RETURN_CHUNK	= 0x0008,

	SND_MOTU_SPEC_TX_REVERB_CHUNK	= 0x0010,

	SND_MOTU_SPEC_HAS_AESEBU_IFACE	= 0x0020,

	SND_MOTU_SPEC_HAS_OPT_IFACE_A	= 0x0040,

	SND_MOTU_SPEC_HAS_OPT_IFACE_B	= 0x0080,

	SND_MOTU_SPEC_RX_MIDI_2ND_Q	= 0x0100,

	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_SEPARATED_MAIN	= 0x1000,

	SND_MOTU_SPEC_RX_MIDI_2ND_Q	= 0x0001,

	SND_MOTU_SPEC_RX_MIDI_3RD_Q	= 0x0002,

	SND_MOTU_SPEC_TX_MIDI_2ND_Q	= 0x0004,

	SND_MOTU_SPEC_TX_MIDI_3RD_Q	= 0x0008,

};



#define SND_MOTU_CLOCK_RATE_COUNT	6
@@ -121,9 +110,6 @@ struct snd_motu_spec { 


	unsigned char tx_fixed_pcm_chunks[3];

	unsigned char rx_fixed_pcm_chunks[3];



	unsigned char analog_in_ports;

	unsigned char analog_out_ports;

};



extern const struct snd_motu_spec snd_motu_spec_828mk2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE