diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-01-29 09:25:40 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:03:15 -0500 |
commit | 189bc171434e84797f586130fca8eb4df3746e3f (patch) | |
tree | a7acde978684639db7ddbb8ccda20e6f0f96d2e0 /sound/pci/ice1712/vt1720_mobo.c | |
parent | bcb4d788f573805c74ac4f39a622b30955b2f916 (diff) |
[ALSA] ice1712 - Reorganize existing eeprom data
Reorganize EEPROM data (in C99 style).
Signed-of-by: Philipp Matthias Hahn <pmhahn@pmhahn.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/ice1712/vt1720_mobo.c')
-rw-r--r-- | sound/pci/ice1712/vt1720_mobo.c | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/sound/pci/ice1712/vt1720_mobo.c b/sound/pci/ice1712/vt1720_mobo.c index 7ca263c13091..239524158fe7 100644 --- a/sound/pci/ice1712/vt1720_mobo.c +++ b/sound/pci/ice1712/vt1720_mobo.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <sound/core.h> | 30 | #include <sound/core.h> |
31 | 31 | ||
32 | #include "ice1712.h" | 32 | #include "ice1712.h" |
33 | #include "envy24ht.h" | ||
33 | #include "vt1720_mobo.h" | 34 | #include "vt1720_mobo.h" |
34 | 35 | ||
35 | 36 | ||
@@ -56,35 +57,35 @@ static int __devinit k8x800_add_controls(struct snd_ice1712 *ice) | |||
56 | /* EEPROM image */ | 57 | /* EEPROM image */ |
57 | 58 | ||
58 | static unsigned char k8x800_eeprom[] __devinitdata = { | 59 | static unsigned char k8x800_eeprom[] __devinitdata = { |
59 | 0x01, /* SYSCONF: clock 256, 1ADC, 2DACs */ | 60 | [ICE_EEP2_SYSCONF] = 0x01, /* clock 256, 1ADC, 2DACs */ |
60 | 0x02, /* ACLINK: ACLINK, packed */ | 61 | [ICE_EEP2_ACLINK] = 0x02, /* ACLINK, packed */ |
61 | 0x00, /* I2S: - */ | 62 | [ICE_EEP2_I2S] = 0x00, /* - */ |
62 | 0x00, /* SPDIF: - */ | 63 | [ICE_EEP2_SPDIF] = 0x00, /* - */ |
63 | 0xff, /* GPIO_DIR */ | 64 | [ICE_EEP2_GPIO_DIR] = 0xff, |
64 | 0xff, /* GPIO_DIR1 */ | 65 | [ICE_EEP2_GPIO_DIR1] = 0xff, |
65 | 0x00, /* - */ | 66 | [ICE_EEP2_GPIO_DIR2] = 0x00, /* - */ |
66 | 0xff, /* GPIO_MASK */ | 67 | [ICE_EEP2_GPIO_MASK] = 0xff, |
67 | 0xff, /* GPIO_MASK1 */ | 68 | [ICE_EEP2_GPIO_MASK1] = 0xff, |
68 | 0x00, /* - */ | 69 | [ICE_EEP2_GPIO_MASK2] = 0x00, /* - */ |
69 | 0x00, /* GPIO_STATE */ | 70 | [ICE_EEP2_GPIO_STATE] = 0x00, |
70 | 0x00, /* GPIO_STATE1 */ | 71 | [ICE_EEP2_GPIO_STATE1] = 0x00, |
71 | 0x00, /* - */ | 72 | [ICE_EEP2_GPIO_STATE2] = 0x00, /* - */ |
72 | }; | 73 | }; |
73 | 74 | ||
74 | static unsigned char sn25p_eeprom[] __devinitdata = { | 75 | static unsigned char sn25p_eeprom[] __devinitdata = { |
75 | 0x01, /* SYSCONF: clock 256, 1ADC, 2DACs */ | 76 | [ICE_EEP2_SYSCONF] = 0x01, /* clock 256, 1ADC, 2DACs */ |
76 | 0x02, /* ACLINK: ACLINK, packed */ | 77 | [ICE_EEP2_ACLINK] = 0x02, /* ACLINK, packed */ |
77 | 0x00, /* I2S: - */ | 78 | [ICE_EEP2_I2S] = 0x00, /* - */ |
78 | 0x41, /* SPDIF: - */ | 79 | [ICE_EEP2_SPDIF] = 0x41, /* - */ |
79 | 0xff, /* GPIO_DIR */ | 80 | [ICE_EEP2_GPIO_DIR] = 0xff, |
80 | 0xff, /* GPIO_DIR1 */ | 81 | [ICE_EEP2_GPIO_DIR1] = 0xff, |
81 | 0x00, /* - */ | 82 | [ICE_EEP2_GPIO_DIR2] = 0x00, /* - */ |
82 | 0xff, /* GPIO_MASK */ | 83 | [ICE_EEP2_GPIO_MASK] = 0xff, |
83 | 0xff, /* GPIO_MASK1 */ | 84 | [ICE_EEP2_GPIO_MASK1] = 0xff, |
84 | 0x00, /* - */ | 85 | [ICE_EEP2_GPIO_MASK2] = 0x00, /* - */ |
85 | 0x00, /* GPIO_STATE */ | 86 | [ICE_EEP2_GPIO_STATE] = 0x00, |
86 | 0x00, /* GPIO_STATE1 */ | 87 | [ICE_EEP2_GPIO_STATE1] = 0x00, |
87 | 0x00, /* - */ | 88 | [ICE_EEP2_GPIO_STATE2] = 0x00, /* - */ |
88 | }; | 89 | }; |
89 | 90 | ||
90 | 91 | ||