ALSA: hda - Rename {override,cur}_pin with {user,driver}_pin
Rename from override_pin and cur_pin with user_pin and driver_pin, respectively, to be a bit more intuitive. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
c17a1abae2
commit
346ff70fdb
|
@ -371,16 +371,16 @@ hints::
|
||||||
not used.
|
not used.
|
||||||
init_pin_configs::
|
init_pin_configs::
|
||||||
Shows the initial pin default config values set by BIOS.
|
Shows the initial pin default config values set by BIOS.
|
||||||
override_pin_configs::
|
driver_pin_configs::
|
||||||
Shows the pin default config values to override the BIOS setup.
|
|
||||||
Writing this (with two numbers, NID and value) appends the new
|
|
||||||
value. The given will be used instead of the initial BIOS value at
|
|
||||||
the next reconfiguration time.
|
|
||||||
cur_pin_configs::
|
|
||||||
Shows the pin default values set by the codec parser explicitly.
|
Shows the pin default values set by the codec parser explicitly.
|
||||||
This doesn't show all pin values but only the changed values by
|
This doesn't show all pin values but only the changed values by
|
||||||
the parser. That is, if the parser doesn't change the pin default
|
the parser. That is, if the parser doesn't change the pin default
|
||||||
config values by itself, this will contain nothing.
|
config values by itself, this will contain nothing.
|
||||||
|
user_pin_configs::
|
||||||
|
Shows the pin default config values to override the BIOS setup.
|
||||||
|
Writing this (with two numbers, NID and value) appends the new
|
||||||
|
value. The given will be used instead of the initial BIOS value at
|
||||||
|
the next reconfiguration time.
|
||||||
reconfig::
|
reconfig::
|
||||||
Triggers the codec re-configuration. When any value is written to
|
Triggers the codec re-configuration. When any value is written to
|
||||||
this file, the driver re-initialize and parses the codec tree
|
this file, the driver re-initialize and parses the codec tree
|
||||||
|
|
|
@ -755,7 +755,7 @@ int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,
|
||||||
int snd_hda_codec_set_pincfg(struct hda_codec *codec,
|
int snd_hda_codec_set_pincfg(struct hda_codec *codec,
|
||||||
hda_nid_t nid, unsigned int cfg)
|
hda_nid_t nid, unsigned int cfg)
|
||||||
{
|
{
|
||||||
return snd_hda_add_pincfg(codec, &codec->cur_pins, nid, cfg);
|
return snd_hda_add_pincfg(codec, &codec->driver_pins, nid, cfg);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_HDA(snd_hda_codec_set_pincfg);
|
EXPORT_SYMBOL_HDA(snd_hda_codec_set_pincfg);
|
||||||
|
|
||||||
|
@ -764,11 +764,11 @@ unsigned int snd_hda_codec_get_pincfg(struct hda_codec *codec, hda_nid_t nid)
|
||||||
{
|
{
|
||||||
struct hda_pincfg *pin;
|
struct hda_pincfg *pin;
|
||||||
|
|
||||||
pin = look_up_pincfg(codec, &codec->cur_pins, nid);
|
pin = look_up_pincfg(codec, &codec->driver_pins, nid);
|
||||||
if (pin)
|
if (pin)
|
||||||
return pin->cfg;
|
return pin->cfg;
|
||||||
#ifdef CONFIG_SND_HDA_HWDEP
|
#ifdef CONFIG_SND_HDA_HWDEP
|
||||||
pin = look_up_pincfg(codec, &codec->override_pins, nid);
|
pin = look_up_pincfg(codec, &codec->user_pins, nid);
|
||||||
if (pin)
|
if (pin)
|
||||||
return pin->cfg;
|
return pin->cfg;
|
||||||
#endif
|
#endif
|
||||||
|
@ -797,12 +797,12 @@ static void free_hda_cache(struct hda_cache_rec *cache);
|
||||||
/* restore the initial pin cfgs and release all pincfg lists */
|
/* restore the initial pin cfgs and release all pincfg lists */
|
||||||
static void restore_init_pincfgs(struct hda_codec *codec)
|
static void restore_init_pincfgs(struct hda_codec *codec)
|
||||||
{
|
{
|
||||||
/* first free cur_pins and override_pins, then call restore_pincfg
|
/* first free driver_pins and user_pins, then call restore_pincfg
|
||||||
* so that only the values in init_pins are restored
|
* so that only the values in init_pins are restored
|
||||||
*/
|
*/
|
||||||
snd_array_free(&codec->cur_pins);
|
snd_array_free(&codec->driver_pins);
|
||||||
#ifdef CONFIG_SND_HDA_HWDEP
|
#ifdef CONFIG_SND_HDA_HWDEP
|
||||||
snd_array_free(&codec->override_pins);
|
snd_array_free(&codec->user_pins);
|
||||||
#endif
|
#endif
|
||||||
restore_pincfgs(codec);
|
restore_pincfgs(codec);
|
||||||
snd_array_free(&codec->init_pins);
|
snd_array_free(&codec->init_pins);
|
||||||
|
@ -874,7 +874,7 @@ int /*__devinit*/ snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr
|
||||||
init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
|
init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
|
||||||
snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32);
|
snd_array_init(&codec->mixers, sizeof(struct snd_kcontrol *), 32);
|
||||||
snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16);
|
snd_array_init(&codec->init_pins, sizeof(struct hda_pincfg), 16);
|
||||||
snd_array_init(&codec->cur_pins, sizeof(struct hda_pincfg), 16);
|
snd_array_init(&codec->driver_pins, sizeof(struct hda_pincfg), 16);
|
||||||
if (codec->bus->modelname) {
|
if (codec->bus->modelname) {
|
||||||
codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL);
|
codec->modelname = kstrdup(codec->bus->modelname, GFP_KERNEL);
|
||||||
if (!codec->modelname) {
|
if (!codec->modelname) {
|
||||||
|
@ -1463,8 +1463,8 @@ void snd_hda_codec_reset(struct hda_codec *codec)
|
||||||
free_hda_cache(&codec->cmd_cache);
|
free_hda_cache(&codec->cmd_cache);
|
||||||
init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
|
init_hda_cache(&codec->amp_cache, sizeof(struct hda_amp_info));
|
||||||
init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
|
init_hda_cache(&codec->cmd_cache, sizeof(struct hda_cache_head));
|
||||||
/* free only cur_pins so that init_pins + override_pins are restored */
|
/* free only driver_pins so that init_pins + user_pins are restored */
|
||||||
snd_array_free(&codec->cur_pins);
|
snd_array_free(&codec->driver_pins);
|
||||||
restore_pincfgs(codec);
|
restore_pincfgs(codec);
|
||||||
codec->num_pcms = 0;
|
codec->num_pcms = 0;
|
||||||
codec->pcm_info = NULL;
|
codec->pcm_info = NULL;
|
||||||
|
|
|
@ -779,13 +779,13 @@ struct hda_codec {
|
||||||
unsigned int spdif_in_enable; /* SPDIF input enable? */
|
unsigned int spdif_in_enable; /* SPDIF input enable? */
|
||||||
hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */
|
hda_nid_t *slave_dig_outs; /* optional digital out slave widgets */
|
||||||
struct snd_array init_pins; /* initial (BIOS) pin configurations */
|
struct snd_array init_pins; /* initial (BIOS) pin configurations */
|
||||||
struct snd_array cur_pins; /* current pin configurations */
|
struct snd_array driver_pins; /* pin configs set by codec parser */
|
||||||
|
|
||||||
#ifdef CONFIG_SND_HDA_HWDEP
|
#ifdef CONFIG_SND_HDA_HWDEP
|
||||||
struct snd_hwdep *hwdep; /* assigned hwdep device */
|
struct snd_hwdep *hwdep; /* assigned hwdep device */
|
||||||
struct snd_array init_verbs; /* additional init verbs */
|
struct snd_array init_verbs; /* additional init verbs */
|
||||||
struct snd_array hints; /* additional hints */
|
struct snd_array hints; /* additional hints */
|
||||||
struct snd_array override_pins; /* default pin configs to override */
|
struct snd_array user_pins; /* default pin configs to override */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* misc flags */
|
/* misc flags */
|
||||||
|
|
|
@ -109,7 +109,7 @@ static void clear_hwdep_elements(struct hda_codec *codec)
|
||||||
for (i = 0; i < codec->hints.used; i++, head++)
|
for (i = 0; i < codec->hints.used; i++, head++)
|
||||||
kfree(*head);
|
kfree(*head);
|
||||||
snd_array_free(&codec->hints);
|
snd_array_free(&codec->hints);
|
||||||
snd_array_free(&codec->override_pins);
|
snd_array_free(&codec->user_pins);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void hwdep_free(struct snd_hwdep *hwdep)
|
static void hwdep_free(struct snd_hwdep *hwdep)
|
||||||
|
@ -142,7 +142,7 @@ int /*__devinit*/ snd_hda_create_hwdep(struct hda_codec *codec)
|
||||||
|
|
||||||
snd_array_init(&codec->init_verbs, sizeof(struct hda_verb), 32);
|
snd_array_init(&codec->init_verbs, sizeof(struct hda_verb), 32);
|
||||||
snd_array_init(&codec->hints, sizeof(char *), 32);
|
snd_array_init(&codec->hints, sizeof(char *), 32);
|
||||||
snd_array_init(&codec->override_pins, sizeof(struct hda_pincfg), 16);
|
snd_array_init(&codec->user_pins, sizeof(struct hda_pincfg), 16);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -340,29 +340,29 @@ static ssize_t init_pin_configs_show(struct device *dev,
|
||||||
return pin_configs_show(codec, &codec->init_pins, buf);
|
return pin_configs_show(codec, &codec->init_pins, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t override_pin_configs_show(struct device *dev,
|
static ssize_t user_pin_configs_show(struct device *dev,
|
||||||
struct device_attribute *attr,
|
struct device_attribute *attr,
|
||||||
char *buf)
|
char *buf)
|
||||||
{
|
{
|
||||||
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
|
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
|
||||||
struct hda_codec *codec = hwdep->private_data;
|
struct hda_codec *codec = hwdep->private_data;
|
||||||
return pin_configs_show(codec, &codec->override_pins, buf);
|
return pin_configs_show(codec, &codec->user_pins, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t cur_pin_configs_show(struct device *dev,
|
static ssize_t driver_pin_configs_show(struct device *dev,
|
||||||
struct device_attribute *attr,
|
struct device_attribute *attr,
|
||||||
char *buf)
|
char *buf)
|
||||||
{
|
{
|
||||||
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
|
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
|
||||||
struct hda_codec *codec = hwdep->private_data;
|
struct hda_codec *codec = hwdep->private_data;
|
||||||
return pin_configs_show(codec, &codec->cur_pins, buf);
|
return pin_configs_show(codec, &codec->driver_pins, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAX_PIN_CONFIGS 32
|
#define MAX_PIN_CONFIGS 32
|
||||||
|
|
||||||
static ssize_t override_pin_configs_store(struct device *dev,
|
static ssize_t user_pin_configs_store(struct device *dev,
|
||||||
struct device_attribute *attr,
|
struct device_attribute *attr,
|
||||||
const char *buf, size_t count)
|
const char *buf, size_t count)
|
||||||
{
|
{
|
||||||
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
|
struct snd_hwdep *hwdep = dev_get_drvdata(dev);
|
||||||
struct hda_codec *codec = hwdep->private_data;
|
struct hda_codec *codec = hwdep->private_data;
|
||||||
|
@ -373,7 +373,7 @@ static ssize_t override_pin_configs_store(struct device *dev,
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (!nid)
|
if (!nid)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
err = snd_hda_add_pincfg(codec, &codec->override_pins, nid, cfg);
|
err = snd_hda_add_pincfg(codec, &codec->user_pins, nid, cfg);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
return count;
|
return count;
|
||||||
|
@ -397,8 +397,8 @@ static struct device_attribute codec_attrs[] = {
|
||||||
CODEC_ATTR_WO(init_verbs),
|
CODEC_ATTR_WO(init_verbs),
|
||||||
CODEC_ATTR_WO(hints),
|
CODEC_ATTR_WO(hints),
|
||||||
CODEC_ATTR_RO(init_pin_configs),
|
CODEC_ATTR_RO(init_pin_configs),
|
||||||
CODEC_ATTR_RW(override_pin_configs),
|
CODEC_ATTR_RW(user_pin_configs),
|
||||||
CODEC_ATTR_RO(cur_pin_configs),
|
CODEC_ATTR_RO(driver_pin_configs),
|
||||||
CODEC_ATTR_WO(reconfig),
|
CODEC_ATTR_WO(reconfig),
|
||||||
CODEC_ATTR_WO(clear),
|
CODEC_ATTR_WO(clear),
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue