← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/isdn/mISDN/dsp_cmx.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/isdn/mISDN/dsp_cmx.c
742
742
                                               member->dsp->pcm_slot_tx,
743
743
                                               member->dsp->pcm_bank_tx,
744
744
                                               member->dsp->pcm_bank_rx);
745
 
                                conf->hardware = 0;
746
 
                                conf->software = 1;
 
745
                                conf->hardware = 1;
 
746
                                conf->software = tx_data;
747
747
                                return;
748
748
                        }
749
749
                        /* find a new slot */
834
834
                                               nextm->dsp->name,
835
835
                                               member->dsp->pcm_slot_tx,
836
836
                                               member->dsp->pcm_slot_rx);
837
 
                                conf->hardware = 0;
838
 
                                conf->software = 1;
 
837
                                conf->hardware = 1;
 
838
                                conf->software = tx_data;
839
839
                                return;
840
840
                        }
841
841
                        /* find two new slot */
939
939
        /* for more than two members.. */
940
940
 
941
941
        /* if all members already have the same conference */
942
 
        if (all_conf)
 
942
        if (all_conf) {
 
943
                conf->hardware = 1;
 
944
                conf->software = tx_data;
943
945
                return;
 
946
        }
944
947
 
945
948
        /*
946
949
         * if there is an existing conference, but not all members have joined
1013
1016
                        dsp_cmx_hw_message(member->dsp,
1014
1017
                                           MISDN_CTRL_HFC_CONF_JOIN, current_conf, 0, 0, 0);
1015
1018
                }
 
1019
                conf->hardware = 1;
 
1020
                conf->software = tx_data;
1016
1021
                return;
1017
1022
        }
1018
1023
 
1328
1333
                }
1329
1334
                if (dsp->conf && dsp->conf->software && dsp->conf->hardware)
1330
1335
                        tx_data_only = 1;
1331
 
                if (dsp->conf->software && dsp->echo.hardware)
 
1336
                if (dsp->echo.software && dsp->echo.hardware)
1332
1337
                        tx_data_only = 1;
1333
1338
        }
1334
1339
 
1619
1624
 
1620
1625
static u32      jittercount; /* counter for jitter check */
1621
1626
struct timer_list dsp_spl_tl;
1622
 
u32     dsp_spl_jiffies; /* calculate the next time to fire */
 
1627
unsigned long   dsp_spl_jiffies; /* calculate the next time to fire */
1623
1628
static u16      dsp_count; /* last sample count */
1624
1629
static int      dsp_count_valid; /* if we have last sample count */
1625
1630