aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorLee Revell <rlrevell@joe-job.com>2005-03-30 06:51:18 -0500
committerJaroslav Kysela <perex@suse.cz>2005-05-29 03:00:41 -0400
commit2b637da5a1bb3c128ecdadea6aee693f6ff3b786 (patch)
tree636819c212a13118758a8c19db9905a55b20ef9e /include/sound
parent51f633dada113ef724a145bb5b33ec77d1b092f6 (diff)
[ALSA] clean up card features
EMU10K1/EMU10K2 driver This patch converts the emu10k1 driver to use the card capabilities structure for some more things. Not extensively tested but seems to work. Signed-off-by: Lee Revell <rlrevell@joe-job.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/emu10k1.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 8221df88053f..b1e8ee8e0fab 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1046,6 +1046,7 @@ typedef struct {
1046 unsigned char ca0108_chip; /* Audigy 2 Value */ 1046 unsigned char ca0108_chip; /* Audigy 2 Value */
1047 unsigned char ca0151_chip; /* P16V */ 1047 unsigned char ca0151_chip; /* P16V */
1048 unsigned char spk71; /* Has 7.1 speakers */ 1048 unsigned char spk71; /* Has 7.1 speakers */
1049 unsigned char sblive51; /* SBLive! 5.1 - extout 0x11 -> center, 0x12 -> lfe */
1049 unsigned char spdif_bug; /* Has Spdif phasing bug */ 1050 unsigned char spdif_bug; /* Has Spdif phasing bug */
1050 unsigned char ac97_chip; /* Has an AC97 chip */ 1051 unsigned char ac97_chip; /* Has an AC97 chip */
1051 unsigned char ecard; /* APS EEPROM */ 1052 unsigned char ecard; /* APS EEPROM */
@@ -1057,11 +1058,8 @@ struct _snd_emu10k1 {
1057 int irq; 1058 int irq;
1058 1059
1059 unsigned long port; /* I/O port number */ 1060 unsigned long port; /* I/O port number */
1060 unsigned int APS: 1, /* APS flag */ 1061 unsigned int tos_link: 1, /* tos link detected */
1061 no_ac97: 1, /* no AC'97 */ 1062 rear_ac97: 1; /* rear channels are on AC'97 */
1062 tos_link: 1, /* tos link detected */
1063 rear_ac97: 1, /* rear channels are on AC'97 */
1064 spk71:1; /* 7.1 configuration (Audigy 2 ZS) */
1065 const emu_chip_details_t *card_capabilities; /* Contains profile of card capabilities */ 1063 const emu_chip_details_t *card_capabilities; /* Contains profile of card capabilities */
1066 unsigned int audigy; /* is Audigy? */ 1064 unsigned int audigy; /* is Audigy? */
1067 unsigned int revision; /* chip revision */ 1065 unsigned int revision; /* chip revision */
@@ -1456,7 +1454,6 @@ int snd_emu10k1_fx8010_unregister_irq_handler(emu10k1_t *emu,
1456#endif 1454#endif
1457 1455
1458typedef struct { 1456typedef struct {
1459 unsigned int card; /* card type */
1460 unsigned int internal_tram_size; /* in samples */ 1457 unsigned int internal_tram_size; /* in samples */
1461 unsigned int external_tram_size; /* in samples */ 1458 unsigned int external_tram_size; /* in samples */
1462 char fxbus_names[16][32]; /* names of FXBUSes */ 1459 char fxbus_names[16][32]; /* names of FXBUSes */