diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2010-11-19 15:06:31 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-19 17:43:47 -0800 |
| commit | 6f6ffec188b5416642b20ef14034d40cfeb3256e (patch) | |
| tree | dbea55359345cc4fcf3245177cec1ad5d4736fc3 /drivers/staging/intel_sst/intel_sst_stream_encoded.c | |
| parent | 4856ab33eb5c33bdf17a5a1bd8d720bffe5f6110 (diff) | |
| download | op-kernel-dev-6f6ffec188b5416642b20ef14034d40cfeb3256e.zip op-kernel-dev-6f6ffec188b5416642b20ef14034d40cfeb3256e.tar.gz | |
sst: Change the SST driver PCM interface
The PCM interface in SST driver is cmds only, this patch changes the interface to open, close and cmd interface.
This allows SST driver to keep easy track of handles open
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/intel_sst/intel_sst_stream_encoded.c')
| -rw-r--r-- | drivers/staging/intel_sst/intel_sst_stream_encoded.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/intel_sst/intel_sst_stream_encoded.c b/drivers/staging/intel_sst/intel_sst_stream_encoded.c index d4e94f1..028ef8e 100644 --- a/drivers/staging/intel_sst/intel_sst_stream_encoded.c +++ b/drivers/staging/intel_sst/intel_sst_stream_encoded.c @@ -32,9 +32,9 @@ #include <linux/syscalls.h> #include <linux/firmware.h> #include <linux/sched.h> -#include <linux/rar_register.h> #ifdef CONFIG_MRST_RAR_HANDLER -#include "../../../drivers/staging/memrar/memrar.h" +#include <linux/rar_register.h> +#include "../memrar/memrar.h" #endif #include "intel_sst_ioctl.h" #include "intel_sst.h" @@ -880,13 +880,13 @@ static int sst_send_decode_mess(int str_id, struct stream_info *str_info, return retval; } +#ifdef CONFIG_MRST_RAR_HANDLER static int sst_prepare_input_buffers_rar(struct stream_info *str_info, struct snd_sst_dbufs *dbufs, int *input_index, int *in_copied, int *input_index_valid_size, int *new_entry_flag) { int retval = 0; -#ifdef CONFIG_MRST_RAR_HANDLER int i; if (str_info->ops == STREAM_OPS_PLAYBACK_DRM) { @@ -921,9 +921,10 @@ static int sst_prepare_input_buffers_rar(struct stream_info *str_info, str_info->decode_ibuf_type = dbufs->ibufs->type; *in_copied = str_info->decode_isize; } -#endif return retval; } +#endif + /*This function is used to prepare the kernel input buffers with contents before sending for decode*/ static int sst_prepare_input_buffers(struct stream_info *str_info, |
