diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:50 -0400 |
commit | e0d2054fd3cf167395390dc1758644486c782707 (patch) | |
tree | 108fd3138f0246f5fa17454680d6d04a670ed6d8 /sound/pci/echoaudio | |
parent | d807500a2472445d05ce641bf09438e3d72eeb4f (diff) | |
parent | c468ac29e63b9927275a94379d00b367f0f97c43 (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/echoaudio')
-rw-r--r-- | sound/pci/echoaudio/echo3g_dsp.c | 2 | ||||
-rw-r--r-- | sound/pci/echoaudio/echoaudio_3g.c | 3 | ||||
-rw-r--r-- | sound/pci/echoaudio/echoaudio_dsp.c | 6 | ||||
-rw-r--r-- | sound/pci/echoaudio/gina20_dsp.c | 4 | ||||
-rw-r--r-- | sound/pci/echoaudio/layla20_dsp.c | 4 | ||||
-rw-r--r-- | sound/pci/echoaudio/mia_dsp.c | 4 | ||||
-rw-r--r-- | sound/pci/echoaudio/midi.c | 4 |
7 files changed, 13 insertions, 14 deletions
diff --git a/sound/pci/echoaudio/echo3g_dsp.c b/sound/pci/echoaudio/echo3g_dsp.c index 417e25add82b..57967e580571 100644 --- a/sound/pci/echoaudio/echo3g_dsp.c +++ b/sound/pci/echoaudio/echo3g_dsp.c | |||
@@ -56,7 +56,7 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
56 | } | 56 | } |
57 | 57 | ||
58 | chip->comm_page->e3g_frq_register = | 58 | chip->comm_page->e3g_frq_register = |
59 | __constant_cpu_to_le32((E3G_MAGIC_NUMBER / 48000) - 2); | 59 | cpu_to_le32((E3G_MAGIC_NUMBER / 48000) - 2); |
60 | chip->device_id = device_id; | 60 | chip->device_id = device_id; |
61 | chip->subdevice_id = subdevice_id; | 61 | chip->subdevice_id = subdevice_id; |
62 | chip->bad_board = TRUE; | 62 | chip->bad_board = TRUE; |
diff --git a/sound/pci/echoaudio/echoaudio_3g.c b/sound/pci/echoaudio/echoaudio_3g.c index c3736bbd819e..e32a74897921 100644 --- a/sound/pci/echoaudio/echoaudio_3g.c +++ b/sound/pci/echoaudio/echoaudio_3g.c | |||
@@ -40,8 +40,7 @@ static int check_asic_status(struct echoaudio *chip) | |||
40 | if (wait_handshake(chip)) | 40 | if (wait_handshake(chip)) |
41 | return -EIO; | 41 | return -EIO; |
42 | 42 | ||
43 | chip->comm_page->ext_box_status = | 43 | chip->comm_page->ext_box_status = cpu_to_le32(E3G_ASIC_NOT_LOADED); |
44 | __constant_cpu_to_le32(E3G_ASIC_NOT_LOADED); | ||
45 | chip->asic_loaded = FALSE; | 44 | chip->asic_loaded = FALSE; |
46 | clear_handshake(chip); | 45 | clear_handshake(chip); |
47 | send_vector(chip, DSP_VC_TEST_ASIC); | 46 | send_vector(chip, DSP_VC_TEST_ASIC); |
diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c index be0e18192de3..4df51ef5e095 100644 --- a/sound/pci/echoaudio/echoaudio_dsp.c +++ b/sound/pci/echoaudio/echoaudio_dsp.c | |||
@@ -926,11 +926,11 @@ static int init_dsp_comm_page(struct echoaudio *chip) | |||
926 | 926 | ||
927 | /* Init the comm page */ | 927 | /* Init the comm page */ |
928 | chip->comm_page->comm_size = | 928 | chip->comm_page->comm_size = |
929 | __constant_cpu_to_le32(sizeof(struct comm_page)); | 929 | cpu_to_le32(sizeof(struct comm_page)); |
930 | chip->comm_page->handshake = 0xffffffff; | 930 | chip->comm_page->handshake = 0xffffffff; |
931 | chip->comm_page->midi_out_free_count = | 931 | chip->comm_page->midi_out_free_count = |
932 | __constant_cpu_to_le32(DSP_MIDI_OUT_FIFO_SIZE); | 932 | cpu_to_le32(DSP_MIDI_OUT_FIFO_SIZE); |
933 | chip->comm_page->sample_rate = __constant_cpu_to_le32(44100); | 933 | chip->comm_page->sample_rate = cpu_to_le32(44100); |
934 | chip->sample_rate = 44100; | 934 | chip->sample_rate = 44100; |
935 | 935 | ||
936 | /* Set line levels so we don't blast any inputs on startup */ | 936 | /* Set line levels so we don't blast any inputs on startup */ |
diff --git a/sound/pci/echoaudio/gina20_dsp.c b/sound/pci/echoaudio/gina20_dsp.c index db6c952e9d7f..3f1e7475faea 100644 --- a/sound/pci/echoaudio/gina20_dsp.c +++ b/sound/pci/echoaudio/gina20_dsp.c | |||
@@ -208,10 +208,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof) | |||
208 | DE_ACT(("set_professional_spdif %d\n", prof)); | 208 | DE_ACT(("set_professional_spdif %d\n", prof)); |
209 | if (prof) | 209 | if (prof) |
210 | chip->comm_page->flags |= | 210 | chip->comm_page->flags |= |
211 | __constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); | 211 | cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); |
212 | else | 212 | else |
213 | chip->comm_page->flags &= | 213 | chip->comm_page->flags &= |
214 | ~__constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); | 214 | ~cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); |
215 | chip->professional_spdif = prof; | 215 | chip->professional_spdif = prof; |
216 | return update_flags(chip); | 216 | return update_flags(chip); |
217 | } | 217 | } |
diff --git a/sound/pci/echoaudio/layla20_dsp.c b/sound/pci/echoaudio/layla20_dsp.c index ede75c6ca0fb..83750e9fd7b4 100644 --- a/sound/pci/echoaudio/layla20_dsp.c +++ b/sound/pci/echoaudio/layla20_dsp.c | |||
@@ -284,10 +284,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof) | |||
284 | DE_ACT(("set_professional_spdif %d\n", prof)); | 284 | DE_ACT(("set_professional_spdif %d\n", prof)); |
285 | if (prof) | 285 | if (prof) |
286 | chip->comm_page->flags |= | 286 | chip->comm_page->flags |= |
287 | __constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); | 287 | cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); |
288 | else | 288 | else |
289 | chip->comm_page->flags &= | 289 | chip->comm_page->flags &= |
290 | ~__constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); | 290 | ~cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); |
291 | chip->professional_spdif = prof; | 291 | chip->professional_spdif = prof; |
292 | return update_flags(chip); | 292 | return update_flags(chip); |
293 | } | 293 | } |
diff --git a/sound/pci/echoaudio/mia_dsp.c b/sound/pci/echoaudio/mia_dsp.c index 227386602f9b..3eca16cb7f71 100644 --- a/sound/pci/echoaudio/mia_dsp.c +++ b/sound/pci/echoaudio/mia_dsp.c | |||
@@ -222,10 +222,10 @@ static int set_professional_spdif(struct echoaudio *chip, char prof) | |||
222 | DE_ACT(("set_professional_spdif %d\n", prof)); | 222 | DE_ACT(("set_professional_spdif %d\n", prof)); |
223 | if (prof) | 223 | if (prof) |
224 | chip->comm_page->flags |= | 224 | chip->comm_page->flags |= |
225 | __constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); | 225 | cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); |
226 | else | 226 | else |
227 | chip->comm_page->flags &= | 227 | chip->comm_page->flags &= |
228 | ~__constant_cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); | 228 | ~cpu_to_le32(DSP_FLAG_PROFESSIONAL_SPDIF); |
229 | chip->professional_spdif = prof; | 229 | chip->professional_spdif = prof; |
230 | return update_flags(chip); | 230 | return update_flags(chip); |
231 | } | 231 | } |
diff --git a/sound/pci/echoaudio/midi.c b/sound/pci/echoaudio/midi.c index 77bf2a83d997..a953d142cb4b 100644 --- a/sound/pci/echoaudio/midi.c +++ b/sound/pci/echoaudio/midi.c | |||
@@ -44,10 +44,10 @@ static int enable_midi_input(struct echoaudio *chip, char enable) | |||
44 | if (enable) { | 44 | if (enable) { |
45 | chip->mtc_state = MIDI_IN_STATE_NORMAL; | 45 | chip->mtc_state = MIDI_IN_STATE_NORMAL; |
46 | chip->comm_page->flags |= | 46 | chip->comm_page->flags |= |
47 | __constant_cpu_to_le32(DSP_FLAG_MIDI_INPUT); | 47 | cpu_to_le32(DSP_FLAG_MIDI_INPUT); |
48 | } else | 48 | } else |
49 | chip->comm_page->flags &= | 49 | chip->comm_page->flags &= |
50 | ~__constant_cpu_to_le32(DSP_FLAG_MIDI_INPUT); | 50 | ~cpu_to_le32(DSP_FLAG_MIDI_INPUT); |
51 | 51 | ||
52 | clear_handshake(chip); | 52 | clear_handshake(chip); |
53 | return send_vector(chip, DSP_VC_UPDATE_FLAGS); | 53 | return send_vector(chip, DSP_VC_UPDATE_FLAGS); |