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

Commit 62cf872a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

[ALSA] Replace CONFIG_SND_DEBUG_DETECT with CONFIG_SND_DEBUG_VERBOSE 



Replace CONFIG_SND_DEBUG_DETECT with CONFIG_SND_DEBUG_VERBOSE to
represent its meaning more better.  This config isn't provided only
for the detection but for more verbose debug prints in general.

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

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    This occurs when the access to non-existing or non-working codec slot

    (likely a modem one) causes a stall of the communication via HD-audio

    bus.  You can see which codec slots are probed by enabling

    CONFIG_SND_DEBUG_DETECT, or simply from the file name of the codec

    CONFIG_SND_DEBUG_VERBOSE, or simply from the file name of the codec

    proc files.  Then limit the slots to probe by probe_mask option.

    For example, probe_mask=1 means to probe only the first slot, and

    probe_mask=4 means only the third slot.

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -6127,8 +6127,8 @@ struct _snd_pcm_runtime { 


      <para>

        <function>snd_printdd()</function> is compiled in only when

      <constant>CONFIG_SND_DEBUG_DETECT</constant> is set. Please note

      that <constant>DEBUG_DETECT</constant> is not set as default

      <constant>CONFIG_SND_DEBUG_VERBOSE</constant> is set. Please note

      that <constant>CONFIG_SND_DEBUG_VERBOSE</constant> is not set as default

      even if you configure the alsa-driver with

      <option>--with-debug=full</option> option. You need to give

      explicitly <option>--with-debug=detect</option> option instead.

include/sound/core.h

+4 −4
Original line number Diff line number Diff line
@@ -412,13 +412,13 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...) 


#endif /* CONFIG_SND_DEBUG */



#ifdef CONFIG_SND_DEBUG_DETECT

#ifdef CONFIG_SND_DEBUG_VERBOSE

/**

 * snd_printdd - debug printk

 * @format: format string

 *

 * Works like snd_printk() for debugging purposes.

 * Ignored when CONFIG_SND_DEBUG_DETECT is not set.

 * Ignored when CONFIG_SND_DEBUG_VERBOSE is not set.

 */

#define snd_printdd(format, args...) snd_printk(format, ##args)

#else
@@ -442,7 +442,7 @@ struct snd_pci_quirk { 
	unsigned short subvendor;	/* PCI subvendor ID */

	unsigned short subdevice;	/* PCI subdevice ID */

	int value;			/* value */

#ifdef CONFIG_SND_DEBUG_DETECT

#ifdef CONFIG_SND_DEBUG_VERBOSE

	const char *name;		/* name of the device (optional) */

#endif

};
@@ -450,7 +450,7 @@ struct snd_pci_quirk { 
#define _SND_PCI_QUIRK_ID(vend,dev) \

	.subvendor = (vend), .subdevice = (dev)

#define SND_PCI_QUIRK_ID(vend,dev) {_SND_PCI_QUIRK_ID(vend, dev)}

#ifdef CONFIG_SND_DEBUG_DETECT

#ifdef CONFIG_SND_DEBUG_VERBOSE

#define SND_PCI_QUIRK(vend,dev,xname,val) \

	{_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)}

#else

sound/core/Kconfig

+6 −4
Original line number Diff line number Diff line
@@ -153,12 +153,14 @@ config SND_DEBUG 
	help

	  Say Y here to enable ALSA debug code.



config SND_DEBUG_DETECT

	bool "Debug detection"

config SND_DEBUG_VERBOSE

	bool "More verbose debug"

	depends on SND_DEBUG

	help

	  Say Y here to enable extra-verbose log messages printed when

	  detecting devices.

	  Say Y here to enable extra-verbose debugging messages.

	  

	  Let me repeat: it enables EXTRA-VERBOSE DEBUGGING messages.

	  So, say Y only if you are ready to be annoyed.



config SND_PCM_XRUN_DEBUG

	bool "Enable PCM ring buffer overrun/underrun debugging"

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -2335,7 +2335,7 @@ int snd_hda_check_board_config(struct hda_codec *codec, 
	if (!tbl)

		return -1;

	if (tbl->value >= 0 && tbl->value < num_configs) {

#ifdef CONFIG_SND_DEBUG_DETECT

#ifdef CONFIG_SND_DEBUG_VERBOSE

		char tmp[10];

		const char *model = NULL;

		if (models)