← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to sound/core/oss/route.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/core/oss/route.c
25
25
#include "pcm_plugin.h"
26
26
 
27
27
static void zero_areas(struct snd_pcm_plugin_channel *dvp, int ndsts,
28
 
                       snd_pcm_uframes_t frames, int format)
 
28
                       snd_pcm_uframes_t frames, snd_pcm_format_t format)
29
29
{
30
30
        int dst = 0;
31
31
        for (; dst < ndsts; ++dst) {
38
38
 
39
39
static inline void copy_area(const struct snd_pcm_plugin_channel *src_channel,
40
40
                             struct snd_pcm_plugin_channel *dst_channel,
41
 
                             snd_pcm_uframes_t frames, int format)
 
41
                             snd_pcm_uframes_t frames, snd_pcm_format_t format)
42
42
{
43
43
        dst_channel->enabled = 1;
44
44
        snd_pcm_area_copy(&src_channel->area, 0, &dst_channel->area, 0, frames, format);
51
51
{
52
52
        int nsrcs, ndsts, dst;
53
53
        struct snd_pcm_plugin_channel *dvp;
54
 
        int format;
 
54
        snd_pcm_format_t format;
55
55
 
56
56
        if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))
57
57
                return -ENXIO;