diff options
author | Sasha Khapyorsky <sashak@smlink.com> | 2005-09-29 05:48:17 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:16:56 -0500 |
commit | 6632d198c6643294319a4ca3f614539dc1ad37a8 (patch) | |
tree | 84476c6179399721cd61fdd08f95001a8a2b4bc2 /sound/pci | |
parent | d602c885a6c30c78197b752c9241ce7e86cdf704 (diff) |
[ALSA] dev_class=SNDRV_PCM_CLASS_MODEM for modem PCMs
dev_class=SNDRV_PCM_CLASS_MODEM for all supported softmodem PCMs
Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/ali5451/ali5451.c | 5 | ||||
-rw-r--r-- | sound/pci/atiixp_modem.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/hda_intel.c | 1 | ||||
-rw-r--r-- | sound/pci/intel8x0m.c | 1 | ||||
-rw-r--r-- | sound/pci/via82xx_modem.c | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index f35b558c29b2..01d971c89e43 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c | |||
@@ -1795,6 +1795,7 @@ struct ali_pcm_description { | |||
1795 | unsigned int capture_num; | 1795 | unsigned int capture_num; |
1796 | snd_pcm_ops_t *playback_ops; | 1796 | snd_pcm_ops_t *playback_ops; |
1797 | snd_pcm_ops_t *capture_ops; | 1797 | snd_pcm_ops_t *capture_ops; |
1798 | unsigned short class; | ||
1798 | }; | 1799 | }; |
1799 | 1800 | ||
1800 | 1801 | ||
@@ -1818,7 +1819,6 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, struct ali_pcm_descr | |||
1818 | } | 1819 | } |
1819 | pcm->private_data = codec; | 1820 | pcm->private_data = codec; |
1820 | pcm->private_free = snd_ali_pcm_free; | 1821 | pcm->private_free = snd_ali_pcm_free; |
1821 | pcm->info_flags = 0; | ||
1822 | if (desc->playback_ops) | 1822 | if (desc->playback_ops) |
1823 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, desc->playback_ops); | 1823 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, desc->playback_ops); |
1824 | if (desc->capture_ops) | 1824 | if (desc->capture_ops) |
@@ -1828,6 +1828,7 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, struct ali_pcm_descr | |||
1828 | snd_dma_pci_data(codec->pci), 64*1024, 128*1024); | 1828 | snd_dma_pci_data(codec->pci), 64*1024, 128*1024); |
1829 | 1829 | ||
1830 | pcm->info_flags = 0; | 1830 | pcm->info_flags = 0; |
1831 | pcm->dev_class = desc->class; | ||
1831 | pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX; | 1832 | pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX; |
1832 | strcpy(pcm->name, desc->name); | 1833 | strcpy(pcm->name, desc->name); |
1833 | codec->pcm[0] = pcm; | 1834 | codec->pcm[0] = pcm; |
@@ -1836,7 +1837,7 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, struct ali_pcm_descr | |||
1836 | 1837 | ||
1837 | static struct ali_pcm_description ali_pcms[] = { | 1838 | static struct ali_pcm_description ali_pcms[] = { |
1838 | { "ALI 5451", ALI_CHANNELS, 1, &snd_ali_playback_ops, &snd_ali_capture_ops }, | 1839 | { "ALI 5451", ALI_CHANNELS, 1, &snd_ali_playback_ops, &snd_ali_capture_ops }, |
1839 | { "ALI 5451 modem", 1, 1, &snd_ali_modem_playback_ops, &snd_ali_modem_capture_ops } | 1840 | { "ALI 5451 modem", 1, 1, &snd_ali_modem_playback_ops, &snd_ali_modem_capture_ops, SNDRV_PCM_CLASS_MODEM } |
1840 | }; | 1841 | }; |
1841 | 1842 | ||
1842 | static int __devinit snd_ali_build_pcms(ali_t *codec) | 1843 | static int __devinit snd_ali_build_pcms(ali_t *codec) |
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index c1a239a4dac6..c020c53a0cda 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
@@ -989,6 +989,7 @@ static int __devinit snd_atiixp_pcm_new(atiixp_t *chip) | |||
989 | return err; | 989 | return err; |
990 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_atiixp_playback_ops); | 990 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_atiixp_playback_ops); |
991 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_atiixp_capture_ops); | 991 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_atiixp_capture_ops); |
992 | pcm->dev_class = SNDRV_PCM_CLASS_MODEM; | ||
992 | pcm->private_data = chip; | 993 | pcm->private_data = chip; |
993 | strcpy(pcm->name, "ATI IXP MC97"); | 994 | strcpy(pcm->name, "ATI IXP MC97"); |
994 | chip->pcmdevs[ATI_PCMDEV_ANALOG] = pcm; | 995 | chip->pcmdevs[ATI_PCMDEV_ANALOG] = pcm; |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 2c5d41147718..faf9dd00ba6c 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -1277,6 +1277,7 @@ static int __devinit azx_pcm_create(azx_t *chip) | |||
1277 | err = create_codec_pcm(chip, codec, &codec->pcm_info[c], pcm_dev); | 1277 | err = create_codec_pcm(chip, codec, &codec->pcm_info[c], pcm_dev); |
1278 | if (err < 0) | 1278 | if (err < 0) |
1279 | return err; | 1279 | return err; |
1280 | chip->pcm[pcm_dev]->dev_class = SNDRV_PCM_CLASS_MODEM; | ||
1280 | pcm_dev++; | 1281 | pcm_dev++; |
1281 | } | 1282 | } |
1282 | } | 1283 | } |
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 9e2060d56c24..2ac1fec5059a 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c | |||
@@ -746,6 +746,7 @@ static int __devinit snd_intel8x0_pcm1(intel8x0_t *chip, int device, struct ich_ | |||
746 | 746 | ||
747 | pcm->private_data = chip; | 747 | pcm->private_data = chip; |
748 | pcm->info_flags = 0; | 748 | pcm->info_flags = 0; |
749 | pcm->dev_class = SNDRV_PCM_CLASS_MODEM; | ||
749 | if (rec->suffix) | 750 | if (rec->suffix) |
750 | sprintf(pcm->name, "%s - %s", chip->card->shortname, rec->suffix); | 751 | sprintf(pcm->name, "%s - %s", chip->card->shortname, rec->suffix); |
751 | else | 752 | else |
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 7eac6f6ac737..034dc1c6262a 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
@@ -832,6 +832,7 @@ static int __devinit snd_via686_pcm_new(via82xx_t *chip) | |||
832 | return err; | 832 | return err; |
833 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via686_playback_ops); | 833 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_via686_playback_ops); |
834 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via686_capture_ops); | 834 | snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_via686_capture_ops); |
835 | pcm->dev_class = SNDRV_PCM_CLASS_MODEM; | ||
835 | pcm->private_data = chip; | 836 | pcm->private_data = chip; |
836 | strcpy(pcm->name, chip->card->shortname); | 837 | strcpy(pcm->name, chip->card->shortname); |
837 | chip->pcms[0] = pcm; | 838 | chip->pcms[0] = pcm; |