forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'topic/echoaudio' into for-linus
- Loading branch information
Showing
14 changed files
with
508 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /************************************************************************ | ||
| This file is part of Echo Digital Audio's generic driver library. | ||
| Copyright Echo Digital Audio Corporation (c) 1998 - 2005 | ||
| All rights reserved | ||
| www.echoaudio.com | ||
| This library is free software; you can redistribute it and/or | ||
| modify it under the terms of the GNU Lesser General Public | ||
| License as published by the Free Software Foundation; either | ||
| version 2.1 of the License, or (at your option) any later version. | ||
| This library is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| Lesser General Public License for more details. | ||
| You should have received a copy of the GNU Lesser General Public | ||
| License along with this library; if not, write to the Free Software | ||
| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| ************************************************************************* | ||
| Translation from C++ and adaptation for use in ALSA-Driver | ||
| were made by Giuliano Pochini <[email protected]> | ||
| *************************************************************************/ | ||
|
|
||
| static int set_sample_rate(struct echoaudio *chip, u32 rate) | ||
| { | ||
| u32 clock, control_reg, old_control_reg; | ||
|
|
||
| if (wait_handshake(chip)) | ||
| return -EIO; | ||
|
|
||
| old_control_reg = le32_to_cpu(chip->comm_page->control_register); | ||
| control_reg = old_control_reg & ~INDIGO_EXPRESS_CLOCK_MASK; | ||
|
|
||
| switch (rate) { | ||
| case 32000: | ||
| clock = INDIGO_EXPRESS_32000; | ||
| break; | ||
| case 44100: | ||
| clock = INDIGO_EXPRESS_44100; | ||
| break; | ||
| case 48000: | ||
| clock = INDIGO_EXPRESS_48000; | ||
| break; | ||
| case 64000: | ||
| clock = INDIGO_EXPRESS_32000|INDIGO_EXPRESS_DOUBLE_SPEED; | ||
| break; | ||
| case 88200: | ||
| clock = INDIGO_EXPRESS_44100|INDIGO_EXPRESS_DOUBLE_SPEED; | ||
| break; | ||
| case 96000: | ||
| clock = INDIGO_EXPRESS_48000|INDIGO_EXPRESS_DOUBLE_SPEED; | ||
| break; | ||
| default: | ||
| return -EINVAL; | ||
| } | ||
|
|
||
| control_reg |= clock; | ||
| if (control_reg != old_control_reg) { | ||
| chip->comm_page->control_register = cpu_to_le32(control_reg); | ||
| chip->sample_rate = rate; | ||
| clear_handshake(chip); | ||
| return send_vector(chip, DSP_VC_UPDATE_CLOCKS); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* This function routes the sound from a virtual channel to a real output */ | ||
| static int set_vmixer_gain(struct echoaudio *chip, u16 output, u16 pipe, | ||
| int gain) | ||
| { | ||
| int index; | ||
|
|
||
| if (snd_BUG_ON(pipe >= num_pipes_out(chip) || | ||
| output >= num_busses_out(chip))) | ||
| return -EINVAL; | ||
|
|
||
| if (wait_handshake(chip)) | ||
| return -EIO; | ||
|
|
||
| chip->vmixer_gain[output][pipe] = gain; | ||
| index = output * num_pipes_out(chip) + pipe; | ||
| chip->comm_page->vmixer[index] = gain; | ||
|
|
||
| DE_ACT(("set_vmixer_gain: pipe %d, out %d = %d\n", pipe, output, gain)); | ||
| return 0; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* Tell the DSP to read and update virtual mixer levels in comm page. */ | ||
| static int update_vmixer_level(struct echoaudio *chip) | ||
| { | ||
| if (wait_handshake(chip)) | ||
| return -EIO; | ||
| clear_handshake(chip); | ||
| return send_vector(chip, DSP_VC_SET_VMIXER_GAIN); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| static u32 detect_input_clocks(const struct echoaudio *chip) | ||
| { | ||
| return ECHO_CLOCK_BIT_INTERNAL; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /* The IndigoIO has no ASIC. Just do nothing */ | ||
| static int load_asic(struct echoaudio *chip) | ||
| { | ||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * ALSA driver for Echoaudio soundcards. | ||
| * Copyright (C) 2009 Giuliano Pochini <[email protected]> | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; version 2 of the License. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| */ | ||
|
|
||
| #define INDIGO_FAMILY | ||
| #define ECHOCARD_INDIGO_DJX | ||
| #define ECHOCARD_NAME "Indigo DJx" | ||
| #define ECHOCARD_HAS_SUPER_INTERLEAVE | ||
| #define ECHOCARD_HAS_VMIXER | ||
| #define ECHOCARD_HAS_STEREO_BIG_ENDIAN32 | ||
|
|
||
| /* Pipe indexes */ | ||
| #define PX_ANALOG_OUT 0 /* 8 */ | ||
| #define PX_DIGITAL_OUT 8 /* 0 */ | ||
| #define PX_ANALOG_IN 8 /* 0 */ | ||
| #define PX_DIGITAL_IN 8 /* 0 */ | ||
| #define PX_NUM 8 | ||
|
|
||
| /* Bus indexes */ | ||
| #define BX_ANALOG_OUT 0 /* 4 */ | ||
| #define BX_DIGITAL_OUT 4 /* 0 */ | ||
| #define BX_ANALOG_IN 4 /* 0 */ | ||
| #define BX_DIGITAL_IN 4 /* 0 */ | ||
| #define BX_NUM 4 | ||
|
|
||
|
|
||
| #include <linux/delay.h> | ||
| #include <linux/init.h> | ||
| #include <linux/interrupt.h> | ||
| #include <linux/pci.h> | ||
| #include <linux/slab.h> | ||
| #include <linux/moduleparam.h> | ||
| #include <linux/firmware.h> | ||
| #include <linux/io.h> | ||
| #include <sound/core.h> | ||
| #include <sound/info.h> | ||
| #include <sound/control.h> | ||
| #include <sound/tlv.h> | ||
| #include <sound/pcm.h> | ||
| #include <sound/pcm_params.h> | ||
| #include <sound/asoundef.h> | ||
| #include <sound/initval.h> | ||
| #include <asm/atomic.h> | ||
| #include "echoaudio.h" | ||
|
|
||
| MODULE_FIRMWARE("ea/loader_dsp.fw"); | ||
| MODULE_FIRMWARE("ea/indigo_djx_dsp.fw"); | ||
|
|
||
| #define FW_361_LOADER 0 | ||
| #define FW_INDIGO_DJX_DSP 1 | ||
|
|
||
| static const struct firmware card_fw[] = { | ||
| {0, "loader_dsp.fw"}, | ||
| {0, "indigo_djx_dsp.fw"} | ||
| }; | ||
|
|
||
| static struct pci_device_id snd_echo_ids[] = { | ||
| {0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0}, /* Indigo DJx*/ | ||
| {0,} | ||
| }; | ||
|
|
||
| static struct snd_pcm_hardware pcm_hardware_skel = { | ||
| .info = SNDRV_PCM_INFO_MMAP | | ||
| SNDRV_PCM_INFO_INTERLEAVED | | ||
| SNDRV_PCM_INFO_BLOCK_TRANSFER | | ||
| SNDRV_PCM_INFO_MMAP_VALID | | ||
| SNDRV_PCM_INFO_PAUSE | | ||
| SNDRV_PCM_INFO_SYNC_START, | ||
| .formats = SNDRV_PCM_FMTBIT_U8 | | ||
| SNDRV_PCM_FMTBIT_S16_LE | | ||
| SNDRV_PCM_FMTBIT_S24_3LE | | ||
| SNDRV_PCM_FMTBIT_S32_LE | | ||
| SNDRV_PCM_FMTBIT_S32_BE, | ||
| .rates = SNDRV_PCM_RATE_32000 | | ||
| SNDRV_PCM_RATE_44100 | | ||
| SNDRV_PCM_RATE_48000 | | ||
| SNDRV_PCM_RATE_88200 | | ||
| SNDRV_PCM_RATE_96000, | ||
| .rate_min = 32000, | ||
| .rate_max = 96000, | ||
| .channels_min = 1, | ||
| .channels_max = 4, | ||
| .buffer_bytes_max = 262144, | ||
| .period_bytes_min = 32, | ||
| .period_bytes_max = 131072, | ||
| .periods_min = 2, | ||
| .periods_max = 220, | ||
| }; | ||
|
|
||
| #include "indigodjx_dsp.c" | ||
| #include "indigo_express_dsp.c" | ||
| #include "echoaudio_dsp.c" | ||
| #include "echoaudio.c" |
Oops, something went wrong.