Commit 25eb4389 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-motu: code refactoring for detection of clock source in v2 protocol 



Current implementation of driver has two similar helper functions for
source detection of sampling clock. This commit merges them as a code
refactoring.

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


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

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

+21 −47
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ int snd_motu_protocol_v2_set_clock_rate(struct snd_motu *motu, 
					  sizeof(reg));

}



static int detect_clock_source_optical_model(struct snd_motu *motu, u32 data,

static int get_clock_source(struct snd_motu *motu, u32 data,

			    enum snd_motu_clock_source *src)

{

	switch (data) {

	switch (data & V2_CLOCK_SRC_MASK) {

	case 0:

		*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;

		break;
@@ -90,17 +90,26 @@ static int detect_clock_source_optical_model(struct snd_motu *motu, u32 data, 
		break;

	case 2:

	{

		bool support_iec60958_on_opt = (motu->spec == &snd_motu_spec_828mk2 ||

						motu->spec == &snd_motu_spec_traveler);



		if (!support_iec60958_on_opt) {

			*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;

		} else {

			__be32 reg;



			// To check the configuration of optical interface.

		int err = snd_motu_transaction_read(motu, V2_IN_OUT_CONF_OFFSET, &reg, sizeof(reg));

			int err = snd_motu_transaction_read(motu, V2_IN_OUT_CONF_OFFSET, &reg,

							    sizeof(reg));

			if (err < 0)

				return err;



		if (((data & V2_OPT_IN_IFACE_MASK) >> V2_OPT_IN_IFACE_SHIFT) == V2_OPT_IFACE_MODE_SPDIF)

			if (((data & V2_OPT_IN_IFACE_MASK) >> V2_OPT_IN_IFACE_SHIFT) ==

			    V2_OPT_IFACE_MODE_SPDIF)

				*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT;

			else

				*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;

		}

		break;

	}

	case 3:
@@ -120,41 +129,6 @@ static int detect_clock_source_optical_model(struct snd_motu *motu, u32 data, 
	return 0;

}



static int v2_detect_clock_source(struct snd_motu *motu, u32 data,

				  enum snd_motu_clock_source *src)

{

	switch (data) {

	case 0:

		*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;

		break;

	case 2:

		*src = SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX;

		break;

	case 3:

		*src = SND_MOTU_CLOCK_SOURCE_SPH;

		break;

	case 4:

		*src = SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC;

		break;

	default:

		*src = SND_MOTU_CLOCK_SOURCE_UNKNOWN;

		break;

	}



	return 0;

}



static int get_clock_source(struct snd_motu *motu, u32 data,

			    enum snd_motu_clock_source *src)

{

	data &= V2_CLOCK_SRC_MASK;

	if (motu->spec == &snd_motu_spec_828mk2 ||

	    motu->spec == &snd_motu_spec_traveler)

		return detect_clock_source_optical_model(motu, data, src);

	else

		return v2_detect_clock_source(motu, data, src);

}



int snd_motu_protocol_v2_get_clock_source(struct snd_motu *motu,

					  enum snd_motu_clock_source *src)

{