diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 03:02:08 -0400 |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 03:02:08 -0400 |
commit | d76596b1ee7f5cdbd0b73d374ba72372a2c8b725 (patch) | |
tree | 8ecb3fde83a1eb3c67efcb99c90ad993731ed479 /sound/pci/oxygen/oxygen_lib.c | |
parent | c3f00739c5e45b4bf6f759172a5318256b92f2b2 (diff) |
ALSA: oxygen: rename pcm_dev_cfg
Rename the pcm_dev_cfg field to device_config because there will be
additional flags that do not describe PCM devices.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
-rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 58bbc010ed89..02191c6a4e7b 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
@@ -273,7 +273,7 @@ static void oxygen_init(struct oxygen *chip) | |||
273 | OXYGEN_RATE_48000 | chip->model.dac_i2s_format | | 273 | OXYGEN_RATE_48000 | chip->model.dac_i2s_format | |
274 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | | 274 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | |
275 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); | 275 | OXYGEN_I2S_MASTER | OXYGEN_I2S_BCLK_64); |
276 | if (chip->model.pcm_dev_cfg & CAPTURE_0_FROM_I2S_1) | 276 | if (chip->model.device_config & CAPTURE_0_FROM_I2S_1) |
277 | oxygen_write16(chip, OXYGEN_I2S_A_FORMAT, | 277 | oxygen_write16(chip, OXYGEN_I2S_A_FORMAT, |
278 | OXYGEN_RATE_48000 | chip->model.adc_i2s_format | | 278 | OXYGEN_RATE_48000 | chip->model.adc_i2s_format | |
279 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | | 279 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | |
@@ -281,8 +281,8 @@ static void oxygen_init(struct oxygen *chip) | |||
281 | else | 281 | else |
282 | oxygen_write16(chip, OXYGEN_I2S_A_FORMAT, | 282 | oxygen_write16(chip, OXYGEN_I2S_A_FORMAT, |
283 | OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK); | 283 | OXYGEN_I2S_MASTER | OXYGEN_I2S_MUTE_MCLK); |
284 | if (chip->model.pcm_dev_cfg & (CAPTURE_0_FROM_I2S_2 | | 284 | if (chip->model.device_config & (CAPTURE_0_FROM_I2S_2 | |
285 | CAPTURE_2_FROM_I2S_2)) | 285 | CAPTURE_2_FROM_I2S_2)) |
286 | oxygen_write16(chip, OXYGEN_I2S_B_FORMAT, | 286 | oxygen_write16(chip, OXYGEN_I2S_B_FORMAT, |
287 | OXYGEN_RATE_48000 | chip->model.adc_i2s_format | | 287 | OXYGEN_RATE_48000 | chip->model.adc_i2s_format | |
288 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | | 288 | OXYGEN_I2S_MCLK_256 | OXYGEN_I2S_BITS_16 | |
@@ -295,7 +295,7 @@ static void oxygen_init(struct oxygen *chip) | |||
295 | oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL, | 295 | oxygen_clear_bits32(chip, OXYGEN_SPDIF_CONTROL, |
296 | OXYGEN_SPDIF_OUT_ENABLE | | 296 | OXYGEN_SPDIF_OUT_ENABLE | |
297 | OXYGEN_SPDIF_LOOPBACK); | 297 | OXYGEN_SPDIF_LOOPBACK); |
298 | if (chip->model.pcm_dev_cfg & CAPTURE_1_FROM_SPDIF) | 298 | if (chip->model.device_config & CAPTURE_1_FROM_SPDIF) |
299 | oxygen_write32_masked(chip, OXYGEN_SPDIF_CONTROL, | 299 | oxygen_write32_masked(chip, OXYGEN_SPDIF_CONTROL, |
300 | OXYGEN_SPDIF_SENSE_MASK | | 300 | OXYGEN_SPDIF_SENSE_MASK | |
301 | OXYGEN_SPDIF_LOCK_MASK | | 301 | OXYGEN_SPDIF_LOCK_MASK | |
@@ -514,7 +514,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, | |||
514 | oxygen_proc_init(chip); | 514 | oxygen_proc_init(chip); |
515 | 515 | ||
516 | spin_lock_irq(&chip->reg_lock); | 516 | spin_lock_irq(&chip->reg_lock); |
517 | if (chip->model.pcm_dev_cfg & CAPTURE_1_FROM_SPDIF) | 517 | if (chip->model.device_config & CAPTURE_1_FROM_SPDIF) |
518 | chip->interrupt_mask |= OXYGEN_INT_SPDIF_IN_DETECT; | 518 | chip->interrupt_mask |= OXYGEN_INT_SPDIF_IN_DETECT; |
519 | if (chip->has_ac97_0 | chip->has_ac97_1) | 519 | if (chip->has_ac97_0 | chip->has_ac97_1) |
520 | chip->interrupt_mask |= OXYGEN_INT_AC97; | 520 | chip->interrupt_mask |= OXYGEN_INT_AC97; |