diff options
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/ca0106/ca0106.h | 2 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 2 | ||||
-rw-r--r-- | sound/pci/emu10k1/p16v.h | 2 | ||||
-rw-r--r-- | sound/pci/es1968.c | 2 | ||||
-rw-r--r-- | sound/pci/rme9652/hdspm.c | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h index f19c11077255..fc53b9bca26d 100644 --- a/sound/pci/ca0106/ca0106.h +++ b/sound/pci/ca0106/ca0106.h | |||
@@ -188,7 +188,7 @@ | |||
188 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ | 188 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ |
189 | /* PTR[5:0], Default: 0x0 */ | 189 | /* PTR[5:0], Default: 0x0 */ |
190 | #define PLAYBACK_UNKNOWN3 0x03 /* Not used ?? */ | 190 | #define PLAYBACK_UNKNOWN3 0x03 /* Not used ?? */ |
191 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ | 191 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */ |
192 | /* DMA[31:0], Default: 0x0 */ | 192 | /* DMA[31:0], Default: 0x0 */ |
193 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ | 193 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ |
194 | /* SIZE[31:16], Default: 0x0 */ | 194 | /* SIZE[31:16], Default: 0x0 */ |
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index df47f738098d..0c701e4ec8a5 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -114,7 +114,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard."); | |||
114 | */ | 114 | */ |
115 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ | 115 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ |
116 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ | 116 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ |
117 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ | 117 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */ |
118 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size */ | 118 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size */ |
119 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Sample currently in DAC */ | 119 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Sample currently in DAC */ |
120 | #define PLAYBACK_UNKNOWN1 0x07 | 120 | #define PLAYBACK_UNKNOWN1 0x07 |
diff --git a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h index 153214940336..00f4817533b1 100644 --- a/sound/pci/emu10k1/p16v.h +++ b/sound/pci/emu10k1/p16v.h | |||
@@ -96,7 +96,7 @@ | |||
96 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ | 96 | #define PLAYBACK_LIST_SIZE 0x01 /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000 */ |
97 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ | 97 | #define PLAYBACK_LIST_PTR 0x02 /* Pointer to the current period being played */ |
98 | #define PLAYBACK_UNKNOWN3 0x03 /* Not used */ | 98 | #define PLAYBACK_UNKNOWN3 0x03 /* Not used */ |
99 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA addresss */ | 99 | #define PLAYBACK_DMA_ADDR 0x04 /* Playback DMA address */ |
100 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ | 100 | #define PLAYBACK_PERIOD_SIZE 0x05 /* Playback period size. win2000 uses 0x04000000 */ |
101 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */ | 101 | #define PLAYBACK_POINTER 0x06 /* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */ |
102 | #define PLAYBACK_FIFO_END_ADDRESS 0x07 /* Playback FIFO end address */ | 102 | #define PLAYBACK_FIFO_END_ADDRESS 0x07 /* Playback FIFO end address */ |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 23a58f0d6cb9..7c17f45d876d 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -220,7 +220,7 @@ MODULE_PARM_DESC(joystick, "Enable joystick."); | |||
220 | #define RINGB_EN_2CODEC 0x0020 | 220 | #define RINGB_EN_2CODEC 0x0020 |
221 | #define RINGB_SING_BIT_DUAL 0x0040 | 221 | #define RINGB_SING_BIT_DUAL 0x0040 |
222 | 222 | ||
223 | /* ****Port Adresses**** */ | 223 | /* ****Port Addresses**** */ |
224 | 224 | ||
225 | /* Write & Read */ | 225 | /* Write & Read */ |
226 | #define ESM_INDEX 0x02 | 226 | #define ESM_INDEX 0x02 |
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 0c98ef9156d8..f5eadfc0672a 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c | |||
@@ -487,7 +487,7 @@ struct hdspm { | |||
487 | struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS]; | 487 | struct snd_kcontrol *playback_mixer_ctls[HDSPM_MAX_CHANNELS]; |
488 | /* but input to much, so not used */ | 488 | /* but input to much, so not used */ |
489 | struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS]; | 489 | struct snd_kcontrol *input_mixer_ctls[HDSPM_MAX_CHANNELS]; |
490 | /* full mixer accessable over mixer ioctl or hwdep-device */ | 490 | /* full mixer accessible over mixer ioctl or hwdep-device */ |
491 | struct hdspm_mixer *mixer; | 491 | struct hdspm_mixer *mixer; |
492 | 492 | ||
493 | }; | 493 | }; |
@@ -550,7 +550,7 @@ static inline int HDSPM_bit2freq(int n) | |||
550 | return bit2freq_tab[n]; | 550 | return bit2freq_tab[n]; |
551 | } | 551 | } |
552 | 552 | ||
553 | /* Write/read to/from HDSPM with Adresses in Bytes | 553 | /* Write/read to/from HDSPM with Addresses in Bytes |
554 | not words but only 32Bit writes are allowed */ | 554 | not words but only 32Bit writes are allowed */ |
555 | 555 | ||
556 | static inline void hdspm_write(struct hdspm * hdspm, unsigned int reg, | 556 | static inline void hdspm_write(struct hdspm * hdspm, unsigned int reg, |
@@ -2908,7 +2908,7 @@ static int snd_hdspm_create_controls(struct snd_card *card, struct hdspm * hdspm | |||
2908 | 2908 | ||
2909 | /* Channel playback mixer as default control | 2909 | /* Channel playback mixer as default control |
2910 | Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders, | 2910 | Note: the whole matrix would be 128*HDSPM_MIXER_CHANNELS Faders, |
2911 | thats too * big for any alsamixer they are accesible via special | 2911 | thats too * big for any alsamixer they are accessible via special |
2912 | IOCTL on hwdep and the mixer 2dimensional mixer control | 2912 | IOCTL on hwdep and the mixer 2dimensional mixer control |
2913 | */ | 2913 | */ |
2914 | 2914 | ||