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

Commit 72f10f08 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: fireface: share status and configuration dump 



As long as investigating packet dumps from Fireface 400/800, bits on
status registers for clock synchronization are the same.

This commit moves a parser for the registers to obsolete model-specific
operations.

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

sound/firewire/fireface/ff-proc.c

+176 −2
Original line number Original line Diff line number Diff line
@@ -12,16 +12,190 @@ static void proc_dump_clock_config(struct snd_info_entry *entry, 
				   struct snd_info_buffer *buffer)

				   struct snd_info_buffer *buffer)

{

{

	struct snd_ff *ff = entry->private_data;

	struct snd_ff *ff = entry->private_data;

	__le32 reg;

	u32 data;

	unsigned int rate;

	const char *src;

	int err;





	ff->spec->protocol->dump_clock_config(ff, buffer);

	err = snd_fw_transaction(ff->unit, TCODE_READ_BLOCK_REQUEST,

				 SND_FF_REG_CLOCK_CONFIG, &reg, sizeof(reg), 0);

	if (err < 0)

		return;



	data = le32_to_cpu(reg);



	snd_iprintf(buffer, "Output S/PDIF format: %s (Emphasis: %s)\n",

		    (data & 0x20) ? "Professional" : "Consumer",

		    (data & 0x40) ? "on" : "off");



	snd_iprintf(buffer, "Optical output interface format: %s\n",

		    ((data >> 8) & 0x01) ? "S/PDIF" : "ADAT");



	snd_iprintf(buffer, "Word output single speed: %s\n",

		    ((data >> 8) & 0x20) ? "on" : "off");



	snd_iprintf(buffer, "S/PDIF input interface: %s\n",

		    ((data >> 8) & 0x02) ? "Optical" : "Coaxial");



	switch ((data >> 1) & 0x03) {

	case 0x01:

		rate = 32000;

		break;

	case 0x00:

		rate = 44100;

		break;

	case 0x03:

		rate = 48000;

		break;

	case 0x02:

	default:

		return;

	}



	if (data & 0x08)

		rate *= 2;

	else if (data & 0x10)

		rate *= 4;



	snd_iprintf(buffer, "Sampling rate: %d\n", rate);



	if (data & 0x01) {

		src = "Internal";

	} else {

		switch ((data >> 10) & 0x07) {

		case 0x00:

			src = "ADAT";

			break;

		case 0x03:

			src = "S/PDIF";

			break;

		case 0x04:

			src = "Word";

			break;

		case 0x05:

			src = "LTC";

			break;

		default:

			return;

		}

	}



	snd_iprintf(buffer, "Sync to clock source: %s\n", src);

}

}





static void proc_dump_sync_status(struct snd_info_entry *entry,

static void proc_dump_sync_status(struct snd_info_entry *entry,

				  struct snd_info_buffer *buffer)

				  struct snd_info_buffer *buffer)

{

{

	struct snd_ff *ff = entry->private_data;

	struct snd_ff *ff = entry->private_data;

	__le32 reg;

	u32 data;

	int err;



	err = snd_fw_transaction(ff->unit, TCODE_READ_QUADLET_REQUEST,

				 SND_FF_REG_SYNC_STATUS, &reg, sizeof(reg), 0);

	if (err < 0)

		return;



	data = le32_to_cpu(reg);



	snd_iprintf(buffer, "External source detection:\n");



	snd_iprintf(buffer, "Word Clock:");

	if ((data >> 24) & 0x20) {

		if ((data >> 24) & 0x40)

			snd_iprintf(buffer, "sync\n");

		else

			snd_iprintf(buffer, "lock\n");

	} else {

		snd_iprintf(buffer, "none\n");

	}



	snd_iprintf(buffer, "S/PDIF:");

	if ((data >> 16) & 0x10) {

		if ((data >> 16) & 0x04)

			snd_iprintf(buffer, "sync\n");

		else

			snd_iprintf(buffer, "lock\n");

	} else {

		snd_iprintf(buffer, "none\n");

	}



	snd_iprintf(buffer, "ADAT:");

	if ((data >> 8) & 0x04) {

		if ((data >> 8) & 0x10)

			snd_iprintf(buffer, "sync\n");

		else

			snd_iprintf(buffer, "lock\n");

	} else {

		snd_iprintf(buffer, "none\n");

	}



	snd_iprintf(buffer, "\nUsed external source:\n");



	if (((data >> 22) & 0x07) == 0x07) {

		snd_iprintf(buffer, "None\n");

	} else {

		switch ((data >> 22) & 0x07) {

		case 0x00:

			snd_iprintf(buffer, "ADAT:");

			break;

		case 0x03:

			snd_iprintf(buffer, "S/PDIF:");

			break;

		case 0x04:

			snd_iprintf(buffer, "Word:");

			break;

		case 0x07:

			snd_iprintf(buffer, "Nothing:");

			break;

		case 0x01:

		case 0x02:

		case 0x05:

		case 0x06:

		default:

			snd_iprintf(buffer, "unknown:");

			break;

		}



		if ((data >> 25) & 0x07) {

			switch ((data >> 25) & 0x07) {

			case 0x01:

				snd_iprintf(buffer, "32000\n");

				break;

			case 0x02:

				snd_iprintf(buffer, "44100\n");

				break;

			case 0x03:

				snd_iprintf(buffer, "48000\n");

				break;

			case 0x04:

				snd_iprintf(buffer, "64000\n");

				break;

			case 0x05:

				snd_iprintf(buffer, "88200\n");

				break;

			case 0x06:

				snd_iprintf(buffer, "96000\n");

				break;

			case 0x07:

				snd_iprintf(buffer, "128000\n");

				break;

			case 0x08:

				snd_iprintf(buffer, "176400\n");

				break;

			case 0x09:

				snd_iprintf(buffer, "192000\n");

				break;

			case 0x00:

				snd_iprintf(buffer, "unknown\n");

				break;

			}

		}

	}





	ff->spec->protocol->dump_sync_status(ff, buffer);

	snd_iprintf(buffer, "Multiplied:");

	snd_iprintf(buffer, "%d\n", (data & 0x3ff) * 250);

}

}





static void add_node(struct snd_ff *ff, struct snd_info_entry *root,

static void add_node(struct snd_ff *ff, struct snd_info_entry *root,

sound/firewire/fireface/ff-protocol-ff400.c

+0 −191
Original line number Original line Diff line number Diff line
@@ -168,203 +168,12 @@ static int ff400_switch_fetching_mode(struct snd_ff *ff, bool enable) 
	return err;

	return err;

}

}





static void ff400_dump_sync_status(struct snd_ff *ff,

				   struct snd_info_buffer *buffer)

{

	__le32 reg;

	u32 data;

	int err;



	err = snd_fw_transaction(ff->unit, TCODE_READ_QUADLET_REQUEST,

				 SND_FF_REG_SYNC_STATUS, &reg, sizeof(reg), 0);

	if (err < 0)

		return;



	data = le32_to_cpu(reg);



	snd_iprintf(buffer, "External source detection:\n");



	snd_iprintf(buffer, "Word Clock:");

	if ((data >> 24) & 0x20) {

		if ((data >> 24) & 0x40)

			snd_iprintf(buffer, "sync\n");

		else

			snd_iprintf(buffer, "lock\n");

	} else {

		snd_iprintf(buffer, "none\n");

	}



	snd_iprintf(buffer, "S/PDIF:");

	if ((data >> 16) & 0x10) {

		if ((data >> 16) & 0x04)

			snd_iprintf(buffer, "sync\n");

		else

			snd_iprintf(buffer, "lock\n");

	} else {

		snd_iprintf(buffer, "none\n");

	}



	snd_iprintf(buffer, "ADAT:");

	if ((data >> 8) & 0x04) {

		if ((data >> 8) & 0x10)

			snd_iprintf(buffer, "sync\n");

		else

			snd_iprintf(buffer, "lock\n");

	} else {

		snd_iprintf(buffer, "none\n");

	}



	snd_iprintf(buffer, "\nUsed external source:\n");



	if (((data >> 22) & 0x07) == 0x07) {

		snd_iprintf(buffer, "None\n");

	} else {

		switch ((data >> 22) & 0x07) {

		case 0x00:

			snd_iprintf(buffer, "ADAT:");

			break;

		case 0x03:

			snd_iprintf(buffer, "S/PDIF:");

			break;

		case 0x04:

			snd_iprintf(buffer, "Word:");

			break;

		case 0x07:

			snd_iprintf(buffer, "Nothing:");

			break;

		case 0x01:

		case 0x02:

		case 0x05:

		case 0x06:

		default:

			snd_iprintf(buffer, "unknown:");

			break;

		}



		if ((data >> 25) & 0x07) {

			switch ((data >> 25) & 0x07) {

			case 0x01:

				snd_iprintf(buffer, "32000\n");

				break;

			case 0x02:

				snd_iprintf(buffer, "44100\n");

				break;

			case 0x03:

				snd_iprintf(buffer, "48000\n");

				break;

			case 0x04:

				snd_iprintf(buffer, "64000\n");

				break;

			case 0x05:

				snd_iprintf(buffer, "88200\n");

				break;

			case 0x06:

				snd_iprintf(buffer, "96000\n");

				break;

			case 0x07:

				snd_iprintf(buffer, "128000\n");

				break;

			case 0x08:

				snd_iprintf(buffer, "176400\n");

				break;

			case 0x09:

				snd_iprintf(buffer, "192000\n");

				break;

			case 0x00:

				snd_iprintf(buffer, "unknown\n");

				break;

			}

		}

	}



	snd_iprintf(buffer, "Multiplied:");

	snd_iprintf(buffer, "%d\n", (data & 0x3ff) * 250);

}



static void ff400_dump_clock_config(struct snd_ff *ff,

				    struct snd_info_buffer *buffer)

{

	__le32 reg;

	u32 data;

	unsigned int rate;

	const char *src;

	int err;



	err = snd_fw_transaction(ff->unit, TCODE_READ_BLOCK_REQUEST,

				 SND_FF_REG_CLOCK_CONFIG, &reg, sizeof(reg), 0);

	if (err < 0)

		return;



	data = le32_to_cpu(reg);



	snd_iprintf(buffer, "Output S/PDIF format: %s (Emphasis: %s)\n",

		    (data & 0x20) ? "Professional" : "Consumer",

		    (data & 0x40) ? "on" : "off");



	snd_iprintf(buffer, "Optical output interface format: %s\n",

		    ((data >> 8) & 0x01) ? "S/PDIF" : "ADAT");



	snd_iprintf(buffer, "Word output single speed: %s\n",

		    ((data >> 8) & 0x20) ? "on" : "off");



	snd_iprintf(buffer, "S/PDIF input interface: %s\n",

		    ((data >> 8) & 0x02) ? "Optical" : "Coaxial");



	switch ((data >> 1) & 0x03) {

	case 0x01:

		rate = 32000;

		break;

	case 0x00:

		rate = 44100;

		break;

	case 0x03:

		rate = 48000;

		break;

	case 0x02:

	default:

		return;

	}



	if (data & 0x08)

		rate *= 2;

	else if (data & 0x10)

		rate *= 4;



	snd_iprintf(buffer, "Sampling rate: %d\n", rate);



	if (data & 0x01) {

		src = "Internal";

	} else {

		switch ((data >> 10) & 0x07) {

		case 0x00:

			src = "ADAT";

			break;

		case 0x03:

			src = "S/PDIF";

			break;

		case 0x04:

			src = "Word";

			break;

		case 0x05:

			src = "LTC";

			break;

		default:

			return;

		}

	}



	snd_iprintf(buffer, "Sync to clock source: %s\n", src);

}



const struct snd_ff_protocol snd_ff_protocol_ff400 = {

const struct snd_ff_protocol snd_ff_protocol_ff400 = {

	.get_clock		= ff400_get_clock,

	.get_clock		= ff400_get_clock,

	.begin_session		= ff400_begin_session,

	.begin_session		= ff400_begin_session,

	.finish_session		= ff400_finish_session,

	.finish_session		= ff400_finish_session,

	.switch_fetching_mode	= ff400_switch_fetching_mode,

	.switch_fetching_mode	= ff400_switch_fetching_mode,





	.dump_sync_status	= ff400_dump_sync_status,

	.dump_clock_config	= ff400_dump_clock_config,



	.midi_high_addr_reg	= FF400_MIDI_HIGH_ADDR,

	.midi_high_addr_reg	= FF400_MIDI_HIGH_ADDR,

	.midi_rx_port_0_reg	= FF400_MIDI_RX_PORT_0,

	.midi_rx_port_0_reg	= FF400_MIDI_RX_PORT_0,

	.midi_rx_port_1_reg	= FF400_MIDI_RX_PORT_1,

	.midi_rx_port_1_reg	= FF400_MIDI_RX_PORT_1,

sound/firewire/fireface/ff.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -107,11 +107,6 @@ struct snd_ff_protocol { 
	void (*finish_session)(struct snd_ff *ff);

	void (*finish_session)(struct snd_ff *ff);

	int (*switch_fetching_mode)(struct snd_ff *ff, bool enable);

	int (*switch_fetching_mode)(struct snd_ff *ff, bool enable);





	void (*dump_sync_status)(struct snd_ff *ff,

				 struct snd_info_buffer *buffer);

	void (*dump_clock_config)(struct snd_ff *ff,

				  struct snd_info_buffer *buffer);



	u64 midi_high_addr_reg;

	u64 midi_high_addr_reg;

	u64 midi_rx_port_0_reg;

	u64 midi_rx_port_0_reg;

	u64 midi_rx_port_1_reg;

	u64 midi_rx_port_1_reg;