← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/media/video/msp3400-driver.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:
drivers/media/video/msp3400-driver.c
69
69
/* module parameters */
70
70
static int opmode   = OPMODE_AUTO;
71
71
int msp_debug;           /* msp_debug output */
72
 
int msp_once;            /* no continous stereo monitoring */
 
72
int msp_once;            /* no continuous stereo monitoring */
73
73
int msp_amsound;         /* hard-wire AM sound at 6.5 Hz (france),
74
74
                            the autoscan seems work well only with FM... */
75
75
int msp_standard = 1;    /* Override auto detect of audio msp_standard,
96
96
MODULE_PARM_DESC(stereo_threshold, "Sets signal threshold to activate stereo");
97
97
MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Default: Autodetect");
98
98
MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan");
99
 
MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
 
99
MODULE_PARM_DESC(dolby, "Activates Dolby processing");
100
100
 
101
101
/* ---------------------------------------------------------------------- */
102
102
 
480
480
        struct msp_state *state = to_state(sd);
481
481
        struct i2c_client *client = v4l2_get_subdevdata(sd);
482
482
 
483
 
        if (state->radio)
 
483
        if (vt->type != V4L2_TUNER_ANALOG_TV)
484
484
                return 0;
485
 
        if (state->opmode == OPMODE_AUTOSELECT)
486
 
                msp_detect_stereo(client);
487
 
        vt->audmode    = state->audmode;
488
 
        vt->rxsubchans = state->rxsubchans;
 
485
        if (!state->radio) {
 
486
                if (state->opmode == OPMODE_AUTOSELECT)
 
487
                        msp_detect_stereo(client);
 
488
                vt->rxsubchans = state->rxsubchans;
 
489
        }
 
490
        vt->audmode = state->audmode;
489
491
        vt->capability |= V4L2_TUNER_CAP_STEREO |
490
492
                V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
491
493
        return 0;
551
553
        switch (state->mode) {
552
554
                case MSP_MODE_AM_DETECT: p = "AM (for carrier detect)"; break;
553
555
                case MSP_MODE_FM_RADIO: p = "FM Radio"; break;
554
 
                case MSP_MODE_FM_TERRA: p = "Terrestial FM-mono/stereo"; break;
 
556
                case MSP_MODE_FM_TERRA: p = "Terrestrial FM-mono/stereo"; break;
555
557
                case MSP_MODE_FM_SAT: p = "Satellite FM-mono"; break;
556
558
                case MSP_MODE_FM_NICAM1: p = "NICAM/FM (B/G, D/K)"; break;
557
559
                case MSP_MODE_FM_NICAM2: p = "NICAM/FM (I)"; break;