Commit 1a0cc052 authored by Mark Brown's avatar Mark Brown Committed by Takashi Iwai
Browse files

kselftest/alsa: Log card names during startup 



It can be helpful to know which card numbers apply to which cards in a
multi-card system so log the card names when we start the test programs.
People looking at the logs may not have direct access to the systems being
tested.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230223-alsa-log-ctl-name-v1-2-ac0f10cc4db2@kernel.org


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

tools/testing/selftests/alsa/mixer-test.c

+10 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static void find_controls(void) 
	struct card_data *card_data;

	struct ctl_data *ctl_data;

	snd_config_t *config;

	char *card_name, *card_longname;



	card = -1;

	if (snd_card_next(&card) < 0 || card < 0)
@@ -84,6 +85,15 @@ static void find_controls(void) 
			goto next_card;

		}



		err = snd_card_get_name(card, &card_name);

		if (err != 0)

			card_name = "Unknown";

		err = snd_card_get_longname(card, &card_longname);

		if (err != 0)

			card_longname = "Unknown";

		ksft_print_msg("Card %d - %s (%s)\n", card,

			       card_name, card_longname);



		/* Count controls */

		snd_ctl_elem_list_malloc(&card_data->ctls);

		snd_ctl_elem_list(card_data->handle, card_data->ctls);

tools/testing/selftests/alsa/pcm-test.c

+10 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ static void missing_devices(int card, snd_config_t *card_config) 
static void find_pcms(void)

{

	char name[32], key[64];

	char *card_name, *card_longname;

	int card, dev, subdev, count, direction, err;

	snd_pcm_stream_t stream;

	struct pcm_data *pcm_data;
@@ -175,6 +176,15 @@ static void find_pcms(void) 
			goto next_card;

		}



		err = snd_card_get_name(card, &card_name);

		if (err != 0)

			card_name = "Unknown";

		err = snd_card_get_longname(card, &card_longname);

		if (err != 0)

			card_longname = "Unknown";

		ksft_print_msg("Card %d - %s (%s)\n", card,

			       card_name, card_longname);



		card_config = conf_by_card(card);



		card_data = calloc(1, sizeof(*card_data));