[ALSA] Display SPDIF in status in proc fs 'spdif-in' file. (df34140a) · Commits · 戴 / test

sound/pci/emu10k1/emuproc.c

+38 −23

Original line number	Diff line number	Diff line
		@@ -44,11 +44,10 @@ static void snd_emu10k1_proc_spdif_status(emu10k1_t * emu,
		unsigned int status, rate = 0;

		status = snd_emu10k1_ptr_read(emu, status_reg, 0);
		if (rate_reg > 0)
		rate = snd_emu10k1_ptr_read(emu, rate_reg, 0);

		snd_iprintf(buffer, "\n%s\n", title);

		if (status != 0xffffffff) {
		snd_iprintf(buffer, "Professional Mode : %s\n", (status & SPCS_PROFESSIONAL) ? "yes" : "no");
		snd_iprintf(buffer, "Not Audio Data : %s\n", (status & SPCS_NOTAUDIODATA) ? "yes" : "no");
		snd_iprintf(buffer, "Copyright : %s\n", (status & SPCS_COPYRIGHT) ? "yes" : "no");
		@@ -62,10 +61,16 @@ static void snd_emu10k1_proc_spdif_status(emu10k1_t * emu,
		snd_iprintf(buffer, "Clock Accuracy : %s\n", clkaccy[(status & SPCS_CLKACCYMASK) >> 28]);

		if (rate_reg > 0) {
		rate = snd_emu10k1_ptr_read(emu, rate_reg, 0);
		snd_iprintf(buffer, "S/PDIF Locked : %s\n", rate & SRCS_SPDIFLOCKED ? "on" : "off");
		snd_iprintf(buffer, "Rate Locked : %s\n", rate & SRCS_RATELOCKED ? "on" : "off");
		snd_iprintf(buffer, "Estimated Sample Rate : 0x%x\n", rate & SRCS_ESTSAMPLERATE);
		/* From ((Rate * 48000 ) / 262144); */
		snd_iprintf(buffer, "Estimated Sample Rate : %d\n", ((rate & 0xFFFFF ) * 375) >> 11);
		}
		} else {
		snd_iprintf(buffer, "No signal detected.\n");
		}

		}

		static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
		@@ -223,15 +228,20 @@ static void snd_emu10k1_proc_read(snd_info_entry_t *entry,
		snd_iprintf(buffer, "\nAll FX Outputs :\n");
		for (idx = 0; idx < (emu->audigy ? 64 : 32); idx++)
		snd_iprintf(buffer, " Output %02i [%s]\n", idx, outputs[idx]);
		snd_emu10k1_proc_spdif_status(emu, buffer, "S/PDIF Output 0", SPCS0, -1);
		snd_emu10k1_proc_spdif_status(emu, buffer, "S/PDIF Output 1", SPCS1, -1);
		snd_emu10k1_proc_spdif_status(emu, buffer, "S/PDIF Output 2/3", SPCS2, -1);
		snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF", CDCS, CDSRCS);
		snd_emu10k1_proc_spdif_status(emu, buffer, "General purpose S/PDIF", GPSCS, GPSRCS);
		}

		static void snd_emu10k1_proc_spdif_read(snd_info_entry_t *entry,
		snd_info_buffer_t * buffer)
		{
		emu10k1_t *emu = entry->private_data;
		snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
		snd_emu10k1_proc_spdif_status(emu, buffer, "Optical or Coax S/PDIF In", GPSCS, GPSRCS);
		#if 0
		val = snd_emu10k1_ptr_read(emu, ZVSRCS, 0);
		snd_iprintf(buffer, "\nZoomed Video\n");
		snd_iprintf(buffer, "Rate Locked : %s\n", val & SRCS_RATELOCKED ? "on" : "off");
		snd_iprintf(buffer, "Estimated Sample Rate : 0x%x\n", val & SRCS_ESTSAMPLERATE);
		#endif
		}

		static void snd_emu10k1_proc_acode_read(snd_info_entry_t *entry,
		@@ -526,6 +536,11 @@ int __devinit snd_emu10k1_proc_init(emu10k1_t * emu)
		if (! snd_card_proc_new(emu->card, "emu10k1", &entry))
		snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_read);

		if (emu->card_capabilities->emu10k2_chip) {
		if (! snd_card_proc_new(emu->card, "spdif-in", &entry))
		snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_spdif_read);
		}

		if (! snd_card_proc_new(emu->card, "voices", &entry))
		snd_info_set_text_ops(entry, emu, 2048, snd_emu10k1_proc_voices_read);

Admin message