Commit c9ba374d authored by Andreas Mohr's avatar Andreas Mohr Committed by Takashi Iwai
Browse files

ALSA: azt3328 - fix broken AZF_FMT_XLATE macro 



Cleanly revert to non-macro implementation of
snd_azf3328_codec_setfmt(), to fix last-minute functionality breakage
induced by following checkpatch.pl recommendations without giving them
their due full share of thought ("revolting computer, ensuing PEBKAC").

I would like to thank Jiri Slaby for his very timely (in -rc1 even)
and unexpected (uncommon hardware) "recognition of the dangerous situation"
due to his very commendable static parser use. :)

Reported-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarAndreas Mohr <andi@lisas.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 233d84c4

sound/pci/azt3328.c

+16 −22
Original line number Diff line number Diff line
@@ -979,31 +979,25 @@ snd_azf3328_codec_setfmt(struct snd_azf3328_codec_data *codec, 


	snd_azf3328_dbgcallenter();

	switch (bitrate) {

#define AZF_FMT_XLATE(in_freq, out_bits) \

	do { \

		case AZF_FREQ_ ## in_freq: \

			freq = SOUNDFORMAT_FREQ_ ## out_bits; \

			break; \

	} while (0);

	AZF_FMT_XLATE(4000, SUSPECTED_4000)

	AZF_FMT_XLATE(4800, SUSPECTED_4800)

	/* the AZF3328 names it "5510" for some strange reason: */

	AZF_FMT_XLATE(5512, 5510)

	AZF_FMT_XLATE(6620, 6620)

	AZF_FMT_XLATE(8000, 8000)

	AZF_FMT_XLATE(9600, 9600)

	AZF_FMT_XLATE(11025, 11025)

	AZF_FMT_XLATE(13240, SUSPECTED_13240)

	AZF_FMT_XLATE(16000, 16000)

	AZF_FMT_XLATE(22050, 22050)

	AZF_FMT_XLATE(32000, 32000)

	case AZF_FREQ_4000:  freq = SOUNDFORMAT_FREQ_SUSPECTED_4000; break;

	case AZF_FREQ_4800:  freq = SOUNDFORMAT_FREQ_SUSPECTED_4800; break;

	case AZF_FREQ_5512:

		/* the AZF3328 names it "5510" for some strange reason */

			     freq = SOUNDFORMAT_FREQ_5510; break;

	case AZF_FREQ_6620:  freq = SOUNDFORMAT_FREQ_6620; break;

	case AZF_FREQ_8000:  freq = SOUNDFORMAT_FREQ_8000; break;

	case AZF_FREQ_9600:  freq = SOUNDFORMAT_FREQ_9600; break;

	case AZF_FREQ_11025: freq = SOUNDFORMAT_FREQ_11025; break;

	case AZF_FREQ_13240: freq = SOUNDFORMAT_FREQ_SUSPECTED_13240; break;

	case AZF_FREQ_16000: freq = SOUNDFORMAT_FREQ_16000; break;

	case AZF_FREQ_22050: freq = SOUNDFORMAT_FREQ_22050; break;

	case AZF_FREQ_32000: freq = SOUNDFORMAT_FREQ_32000; break;

	default:

		snd_printk(KERN_WARNING "unknown bitrate %d, assuming 44.1kHz!\n", bitrate);

		/* fall-through */

	AZF_FMT_XLATE(44100, 44100)

	AZF_FMT_XLATE(48000, 48000)

	AZF_FMT_XLATE(66200, SUSPECTED_66200)

#undef AZF_FMT_XLATE

	case AZF_FREQ_44100: freq = SOUNDFORMAT_FREQ_44100; break;

	case AZF_FREQ_48000: freq = SOUNDFORMAT_FREQ_48000; break;

	case AZF_FREQ_66200: freq = SOUNDFORMAT_FREQ_SUSPECTED_66200; break;

	}

	/* val = 0xff07; 3m27.993s (65301Hz; -> 64000Hz???) hmm, 66120, 65967, 66123 */

	/* val = 0xff09; 17m15.098s (13123,478Hz; -> 12000Hz???) hmm, 13237.2Hz? */

CRA Git | Maintained and supported by SUSTech CRA and CCSE