Skip to content

L
linux
Commit 82642f64 authored by Gerd Knorr's avatar Gerd Knorr Committed by Linus Torvalds
Browse files
Options

[PATCH] v4l: msp3400 update 

This is a update for the msp3400 module.  Changes:

 * switch over to 2.6-ish insmod options.
 * use kthread for thread management.
 * add support for v4l2 audio ioctls.
 * merge a number of changes from the ivtv project.
 * add suspend/resume functions.

The patch also removes all trailing whitespaces.  I've a script to remove them
from my sources now, that should kill those no-op whitespace changes in my
patches after merging this initial cleanup.
Signed-off-by: default avatarGerd Knorr <kraxel@bytesex.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 92c34511
Show whitespace changes
Inline Side-by-side
Showing with 690 additions and 372 deletions
drivers/media/video/msp3400.c
View file @ 82642f64
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
#include <linux/videodev.h> #include <linux/videodev.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/kthread.h>
#include <linux/suspend.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -54,54 +56,53 @@ ...@@ -54,54 +56,53 @@
#include <media/id.h> #include <media/id.h>
#include "msp3400.h" #include "msp3400.h"
#define OPMODE_AUTO -1
#define OPMODE_MANUAL 0
#define OPMODE_SIMPLE 1 /* use short programming (>= msp3410 only) */
#define OPMODE_SIMPLER 2 /* use shorter programming (>= msp34xxG) */
/* insmod parameters */ /* insmod parameters */
static int opmode = OPMODE_AUTO;
static int debug = 0; /* debug output */ static int debug = 0; /* debug output */
static int once = 0; /* no continous stereo monitoring */ static int once = 0; /* no continous stereo monitoring */
static int amsound = 0; /* hard-wire AM sound at 6.5 Hz (france), static int amsound = 0; /* hard-wire AM sound at 6.5 Hz (france),
the autoscan seems work well only with FM... */ the autoscan seems work well only with FM... */
static int simple = -1; /* use short programming (>= msp3410 only) */ static int standard = 1; /* Override auto detect of audio standard, if needed. */
static int dolby = 0; static int dolby = 0;
#define DFP_COUNT 0x41 static int stereo_threshold = 0x190; /* a2 threshold for stereo/bilingual
static const int bl_dfp[] = { (msp34xxg only) 0x00a0-0x03c0 */
0x00, 0x01, 0x02, 0x03, 0x06, 0x08, 0x09, 0x0a,
0x0b, 0x0d, 0x0e, 0x10
};
struct msp3400c { struct msp3400c {
int rev1,rev2; int rev1,rev2;
int simple; int opmode;
int mode; int mode;
int norm; int norm;
int stereo;
int nicam_on; int nicam_on;
int acb; int acb;
int main, second; /* sound carrier */ int main, second; /* sound carrier */
int input; int input;
int source; /* see msp34xxg_set_source */
/* v4l2 */
int audmode;
int rxsubchans;
int muted; int muted;
int volume, balance; int volume, balance;
int bass, treble; int bass, treble;
/* shadow register set */
int dfp_regs[DFP_COUNT];
/* thread */ /* thread */
pid_t tpid; struct task_struct *kthread;
struct completion texit;
wait_queue_head_t wq; wait_queue_head_t wq;
int active:1;
int restart:1; int restart:1;
int rmmod:1; int watch_stereo:1;
int watch_stereo;
struct timer_list wake_stereo;
}; };
#define HAVE_NICAM(msp) (((msp->rev2>>8) & 0xff) != 00) #define HAVE_NICAM(msp) (((msp->rev2>>8) & 0xff) != 00)
#define HAVE_SIMPLE(msp) ((msp->rev1 & 0xff) >= 'D'-'@') #define HAVE_SIMPLE(msp) ((msp->rev1 & 0xff) >= 'D'-'@')
#define HAVE_SIMPLER(msp) ((msp->rev1 & 0xff) >= 'G'-'@')
#define HAVE_RADIO(msp) ((msp->rev1 & 0xff) >= 'G'-'@') #define HAVE_RADIO(msp) ((msp->rev1 & 0xff) >= 'G'-'@')
#define VIDEO_MODE_RADIO 16 /* norm magic for radio mode */ #define VIDEO_MODE_RADIO 16 /* norm magic for radio mode */
...@@ -111,11 +112,21 @@ struct msp3400c { ...@@ -111,11 +112,21 @@ struct msp3400c {
#define dprintk if (debug >= 1) printk #define dprintk if (debug >= 1) printk
#define d2printk if (debug >= 2) printk #define d2printk if (debug >= 2) printk
MODULE_PARM(once,"i"); /* read-only */
MODULE_PARM(debug,"i"); module_param(opmode, int, 0444);
MODULE_PARM(simple,"i");
MODULE_PARM(amsound,"i"); /* read-write */
MODULE_PARM(dolby,"i"); module_param(once, int, 0644);
module_param(debug, int, 0644);
module_param(stereo_threshold, int, 0644);
module_param(standard, int, 0644);
module_param(amsound, int, 0644);
module_param(dolby, int, 0644);
MODULE_PARM_DESC(once, "No continuous stereo monitoring");
MODULE_PARM_DESC(debug, "Enable debug messages");
MODULE_PARM_DESC(standard, "Specify audio standard: 32 = NTSC, 64 = radio, Default: Autodetect");
MODULE_PARM_DESC(amsound, "Hardwire AM sound at 6.5Hz (France), FM can autoscan");
MODULE_DESCRIPTION("device driver for msp34xx TV sound processor"); MODULE_DESCRIPTION("device driver for msp34xx TV sound processor");
MODULE_AUTHOR("Gerd Knorr"); MODULE_AUTHOR("Gerd Knorr");
...@@ -141,10 +152,6 @@ I2C_CLIENT_INSMOD; ...@@ -141,10 +152,6 @@ I2C_CLIENT_INSMOD;
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* functions for talking to the MSP3400C Sound processor */ /* functions for talking to the MSP3400C Sound processor */
#ifndef I2C_M_IGNORE_NAK
# define I2C_M_IGNORE_NAK 0x1000
#endif
static int msp3400c_reset(struct i2c_client *client) static int msp3400c_reset(struct i2c_client *client)
{ {
/* reset and read revision code */ /* reset and read revision code */
...@@ -329,16 +336,6 @@ static struct CARRIER_DETECT carrier_detect_65[] = { ...@@ -329,16 +336,6 @@ static struct CARRIER_DETECT carrier_detect_65[] = {
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
#define SCART_MASK 0
#define SCART_IN1 1
#define SCART_IN2 2
#define SCART_IN1_DA 3
#define SCART_IN2_DA 4
#define SCART_IN3 5
#define SCART_IN4 6
#define SCART_MONO 7
#define SCART_MUTE 8
static int scarts[3][9] = { static int scarts[3][9] = {
/* MASK IN1 IN2 IN1_DA IN2_DA IN3 IN4 MONO MUTE */ /* MASK IN1 IN2 IN1_DA IN2_DA IN3 IN4 MONO MUTE */
{ 0x0320, 0x0000, 0x0200, -1, -1, 0x0300, 0x0020, 0x0100, 0x0320 }, { 0x0320, 0x0000, 0x0200, -1, -1, 0x0300, 0x0020, 0x0100, 0x0320 },
...@@ -392,8 +389,8 @@ static void msp3400c_setvolume(struct i2c_client *client, ...@@ -392,8 +389,8 @@ static void msp3400c_setvolume(struct i2c_client *client,
muted ? "on" : "off", volume, balance, val>>8, bal); muted ? "on" : "off", volume, balance, val>>8, bal);
msp3400c_write(client,I2C_MSP3400C_DFP, 0x0000, val); /* loudspeaker */ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0000, val); /* loudspeaker */
msp3400c_write(client,I2C_MSP3400C_DFP, 0x0006, val); /* headphones */ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0006, val); /* headphones */
/* scart - on/off only */ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0007,
msp3400c_write(client,I2C_MSP3400C_DFP, 0x0007, val ? 0x4000 : 0); muted ? 0x01 : (val | 0x01));
msp3400c_write(client,I2C_MSP3400C_DFP, 0x0001, bal << 8); msp3400c_write(client,I2C_MSP3400C_DFP, 0x0001, bal << 8);
} }
...@@ -420,7 +417,8 @@ static void msp3400c_setmode(struct i2c_client *client, int type) ...@@ -420,7 +417,8 @@ static void msp3400c_setmode(struct i2c_client *client, int type)
dprintk(KERN_DEBUG "msp3400: setmode: %d\n",type); dprintk(KERN_DEBUG "msp3400: setmode: %d\n",type);
msp->mode = type; msp->mode = type;
msp->stereo = VIDEO_SOUND_MONO; msp->audmode = V4L2_TUNER_MODE_MONO;
msp->rxsubchans = V4L2_TUNER_SUB_MONO;
msp3400c_write(client,I2C_MSP3400C_DEM, 0x00bb, /* ad_cv */ msp3400c_write(client,I2C_MSP3400C_DEM, 0x00bb, /* ad_cv */
msp_init_data[type].ad_cv); msp_init_data[type].ad_cv);
...@@ -470,51 +468,67 @@ static void msp3400c_setmode(struct i2c_client *client, int type) ...@@ -470,51 +468,67 @@ static void msp3400c_setmode(struct i2c_client *client, int type)
} }
} }
static int best_audio_mode(int rxsubchans)
{
if (rxsubchans & V4L2_TUNER_SUB_STEREO)
return V4L2_TUNER_MODE_STEREO;
if (rxsubchans & V4L2_TUNER_SUB_LANG1)
return V4L2_TUNER_MODE_LANG1;
if (rxsubchans & V4L2_TUNER_SUB_LANG2)
return V4L2_TUNER_MODE_LANG2;
return V4L2_TUNER_MODE_MONO;
}
/* turn on/off nicam + stereo */ /* turn on/off nicam + stereo */
static void msp3400c_setstereo(struct i2c_client *client, int mode) static void msp3400c_set_audmode(struct i2c_client *client, int audmode)
{ {
static char *strmode[16] = { static char *strmode[16] = {
#if __GNUC__ >= 3 #if __GNUC__ >= 3
[ 0 ... 15 ] = "invalid", [ 0 ... 15 ] = "invalid",
#endif #endif
[ VIDEO_SOUND_MONO ] = "mono", [ V4L2_TUNER_MODE_MONO ] = "mono",
[ VIDEO_SOUND_STEREO ] = "stereo", [ V4L2_TUNER_MODE_STEREO ] = "stereo",
[ VIDEO_SOUND_LANG1 ] = "lang1", [ V4L2_TUNER_MODE_LANG1 ] = "lang1",
[ VIDEO_SOUND_LANG2 ] = "lang2", [ V4L2_TUNER_MODE_LANG2 ] = "lang2",
}; };
struct msp3400c *msp = i2c_get_clientdata(client); struct msp3400c *msp = i2c_get_clientdata(client);
int nicam=0; /* channel source: FM/AM or nicam */ int nicam=0; /* channel source: FM/AM or nicam */
int src=0; int src=0;
BUG_ON(msp->opmode == OPMODE_SIMPLER);
msp->audmode = audmode;
/* switch demodulator */ /* switch demodulator */
switch (msp->mode) { switch (msp->mode) {
case MSP_MODE_FM_TERRA: case MSP_MODE_FM_TERRA:
dprintk(KERN_DEBUG "msp3400: FM setstereo: %s\n",strmode[mode]); dprintk(KERN_DEBUG "msp3400: FM setstereo: %s\n",
strmode[audmode]);
msp3400c_setcarrier(client,msp->second,msp->main); msp3400c_setcarrier(client,msp->second,msp->main);
switch (mode) { switch (audmode) {
case VIDEO_SOUND_STEREO: case V4L2_TUNER_MODE_STEREO:
msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3001); msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3001);
break; break;
case VIDEO_SOUND_MONO: case V4L2_TUNER_MODE_MONO:
case VIDEO_SOUND_LANG1: case V4L2_TUNER_MODE_LANG1:
case VIDEO_SOUND_LANG2: case V4L2_TUNER_MODE_LANG2:
msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3000); msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3000);
break; break;
} }
break; break;
case MSP_MODE_FM_SAT: case MSP_MODE_FM_SAT:
dprintk(KERN_DEBUG "msp3400: SAT setstereo: %s\n",strmode[mode]); dprintk(KERN_DEBUG "msp3400: SAT setstereo: %s\n",
switch (mode) { strmode[audmode]);
case VIDEO_SOUND_MONO: switch (audmode) {
case V4L2_TUNER_MODE_MONO:
msp3400c_setcarrier(client, MSP_CARRIER(6.5), MSP_CARRIER(6.5)); msp3400c_setcarrier(client, MSP_CARRIER(6.5), MSP_CARRIER(6.5));
break; break;
case VIDEO_SOUND_STEREO: case V4L2_TUNER_MODE_STEREO:
msp3400c_setcarrier(client, MSP_CARRIER(7.2), MSP_CARRIER(7.02)); msp3400c_setcarrier(client, MSP_CARRIER(7.2), MSP_CARRIER(7.02));
break; break;
case VIDEO_SOUND_LANG1: case V4L2_TUNER_MODE_LANG1:
msp3400c_setcarrier(client, MSP_CARRIER(7.38), MSP_CARRIER(7.02)); msp3400c_setcarrier(client, MSP_CARRIER(7.38), MSP_CARRIER(7.02));
break; break;
case VIDEO_SOUND_LANG2: case V4L2_TUNER_MODE_LANG2:
msp3400c_setcarrier(client, MSP_CARRIER(7.38), MSP_CARRIER(7.02)); msp3400c_setcarrier(client, MSP_CARRIER(7.38), MSP_CARRIER(7.02));
break; break;
} }
...@@ -522,21 +536,25 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode) ...@@ -522,21 +536,25 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode)
case MSP_MODE_FM_NICAM1: case MSP_MODE_FM_NICAM1:
case MSP_MODE_FM_NICAM2: case MSP_MODE_FM_NICAM2:
case MSP_MODE_AM_NICAM: case MSP_MODE_AM_NICAM:
dprintk(KERN_DEBUG "msp3400: NICAM setstereo: %s\n",strmode[mode]); dprintk(KERN_DEBUG "msp3400: NICAM setstereo: %s\n",
strmode[audmode]);
msp3400c_setcarrier(client,msp->second,msp->main); msp3400c_setcarrier(client,msp->second,msp->main);
if (msp->nicam_on) if (msp->nicam_on)
nicam=0x0100; nicam=0x0100;
break; break;
case MSP_MODE_BTSC: case MSP_MODE_BTSC:
dprintk(KERN_DEBUG "msp3400: BTSC setstereo: %s\n",strmode[mode]); dprintk(KERN_DEBUG "msp3400: BTSC setstereo: %s\n",
strmode[audmode]);
nicam=0x0300; nicam=0x0300;
break; break;
case MSP_MODE_EXTERN: case MSP_MODE_EXTERN:
dprintk(KERN_DEBUG "msp3400: extern setstereo: %s\n",strmode[mode]); dprintk(KERN_DEBUG "msp3400: extern setstereo: %s\n",
strmode[audmode]);
nicam = 0x0200; nicam = 0x0200;
break; break;
case MSP_MODE_FM_RADIO: case MSP_MODE_FM_RADIO:
dprintk(KERN_DEBUG "msp3400: FM-Radio setstereo: %s\n",strmode[mode]); dprintk(KERN_DEBUG "msp3400: FM-Radio setstereo: %s\n",
strmode[audmode]);
break; break;
default: default:
dprintk(KERN_DEBUG "msp3400: mono setstereo\n"); dprintk(KERN_DEBUG "msp3400: mono setstereo\n");
...@@ -544,15 +562,15 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode) ...@@ -544,15 +562,15 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode)
} }
/* switch audio */ /* switch audio */
switch (mode) { switch (audmode) {
case VIDEO_SOUND_STEREO: case V4L2_TUNER_MODE_STEREO:
src = 0x0020 | nicam; src = 0x0020 | nicam;
#if 0 #if 0
/* spatial effect */ /* spatial effect */
msp3400c_write(client,I2C_MSP3400C_DFP, 0x0005,0x4000); msp3400c_write(client,I2C_MSP3400C_DFP, 0x0005,0x4000);
#endif #endif
break; break;
case VIDEO_SOUND_MONO: case V4L2_TUNER_MODE_MONO:
if (msp->mode == MSP_MODE_AM_NICAM) { if (msp->mode == MSP_MODE_AM_NICAM) {
dprintk("msp3400: switching to AM mono\n"); dprintk("msp3400: switching to AM mono\n");
/* AM mono decoding is handled by tuner, not MSP chip */ /* AM mono decoding is handled by tuner, not MSP chip */
...@@ -561,10 +579,10 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode) ...@@ -561,10 +579,10 @@ static void msp3400c_setstereo(struct i2c_client *client, int mode)
src = 0x0200; src = 0x0200;
break; break;
} }
case VIDEO_SOUND_LANG1: case V4L2_TUNER_MODE_LANG1:
src = 0x0000 | nicam; src = 0x0000 | nicam;
break; break;
case VIDEO_SOUND_LANG2: case V4L2_TUNER_MODE_LANG2:
src = 0x0010 | nicam; src = 0x0010 | nicam;
break; break;
} }
...@@ -608,19 +626,6 @@ msp3400c_print_mode(struct msp3400c *msp) ...@@ -608,19 +626,6 @@ msp3400c_print_mode(struct msp3400c *msp)
} }
} }
static void
msp3400c_restore_dfp(struct i2c_client *client)
{
struct msp3400c *msp = i2c_get_clientdata(client);
int i;
for (i = 0; i < DFP_COUNT; i++) {
if (-1 == msp->dfp_regs[i])
continue;
msp3400c_write(client,I2C_MSP3400C_DFP, i, msp->dfp_regs[i]);
}
}
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
struct REGISTER_DUMP { struct REGISTER_DUMP {
...@@ -641,7 +646,7 @@ autodetect_stereo(struct i2c_client *client) ...@@ -641,7 +646,7 @@ autodetect_stereo(struct i2c_client *client)
{ {
struct msp3400c *msp = i2c_get_clientdata(client); struct msp3400c *msp = i2c_get_clientdata(client);
int val; int val;
int newstereo = msp->stereo; int rxsubchans = msp->rxsubchans;
int newnicam = msp->nicam_on; int newnicam = msp->nicam_on;
int update = 0; int update = 0;
...@@ -653,11 +658,11 @@ autodetect_stereo(struct i2c_client *client) ...@@ -653,11 +658,11 @@ autodetect_stereo(struct i2c_client *client)
dprintk(KERN_DEBUG dprintk(KERN_DEBUG
"msp34xx: stereo detect register: %d\n",val); "msp34xx: stereo detect register: %d\n",val);
if (val > 4096) { if (val > 4096) {
newstereo = VIDEO_SOUND_STEREO | VIDEO_SOUND_MONO; rxsubchans = V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
} else if (val < -4096) { } else if (val < -4096) {
newstereo = VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
} else { } else {
newstereo = VIDEO_SOUND_MONO; rxsubchans = V4L2_TUNER_SUB_MONO;
} }
newnicam = 0; newnicam = 0;
break; break;
...@@ -674,27 +679,27 @@ autodetect_stereo(struct i2c_client *client) ...@@ -674,27 +679,27 @@ autodetect_stereo(struct i2c_client *client)
switch ((val & 0x1e) >> 1) { switch ((val & 0x1e) >> 1) {
case 0: case 0:
case 8: case 8:
newstereo = VIDEO_SOUND_STEREO; rxsubchans = V4L2_TUNER_SUB_STEREO;
break; break;
case 1: case 1:
case 9: case 9:
newstereo = VIDEO_SOUND_MONO rxsubchans = V4L2_TUNER_SUB_MONO
| VIDEO_SOUND_LANG1; | V4L2_TUNER_SUB_LANG1;
break; break;
case 2: case 2:
case 10: case 10:
newstereo = VIDEO_SOUND_MONO rxsubchans = V4L2_TUNER_SUB_MONO
| VIDEO_SOUND_LANG1 | V4L2_TUNER_SUB_LANG1
| VIDEO_SOUND_LANG2; | V4L2_TUNER_SUB_LANG2;
break; break;
default: default:
newstereo = VIDEO_SOUND_MONO; rxsubchans = V4L2_TUNER_SUB_MONO;
break; break;
} }
newnicam=1; newnicam=1;
} else { } else {
newnicam = 0; newnicam = 0;
newstereo = VIDEO_SOUND_MONO; rxsubchans = V4L2_TUNER_SUB_MONO;
} }
break; break;
case MSP_MODE_BTSC: case MSP_MODE_BTSC:
...@@ -707,16 +712,16 @@ autodetect_stereo(struct i2c_client *client) ...@@ -707,16 +712,16 @@ autodetect_stereo(struct i2c_client *client)
(val & 0x0040) ? "stereo" : "mono", (val & 0x0040) ? "stereo" : "mono",
(val & 0x0080) ? ", nicam 2nd mono" : "", (val & 0x0080) ? ", nicam 2nd mono" : "",
(val & 0x0100) ? ", bilingual/SAP" : ""); (val & 0x0100) ? ", bilingual/SAP" : "");
newstereo = VIDEO_SOUND_MONO; rxsubchans = V4L2_TUNER_SUB_MONO;
if (val & 0x0040) newstereo |= VIDEO_SOUND_STEREO; if (val & 0x0040) rxsubchans |= V4L2_TUNER_SUB_STEREO;
if (val & 0x0100) newstereo |= VIDEO_SOUND_LANG1; if (val & 0x0100) rxsubchans |= V4L2_TUNER_SUB_LANG1;
break; break;
} }
if (newstereo != msp->stereo) { if (rxsubchans != msp->rxsubchans) {
update = 1; update = 1;
dprintk(KERN_DEBUG "msp34xx: watch: stereo %d => %d\n", dprintk(KERN_DEBUG "msp34xx: watch: rxsubchans %d => %d\n",
msp->stereo,newstereo); msp->rxsubchans,rxsubchans);
msp->stereo = newstereo; msp->rxsubchans = rxsubchans;
} }
if (newnicam != msp->nicam_on) { if (newnicam != msp->nicam_on) {
update = 1; update = 1;
...@@ -737,22 +742,24 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) ...@@ -737,22 +742,24 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
add_wait_queue(&msp->wq, &wait); add_wait_queue(&msp->wq, &wait);
if (!msp->rmmod) { if (!kthread_should_stop()) {
if (timeout < 0) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
if (timeout < 0)
schedule(); schedule();
else } else {
schedule_timeout(timeout); #if 0
/* hmm, that one doesn't return on wakeup ... */
msleep_interruptible(timeout);
#else
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(msecs_to_jiffies(timeout));
#endif
} }
}
if (current->flags & PF_FREEZE)
refrigerator(PF_FREEZE);
remove_wait_queue(&msp->wq, &wait); remove_wait_queue(&msp->wq, &wait);
return msp->rmmod || signal_pending(current); return msp->restart;
}
static void msp3400c_stereo_wake(unsigned long data)
{
struct msp3400c *msp = (struct msp3400c*)data; /* XXX alpha ??? */
wake_up_interruptible(&msp->wq);
} }
/* stereo/multilang monitoring */ /* stereo/multilang monitoring */
...@@ -760,53 +767,31 @@ static void watch_stereo(struct i2c_client *client) ...@@ -760,53 +767,31 @@ static void watch_stereo(struct i2c_client *client)
{ {
struct msp3400c *msp = i2c_get_clientdata(client); struct msp3400c *msp = i2c_get_clientdata(client);
if (autodetect_stereo(client)) { if (autodetect_stereo(client))
if (msp->stereo & VIDEO_SOUND_STEREO) msp3400c_set_audmode(client,best_audio_mode(msp->rxsubchans));
msp3400c_setstereo(client,VIDEO_SOUND_STEREO);
else if (msp->stereo & VIDEO_SOUND_LANG1)
msp3400c_setstereo(client,VIDEO_SOUND_LANG1);
else if (msp->stereo & VIDEO_SOUND_LANG2)
msp3400c_setstereo(client,VIDEO_SOUND_LANG2);
else
msp3400c_setstereo(client,VIDEO_SOUND_MONO);
}
if (once) if (once)
msp->watch_stereo = 0; msp->watch_stereo = 0;
if (msp->watch_stereo)
mod_timer(&msp->wake_stereo, jiffies+5*HZ);
} }
static int msp3400c_thread(void *data) static int msp3400c_thread(void *data)
{ {
struct i2c_client *client = data; struct i2c_client *client = data;
struct msp3400c *msp = i2c_get_clientdata(client); struct msp3400c *msp = i2c_get_clientdata(client);
struct CARRIER_DETECT *cd; struct CARRIER_DETECT *cd;
int count, max1,max2,val1,val2, val,this; int count, max1,max2,val1,val2, val,this;
daemonize("msp3400"); printk("msp3400: kthread started\n");
allow_signal(SIGTERM);
printk("msp3400: daemon started\n");
for (;;) { for (;;) {
d2printk("msp3400: thread: sleep\n"); d2printk("msp3400: thread: sleep\n");
if (msp34xx_sleep(msp,-1)) msp34xx_sleep(msp,-1);
goto done;
d2printk("msp3400: thread: wakeup\n"); d2printk("msp3400: thread: wakeup\n");
msp->active = 1;
if (msp->watch_stereo) {
watch_stereo(client);
msp->active = 0;
continue;
}
/* some time for the tuner to sync */
if (msp34xx_sleep(msp,HZ/5))
goto done;
restart: restart:
dprintk("msp3410: thread: restart scan\n");
msp->restart = 0;
if (kthread_should_stop())
break;
if (VIDEO_MODE_RADIO == msp->norm || if (VIDEO_MODE_RADIO == msp->norm ||
MSP_MODE_EXTERN == msp->mode) { MSP_MODE_EXTERN == msp->mode) {
/* no carrier scan, just unmute */ /* no carrier scan, just unmute */
...@@ -815,14 +800,18 @@ static int msp3400c_thread(void *data) ...@@ -815,14 +800,18 @@ static int msp3400c_thread(void *data)
msp->volume, msp->balance); msp->volume, msp->balance);
continue; continue;
} }
msp->restart = 0;
/* mute */
msp3400c_setvolume(client, msp->muted, 0, 0); msp3400c_setvolume(client, msp->muted, 0, 0);
msp3400c_setmode(client, MSP_MODE_AM_DETECT /* +1 */ ); msp3400c_setmode(client, MSP_MODE_AM_DETECT /* +1 */ );
val1 = val2 = 0; val1 = val2 = 0;
max1 = max2 = -1; max1 = max2 = -1;
del_timer(&msp->wake_stereo);
msp->watch_stereo = 0; msp->watch_stereo = 0;
/* some time for the tuner to sync */
if (msp34xx_sleep(msp,200))
goto restart;
/* carrier detect pass #1 -- main carrier */ /* carrier detect pass #1 -- main carrier */
cd = carrier_detect_main; count = CARRIER_COUNT(carrier_detect_main); cd = carrier_detect_main; count = CARRIER_COUNT(carrier_detect_main);
...@@ -835,12 +824,8 @@ static int msp3400c_thread(void *data) ...@@ -835,12 +824,8 @@ static int msp3400c_thread(void *data)
for (this = 0; this < count; this++) { for (this = 0; this < count; this++) {
msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo); msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo);
if (msp34xx_sleep(msp,100))
if (msp34xx_sleep(msp,HZ/10)) goto restart;
goto done;
if (msp->restart)
msp->restart = 0;
val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b); val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b);
if (val > 32767) if (val > 32767)
val -= 65536; val -= 65536;
...@@ -852,10 +837,12 @@ static int msp3400c_thread(void *data) ...@@ -852,10 +837,12 @@ static int msp3400c_thread(void *data)
/* carrier detect pass #2 -- second (stereo) carrier */ /* carrier detect pass #2 -- second (stereo) carrier */
switch (max1) { switch (max1) {
case 1: /* 5.5 */ case 1: /* 5.5 */
cd = carrier_detect_55; count = CARRIER_COUNT(carrier_detect_55); cd = carrier_detect_55;
count = CARRIER_COUNT(carrier_detect_55);
break; break;
case 3: /* 6.5 */ case 3: /* 6.5 */
cd = carrier_detect_65; count = CARRIER_COUNT(carrier_detect_65); cd = carrier_detect_65;
count = CARRIER_COUNT(carrier_detect_65);
break; break;
case 0: /* 4.5 */ case 0: /* 4.5 */
case 2: /* 6.0 */ case 2: /* 6.0 */
...@@ -870,12 +857,8 @@ static int msp3400c_thread(void *data) ...@@ -870,12 +857,8 @@ static int msp3400c_thread(void *data)
} }
for (this = 0; this < count; this++) { for (this = 0; this < count; this++) {
msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo); msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo);
if (msp34xx_sleep(msp,100))
if (msp34xx_sleep(msp,HZ/10))
goto done;
if (msp->restart)
goto restart; goto restart;
val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b); val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b);
if (val > 32767) if (val > 32767)
val -= 65536; val -= 65536;
...@@ -893,7 +876,7 @@ static int msp3400c_thread(void *data) ...@@ -893,7 +876,7 @@ static int msp3400c_thread(void *data)
msp->second = carrier_detect_55[max2].cdo; msp->second = carrier_detect_55[max2].cdo;
msp3400c_setmode(client, MSP_MODE_FM_TERRA); msp3400c_setmode(client, MSP_MODE_FM_TERRA);
msp->nicam_on = 0; msp->nicam_on = 0;
msp3400c_setstereo(client, VIDEO_SOUND_MONO); msp3400c_set_audmode(client, V4L2_TUNER_MODE_MONO);
msp->watch_stereo = 1; msp->watch_stereo = 1;
} else if (max2 == 1 && HAVE_NICAM(msp)) { } else if (max2 == 1 && HAVE_NICAM(msp)) {
/* B/G NICAM */ /* B/G NICAM */
...@@ -920,7 +903,7 @@ static int msp3400c_thread(void *data) ...@@ -920,7 +903,7 @@ static int msp3400c_thread(void *data)
msp->second = carrier_detect_65[max2].cdo; msp->second = carrier_detect_65[max2].cdo;
msp3400c_setmode(client, MSP_MODE_FM_TERRA); msp3400c_setmode(client, MSP_MODE_FM_TERRA);
msp->nicam_on = 0; msp->nicam_on = 0;
msp3400c_setstereo(client, VIDEO_SOUND_MONO); msp3400c_set_audmode(client, V4L2_TUNER_MODE_MONO);
msp->watch_stereo = 1; msp->watch_stereo = 1;
} else if (max2 == 0 && } else if (max2 == 0 &&
msp->norm == VIDEO_MODE_SECAM) { msp->norm == VIDEO_MODE_SECAM) {
...@@ -928,7 +911,7 @@ static int msp3400c_thread(void *data) ...@@ -928,7 +911,7 @@ static int msp3400c_thread(void *data)
msp->second = carrier_detect_65[max2].cdo; msp->second = carrier_detect_65[max2].cdo;
msp3400c_setmode(client, MSP_MODE_AM_NICAM); msp3400c_setmode(client, MSP_MODE_AM_NICAM);
msp->nicam_on = 0; msp->nicam_on = 0;
msp3400c_setstereo(client, VIDEO_SOUND_MONO); msp3400c_set_audmode(client, V4L2_TUNER_MODE_MONO);
msp3400c_setcarrier(client, msp->second, msp->main); msp3400c_setcarrier(client, msp->second, msp->main);
/* volume prescale for SCART (AM mono input) */ /* volume prescale for SCART (AM mono input) */
msp3400c_write(client,I2C_MSP3400C_DFP, 0x000d, 0x1900); msp3400c_write(client,I2C_MSP3400C_DFP, 0x000d, 0x1900);
...@@ -951,29 +934,26 @@ static int msp3400c_thread(void *data) ...@@ -951,29 +934,26 @@ static int msp3400c_thread(void *data)
msp3400c_setmode(client, MSP_MODE_FM_TERRA); msp3400c_setmode(client, MSP_MODE_FM_TERRA);
msp->nicam_on = 0; msp->nicam_on = 0;
msp3400c_setcarrier(client, msp->second, msp->main); msp3400c_setcarrier(client, msp->second, msp->main);
msp->stereo = VIDEO_SOUND_MONO; msp->rxsubchans = V4L2_TUNER_SUB_MONO;
msp3400c_setstereo(client, VIDEO_SOUND_MONO); msp3400c_set_audmode(client, V4L2_TUNER_MODE_MONO);
break; break;
} }
/* unmute + restore dfp registers */ /* unmute */
msp3400c_setvolume(client, msp->muted, msp3400c_setvolume(client, msp->muted,
msp->volume, msp->balance); msp->volume, msp->balance);
msp3400c_restore_dfp(client);
if (msp->watch_stereo)
mod_timer(&msp->wake_stereo, jiffies+5*HZ);
if (debug) if (debug)
msp3400c_print_mode(msp); msp3400c_print_mode(msp);
msp->active = 0; /* monitor tv audio mode */
while (msp->watch_stereo) {
if (msp34xx_sleep(msp,5000))
goto restart;
watch_stereo(client);
}
} }
done:
msp->active = 0;
dprintk(KERN_DEBUG "msp3400: thread: exit\n"); dprintk(KERN_DEBUG "msp3400: thread: exit\n");
complete_and_exit(&msp->texit, 0); return 0;
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
...@@ -1007,35 +987,67 @@ static struct MODES { ...@@ -1007,35 +987,67 @@ static struct MODES {
{ -1, 0, 0, NULL }, /* EOF */ { -1, 0, 0, NULL }, /* EOF */
}; };
static inline const char *msp34xx_standard_mode_name(int mode)
{
int i;
for (i = 0; modelist[i].name != NULL; i++)
if (modelist[i].retval == mode)
return modelist[i].name;
return "unknown";
}
static int msp34xx_modus(int norm)
{
switch (norm) {
case VIDEO_MODE_PAL:
return 0x1003;
case VIDEO_MODE_NTSC: /* BTSC */
return 0x2003;
case VIDEO_MODE_SECAM:
return 0x0003;
case VIDEO_MODE_RADIO:
return 0x0003;
case VIDEO_MODE_AUTO:
return 0x2003;
default:
return 0x0003;
}
}
static int msp34xx_standard(int norm)
{
switch (norm) {
case VIDEO_MODE_PAL:
return 1;
case VIDEO_MODE_NTSC: /* BTSC */
return 0x0020;
case VIDEO_MODE_SECAM:
return 1;
case VIDEO_MODE_RADIO:
return 0x0040;
default:
return 1;
}
}
static int msp3410d_thread(void *data) static int msp3410d_thread(void *data)
{ {
struct i2c_client *client = data; struct i2c_client *client = data;
struct msp3400c *msp = i2c_get_clientdata(client); struct msp3400c *msp = i2c_get_clientdata(client);
int mode,val,i,std; int mode,val,i,std;
daemonize("msp3410 [auto]");
allow_signal(SIGTERM);
printk("msp3410: daemon started\n"); printk("msp3410: daemon started\n");
for (;;) { for (;;) {
d2printk(KERN_DEBUG "msp3410: thread: sleep\n"); d2printk(KERN_DEBUG "msp3410: thread: sleep\n");
if (msp34xx_sleep(msp,-1)) msp34xx_sleep(msp,-1);
goto done;
d2printk(KERN_DEBUG "msp3410: thread: wakeup\n"); d2printk(KERN_DEBUG "msp3410: thread: wakeup\n");
msp->active = 1;
if (msp->watch_stereo) {
watch_stereo(client);
msp->active = 0;
continue;
}
/* some time for the tuner to sync */
if (msp34xx_sleep(msp,HZ/5))
goto done;
restart: restart:
dprintk("msp3410: thread: restart scan\n");
msp->restart = 0;
if (kthread_should_stop())
break;
if (msp->mode == MSP_MODE_EXTERN) { if (msp->mode == MSP_MODE_EXTERN) {
/* no carrier scan needed, just unmute */ /* no carrier scan needed, just unmute */
dprintk(KERN_DEBUG "msp3410: thread: no carrier scan\n"); dprintk(KERN_DEBUG "msp3410: thread: no carrier scan\n");
...@@ -1043,47 +1055,24 @@ static int msp3410d_thread(void *data) ...@@ -1043,47 +1055,24 @@ static int msp3410d_thread(void *data)
msp->volume, msp->balance); msp->volume, msp->balance);
continue; continue;
} }
msp->restart = 0;
del_timer(&msp->wake_stereo);
msp->watch_stereo = 0;
/* put into sane state (and mute) */ /* put into sane state (and mute) */
msp3400c_reset(client); msp3400c_reset(client);
/* some time for the tuner to sync */
if (msp34xx_sleep(msp,200))
goto restart;
/* start autodetect */ /* start autodetect */
switch (msp->norm) { mode = msp34xx_modus(msp->norm);
case VIDEO_MODE_PAL: std = msp34xx_standard(msp->norm);
mode = 0x1003;
std = 1;
break;
case VIDEO_MODE_NTSC: /* BTSC */
mode = 0x2003;
std = 0x0020;
break;
case VIDEO_MODE_SECAM:
mode = 0x0003;
std = 1;
break;
case VIDEO_MODE_RADIO:
mode = 0x0003;
std = 0x0040;
break;
default:
mode = 0x0003;
std = 1;
break;
}
msp3400c_write(client, I2C_MSP3400C_DEM, 0x30, mode); msp3400c_write(client, I2C_MSP3400C_DEM, 0x30, mode);
msp3400c_write(client, I2C_MSP3400C_DEM, 0x20, std); msp3400c_write(client, I2C_MSP3400C_DEM, 0x20, std);
msp->watch_stereo = 0;
if (debug) { if (debug)
int i;
for (i = 0; modelist[i].name != NULL; i++)
if (modelist[i].retval == std)
break;
printk(KERN_DEBUG "msp3410: setting mode: %s (0x%04x)\n", printk(KERN_DEBUG "msp3410: setting mode: %s (0x%04x)\n",
modelist[i].name ? modelist[i].name : "unknown",std); msp34xx_standard_mode_name(std) ,std);
}
if (std != 1) { if (std != 1) {
/* programmed some specific mode */ /* programmed some specific mode */
...@@ -1091,9 +1080,7 @@ static int msp3410d_thread(void *data) ...@@ -1091,9 +1080,7 @@ static int msp3410d_thread(void *data)
} else { } else {
/* triggered autodetect */ /* triggered autodetect */
for (;;) { for (;;) {
if (msp34xx_sleep(msp,HZ/10)) if (msp34xx_sleep(msp,100))
goto done;
if (msp->restart)
goto restart; goto restart;
/* check results */ /* check results */
...@@ -1135,29 +1122,30 @@ static int msp3410d_thread(void *data) ...@@ -1135,29 +1122,30 @@ static int msp3410d_thread(void *data)
else else
msp->mode = MSP_MODE_FM_NICAM2; msp->mode = MSP_MODE_FM_NICAM2;
/* just turn on stereo */ /* just turn on stereo */
msp->stereo = VIDEO_SOUND_STEREO; msp->rxsubchans = V4L2_TUNER_SUB_STEREO;
msp->nicam_on = 1; msp->nicam_on = 1;
msp->watch_stereo = 1; msp->watch_stereo = 1;
msp3400c_setstereo(client,VIDEO_SOUND_STEREO); msp3400c_set_audmode(client,V4L2_TUNER_MODE_STEREO);
break; break;
case 0x0009: case 0x0009:
msp->mode = MSP_MODE_AM_NICAM; msp->mode = MSP_MODE_AM_NICAM;
msp->stereo = VIDEO_SOUND_MONO; msp->rxsubchans = V4L2_TUNER_SUB_MONO;
msp->nicam_on = 1; msp->nicam_on = 1;
msp3400c_setstereo(client,VIDEO_SOUND_MONO); msp3400c_set_audmode(client,V4L2_TUNER_MODE_MONO);
msp->watch_stereo = 1; msp->watch_stereo = 1;
break; break;
case 0x0020: /* BTSC */ case 0x0020: /* BTSC */
/* just turn on stereo */ /* just turn on stereo */
msp->mode = MSP_MODE_BTSC; msp->mode = MSP_MODE_BTSC;
msp->stereo = VIDEO_SOUND_STEREO; msp->rxsubchans = V4L2_TUNER_SUB_STEREO;
msp->nicam_on = 0; msp->nicam_on = 0;
msp->watch_stereo = 1; msp->watch_stereo = 1;
msp3400c_setstereo(client,VIDEO_SOUND_STEREO); msp3400c_set_audmode(client,V4L2_TUNER_MODE_STEREO);
break; break;
case 0x0040: /* FM radio */ case 0x0040: /* FM radio */
msp->mode = MSP_MODE_FM_RADIO; msp->mode = MSP_MODE_FM_RADIO;
msp->stereo = VIDEO_SOUND_STEREO; msp->rxsubchans = V4L2_TUNER_SUB_STEREO;
msp->audmode = V4L2_TUNER_MODE_STEREO;
msp->nicam_on = 0; msp->nicam_on = 0;
msp->watch_stereo = 0; msp->watch_stereo = 0;
/* not needed in theory if HAVE_RADIO(), but /* not needed in theory if HAVE_RADIO(), but
...@@ -1183,32 +1171,251 @@ static int msp3410d_thread(void *data) ...@@ -1183,32 +1171,251 @@ static int msp3410d_thread(void *data)
case 0x0004: case 0x0004:
case 0x0005: case 0x0005:
msp->mode = MSP_MODE_FM_TERRA; msp->mode = MSP_MODE_FM_TERRA;
msp->stereo = VIDEO_SOUND_MONO; msp->rxsubchans = V4L2_TUNER_SUB_MONO;
msp->audmode = V4L2_TUNER_MODE_MONO;
msp->nicam_on = 0; msp->nicam_on = 0;
msp->watch_stereo = 1; msp->watch_stereo = 1;
break; break;
} }
/* unmute + restore dfp registers */ /* unmute, restore misc registers */
msp3400c_setbass(client, msp->bass); msp3400c_setbass(client, msp->bass);
msp3400c_settreble(client, msp->treble); msp3400c_settreble(client, msp->treble);
msp3400c_setvolume(client, msp->muted, msp3400c_setvolume(client, msp->muted,
msp->volume, msp->balance); msp->volume, msp->balance);
msp3400c_restore_dfp(client); msp3400c_write(client, I2C_MSP3400C_DFP, 0x0013, msp->acb);
/* monitor tv audio mode */
while (msp->watch_stereo) {
if (msp34xx_sleep(msp,5000))
goto restart;
watch_stereo(client);
}
}
dprintk(KERN_DEBUG "msp3410: thread: exit\n");
return 0;
}
/* ----------------------------------------------------------------------- */
/* msp34xxG + (simpler no-thread) */
/* this one uses both automatic standard detection and automatic sound */
/* select which are available in the newer G versions */
/* struct msp: only norm, acb and source are really used in this mode */
if (msp->watch_stereo) static void msp34xxg_set_source(struct i2c_client *client, int source);
mod_timer(&msp->wake_stereo, jiffies+HZ);
/* (re-)initialize the msp34xxg, according to the current norm in msp->norm
* return 0 if it worked, -1 if it failed
*/
static int msp34xxg_init(struct i2c_client *client)
{
struct msp3400c *msp = i2c_get_clientdata(client);
int modus;
if (msp3400c_reset(client))
return -1;
/* make sure that input/output is muted (paranoid mode) */
if (msp3400c_write(client,
I2C_MSP3400C_DFP,
0x13, /* ACB */
0x0f20 /* mute DSP input, mute SCART 1 */))
return -1;
/* step-by-step initialisation, as described in the manual */
modus = msp34xx_modus(msp->norm);
modus &= ~0x03; /* STATUS_CHANGE=0 */
modus |= 0x01; /* AUTOMATIC_SOUND_DETECTION=1 */
if (msp3400c_write(client,
I2C_MSP3400C_DEM,
0x30/*MODUS*/,
modus))
return -1;
/* write the dfps that may have an influence on
standard/audio autodetection right now */
msp34xxg_set_source(client, msp->source);
if (msp3400c_write(client, I2C_MSP3400C_DFP,
0x0e, /* AM/FM Prescale */
0x3000 /* default: [15:8] 75khz deviation */))
return -1;
if (msp3400c_write(client, I2C_MSP3400C_DFP,
0x10, /* NICAM Prescale */
0x5a00 /* default: 9db gain (as recommended) */))
return -1;
if (msp3400c_write(client,
I2C_MSP3400C_DEM,
0x20, /* STANDARD SELECT */
standard /* default: 0x01 for automatic standard select*/))
return -1;
return 0;
}
msp->active = 0; static int msp34xxg_thread(void *data)
{
struct i2c_client *client = data;
struct msp3400c *msp = i2c_get_clientdata(client);
int val, std, i;
printk("msp34xxg: daemon started\n");
for (;;) {
d2printk(KERN_DEBUG "msp34xxg: thread: sleep\n");
msp34xx_sleep(msp,-1);
d2printk(KERN_DEBUG "msp34xxg: thread: wakeup\n");
restart:
dprintk("msp34xxg: thread: restart scan\n");
msp->restart = 0;
if (kthread_should_stop())
break;
/* setup the chip*/
msp34xxg_init(client);
std = standard;
if (std != 0x01)
goto unmute;
/* watch autodetect */
dprintk("msp34xxg: triggered autodetect, waiting for result\n");
for (i = 0; i < 10; i++) {
if (msp34xx_sleep(msp,100))
goto restart;
/* check results */
val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x7e);
if (val < 0x07ff) {
std = val;
break;
}
dprintk("msp34xxg: detection still in progress\n");
}
if (0x01 == std) {
dprintk("msp34xxg: detection still in progress after 10 tries. giving up.\n");
continue;
} }
done: unmute:
msp->active = 0; dprintk("msp34xxg: current mode: %s (0x%04x)\n",
dprintk(KERN_DEBUG "msp3410: thread: exit\n"); msp34xx_standard_mode_name(std), std);
complete_and_exit(&msp->texit, 0);
/* unmute: dispatch sound to scart output, set scart volume */
dprintk("msp34xxg: unmute\n");
msp3400c_setbass(client, msp->bass);
msp3400c_settreble(client, msp->treble);
msp3400c_setvolume(client, msp->muted, msp->volume, msp->balance);
/* restore ACB */
if (msp3400c_write(client,
I2C_MSP3400C_DFP,
0x13, /* ACB */
msp->acb))
return -1;
}
dprintk(KERN_DEBUG "msp34xxg: thread: exit\n");
return 0; return 0;
} }
/* set the same 'source' for the loudspeaker, scart and quasi-peak detector
* the value for source is the same as bit 15:8 of DFP registers 0x08,
* 0x0a and 0x0c: 0=mono, 1=stereo or A|B, 2=SCART, 3=stereo or A, 4=stereo or B
*
* this function replaces msp3400c_setstereo
*/
static void msp34xxg_set_source(struct i2c_client *client, int source)
{
struct msp3400c *msp = i2c_get_clientdata(client);
/* fix matrix mode to stereo and let the msp choose what
* to output according to 'source', as recommended
*/
int value = (source&0x07)<<8|(source==0 ? 0x00:0x20);
dprintk("msp34xxg: set source to %d (0x%x)\n", source, value);
msp3400c_write(client,
I2C_MSP3400C_DFP,
0x08, /* Loudspeaker Output */
value);
msp3400c_write(client,
I2C_MSP3400C_DFP,
0x0a, /* SCART1 DA Output */
value);
msp3400c_write(client,
I2C_MSP3400C_DFP,
0x0c, /* Quasi-peak detector */
value);
/*
* set identification threshold. Personally, I
* I set it to a higher value that the default
* of 0x190 to ignore noisy stereo signals.
* this needs tuning. (recommended range 0x00a0-0x03c0)
* 0x7f0 = forced mono mode
*/
msp3400c_write(client,
I2C_MSP3400C_DEM,
0x22, /* a2 threshold for stereo/bilingual */
source==0 ? 0x7f0:stereo_threshold);
msp->source=source;
}
static void msp34xxg_detect_stereo(struct i2c_client *client)
{
struct msp3400c *msp = i2c_get_clientdata(client);
int status = msp3400c_read(client,
I2C_MSP3400C_DEM,
0x0200 /* STATUS */);
int is_bilingual = status&0x100;
int is_stereo = status&0x40;
msp->rxsubchans = 0;
if (is_stereo)
msp->rxsubchans |= V4L2_TUNER_SUB_STEREO;
else
msp->rxsubchans |= V4L2_TUNER_SUB_MONO;
if (is_bilingual) {
msp->rxsubchans |= V4L2_TUNER_SUB_LANG1|V4L2_TUNER_SUB_LANG2;
/* I'm supposed to check whether it's SAP or not
* and set only LANG2/SAP in this case. Yet, the MSP
* does a lot of work to hide this and handle everything
* the same way. I don't want to work around it so unless
* this is a problem, I'll handle SAP just like lang1/lang2.
*/
}
dprintk("msp34xxg: status=0x%x, stereo=%d, bilingual=%d -> rxsubchans=%d\n",
status, is_stereo, is_bilingual, msp->rxsubchans);
}
static void msp34xxg_set_audmode(struct i2c_client *client, int audmode)
{
struct msp3400c *msp = i2c_get_clientdata(client);
int source = 0;
switch (audmode) {
case V4L2_TUNER_MODE_MONO:
source=0; /* mono only */
break;
case V4L2_TUNER_MODE_STEREO:
source=1; /* stereo or A|B, see comment in msp34xxg_get_v4l2_stereo() */
/* problem: that could also mean 2 (scart input) */
break;
case V4L2_TUNER_MODE_LANG1:
source=3; /* stereo or A */
break;
case V4L2_TUNER_MODE_LANG2:
source=4; /* stereo or B */
break;
default: /* doing nothing: a safe, sane default */
audmode = 0;
return;
}
msp->audmode = audmode;
msp34xxg_set_source(client, source);
}
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static int msp_attach(struct i2c_adapter *adap, int addr, int kind); static int msp_attach(struct i2c_adapter *adap, int addr, int kind);
...@@ -1216,6 +1423,9 @@ static int msp_detach(struct i2c_client *client); ...@@ -1216,6 +1423,9 @@ static int msp_detach(struct i2c_client *client);
static int msp_probe(struct i2c_adapter *adap); static int msp_probe(struct i2c_adapter *adap);
static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
static int msp_suspend(struct device * dev, u32 state, u32 level);
static int msp_resume(struct device * dev, u32 level);
static struct i2c_driver driver = { static struct i2c_driver driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "i2c msp3400 driver", .name = "i2c msp3400 driver",
...@@ -1224,6 +1434,10 @@ static struct i2c_driver driver = { ...@@ -1224,6 +1434,10 @@ static struct i2c_driver driver = {
.attach_adapter = msp_probe, .attach_adapter = msp_probe,
.detach_client = msp_detach, .detach_client = msp_detach,
.command = msp_command, .command = msp_command,
.driver {
.suspend = msp_suspend,
.resume = msp_resume,
},
}; };
static struct i2c_client client_template = static struct i2c_client client_template =
...@@ -1237,7 +1451,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -1237,7 +1451,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
{ {
struct msp3400c *msp; struct msp3400c *msp;
struct i2c_client *c; struct i2c_client *c;
int i; int (*thread_func)(void *data) = NULL;
client_template.adapter = adap; client_template.adapter = adap;
client_template.addr = addr; client_template.addr = addr;
...@@ -1256,14 +1470,12 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -1256,14 +1470,12 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
} }
memset(msp,0,sizeof(struct msp3400c)); memset(msp,0,sizeof(struct msp3400c));
msp->volume = 65535; msp->volume = 58880; /* 0db gain */
msp->balance = 32768; msp->balance = 32768;
msp->bass = 32768; msp->bass = 32768;
msp->treble = 32768; msp->treble = 32768;
msp->input = -1; msp->input = -1;
msp->muted = 1; msp->muted = 1;
for (i = 0; i < DFP_COUNT; i++)
msp->dfp_regs[i] = -1;
i2c_set_clientdata(c, msp); i2c_set_clientdata(c, msp);
init_waitqueue_head(&msp->wq); init_waitqueue_head(&msp->wq);
...@@ -1295,36 +1507,51 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -1295,36 +1507,51 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
(msp->rev2>>8)&0xff, (msp->rev1&0xff)+'@', (msp->rev2>>8)&0xff, (msp->rev1&0xff)+'@',
((msp->rev1>>8)&0xff)+'@', msp->rev2&0x1f); ((msp->rev1>>8)&0xff)+'@', msp->rev2&0x1f);
if (simple == -1) { msp->opmode = opmode;
/* default mode */ if (OPMODE_AUTO == msp->opmode) {
msp->simple = HAVE_SIMPLE(msp); if (HAVE_SIMPLER(msp))
} else { msp->opmode = OPMODE_SIMPLER;
/* use insmod option */ else if (HAVE_SIMPLE(msp))
msp->simple = simple; msp->opmode = OPMODE_SIMPLE;
else
msp->opmode = OPMODE_MANUAL;
} }
/* timer for stereo checking */
init_timer(&msp->wake_stereo);
msp->wake_stereo.function = msp3400c_stereo_wake;
msp->wake_stereo.data = (unsigned long)msp;
/* hello world :-) */ /* hello world :-) */
printk(KERN_INFO "msp34xx: init: chip=%s",i2c_clientname(c)); printk(KERN_INFO "msp34xx: init: chip=%s",i2c_clientname(c));
if (HAVE_NICAM(msp)) if (HAVE_NICAM(msp))
printk(" +nicam"); printk(" +nicam");
if (HAVE_SIMPLE(msp)) if (HAVE_SIMPLE(msp))
printk(" +simple"); printk(" +simple");
if (HAVE_SIMPLER(msp))
printk(" +simpler");
if (HAVE_RADIO(msp)) if (HAVE_RADIO(msp))
printk(" +radio"); printk(" +radio");
/* version-specific initialization */
switch (msp->opmode) {
case OPMODE_MANUAL:
printk(" mode=manual");
thread_func = msp3400c_thread;
break;
case OPMODE_SIMPLE:
printk(" mode=simple");
thread_func = msp3410d_thread;
break;
case OPMODE_SIMPLER:
printk(" mode=simpler");
thread_func = msp34xxg_thread;
break;
}
printk("\n"); printk("\n");
/* startup control thread */ /* startup control thread if needed */
init_completion(&msp->texit); if (thread_func) {
msp->tpid = kernel_thread(msp->simple ? msp3410d_thread : msp3400c_thread, msp->kthread = kthread_run(thread_func, c, "msp34xx");
(void *)c, 0); if (NULL == msp->kthread)
if (msp->tpid < 0)
printk(KERN_WARNING "msp34xx: kernel_thread() failed\n"); printk(KERN_WARNING "msp34xx: kernel_thread() failed\n");
wake_up_interruptible(&msp->wq); wake_up_interruptible(&msp->wq);
}
/* done */ /* done */
i2c_attach_client(c); i2c_attach_client(c);
...@@ -1336,11 +1563,9 @@ static int msp_detach(struct i2c_client *client) ...@@ -1336,11 +1563,9 @@ static int msp_detach(struct i2c_client *client)
struct msp3400c *msp = i2c_get_clientdata(client); struct msp3400c *msp = i2c_get_clientdata(client);
/* shutdown control thread */ /* shutdown control thread */
del_timer_sync(&msp->wake_stereo); if (msp->kthread >= 0) {
if (msp->tpid >= 0) { msp->restart = 1;
msp->rmmod = 1; kthread_stop(msp->kthread);
wake_up_interruptible(&msp->wq);
wait_for_completion(&msp->texit);
} }
msp3400c_reset(client); msp3400c_reset(client);
...@@ -1352,18 +1577,8 @@ static int msp_detach(struct i2c_client *client) ...@@ -1352,18 +1577,8 @@ static int msp_detach(struct i2c_client *client)
static int msp_probe(struct i2c_adapter *adap) static int msp_probe(struct i2c_adapter *adap)
{ {
#ifdef I2C_CLASS_TV_ANALOG
if (adap->class & I2C_CLASS_TV_ANALOG) if (adap->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adap, &addr_data, msp_attach); return i2c_probe(adap, &addr_data, msp_attach);
#else
switch (adap->id) {
case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3:
case I2C_ALGO_BIT | I2C_HW_B_BT848:
//case I2C_ALGO_SAA7134:
return i2c_probe(adap, &addr_data, msp_attach);
break;
}
#endif
return 0; return 0;
} }
...@@ -1371,14 +1586,73 @@ static void msp_wake_thread(struct i2c_client *client) ...@@ -1371,14 +1586,73 @@ static void msp_wake_thread(struct i2c_client *client)
{ {
struct msp3400c *msp = i2c_get_clientdata(client); struct msp3400c *msp = i2c_get_clientdata(client);
if (NULL == msp->kthread)
return;
msp3400c_setvolume(client,msp->muted,0,0); msp3400c_setvolume(client,msp->muted,0,0);
msp->watch_stereo=0; msp->watch_stereo = 0;
del_timer(&msp->wake_stereo);
if (msp->active)
msp->restart = 1; msp->restart = 1;
wake_up_interruptible(&msp->wq); wake_up_interruptible(&msp->wq);
} }
/* ----------------------------------------------------------------------- */
static int mode_v4l2_to_v4l1(int rxsubchans)
{
int mode = 0;
if (rxsubchans & V4L2_TUNER_SUB_STEREO)
mode |= VIDEO_SOUND_STEREO;
if (rxsubchans & V4L2_TUNER_SUB_LANG2)
mode |= VIDEO_SOUND_LANG2;
if (rxsubchans & V4L2_TUNER_SUB_LANG1)
mode |= VIDEO_SOUND_LANG1;
if (0 == mode)
mode |= VIDEO_SOUND_MONO;
return mode;
}
static int mode_v4l1_to_v4l2(int mode)
{
if (mode & VIDEO_SOUND_STEREO)
return V4L2_TUNER_MODE_STEREO;
if (mode & VIDEO_SOUND_LANG2)
return V4L2_TUNER_MODE_LANG2;
if (mode & VIDEO_SOUND_LANG1)
return V4L2_TUNER_MODE_LANG1;
return V4L2_TUNER_MODE_MONO;
}
static void msp_any_detect_stereo(struct i2c_client *client)
{
struct msp3400c *msp = i2c_get_clientdata(client);
switch (msp->opmode) {
case OPMODE_MANUAL:
case OPMODE_SIMPLE:
autodetect_stereo(client);
break;
case OPMODE_SIMPLER:
msp34xxg_detect_stereo(client);
break;
}
}
static void msp_any_set_audmode(struct i2c_client *client, int audmode)
{
struct msp3400c *msp = i2c_get_clientdata(client);
switch (msp->opmode) {
case OPMODE_MANUAL:
case OPMODE_SIMPLE:
msp->watch_stereo = 0;
msp3400c_set_audmode(client, audmode);
break;
case OPMODE_SIMPLER:
msp34xxg_set_audmode(client, audmode);
break;
}
}
static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
{ {
struct msp3400c *msp = i2c_get_clientdata(client); struct msp3400c *msp = i2c_get_clientdata(client);
...@@ -1410,7 +1684,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -1410,7 +1684,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
break; break;
case AUDIO_TUNER: case AUDIO_TUNER:
msp->mode = -1; msp->mode = -1;
msp_wake_thread(client);
break; break;
default: default:
if (*sarg & AUDIO_MUTE) if (*sarg & AUDIO_MUTE)
...@@ -1418,62 +1691,37 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -1418,62 +1691,37 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
break; break;
} }
if (scart) { if (scart) {
msp->stereo = VIDEO_SOUND_STEREO; msp->rxsubchans = V4L2_TUNER_SUB_STEREO;
msp->audmode = V4L2_TUNER_MODE_STEREO;
msp3400c_set_scart(client,scart,0); msp3400c_set_scart(client,scart,0);
msp3400c_write(client,I2C_MSP3400C_DFP,0x000d,0x1900); msp3400c_write(client,I2C_MSP3400C_DFP,0x000d,0x1900);
msp3400c_setstereo(client,msp->stereo); if (msp->opmode != OPMODE_SIMPLER)
msp3400c_set_audmode(client, msp->audmode);
} }
if (msp->active) msp_wake_thread(client);
msp->restart = 1;
break; break;
case AUDC_SET_RADIO: case AUDC_SET_RADIO:
dprintk(KERN_DEBUG "msp34xx: AUDC_SET_RADIO\n"); dprintk(KERN_DEBUG "msp34xx: AUDC_SET_RADIO\n");
msp->norm = VIDEO_MODE_RADIO; msp->norm = VIDEO_MODE_RADIO;
msp->watch_stereo=0;
del_timer(&msp->wake_stereo);
dprintk(KERN_DEBUG "msp34xx: switching to radio mode\n"); dprintk(KERN_DEBUG "msp34xx: switching to radio mode\n");
if (msp->simple) { msp->watch_stereo = 0;
/* the thread will do for us */ switch (msp->opmode) {
msp_wake_thread(client); case OPMODE_MANUAL:
} else {
/* set msp3400 to FM radio mode */ /* set msp3400 to FM radio mode */
msp3400c_setmode(client,MSP_MODE_FM_RADIO); msp3400c_setmode(client,MSP_MODE_FM_RADIO);
msp3400c_setcarrier(client, MSP_CARRIER(10.7), msp3400c_setcarrier(client, MSP_CARRIER(10.7),
MSP_CARRIER(10.7)); MSP_CARRIER(10.7));
msp3400c_setvolume(client, msp->muted, msp3400c_setvolume(client, msp->muted,
msp->volume, msp->balance); msp->volume, msp->balance);
}
if (msp->active)
msp->restart = 1;
break; break;
case OPMODE_SIMPLE:
#if 1 case OPMODE_SIMPLER:
/* work-in-progress: hook to control the DFP registers */ /* the thread will do for us */
case MSP_SET_DFPREG: msp_wake_thread(client);
{ break;
struct msp_dfpreg *r = arg;
unsigned int i;
if (r->reg < 0 || r->reg >= DFP_COUNT)
return -EINVAL;
for (i = 0; i < ARRAY_SIZE(bl_dfp); i++)
if (r->reg == bl_dfp[i])
return -EINVAL;
msp->dfp_regs[r->reg] = r->value;
msp3400c_write(client,I2C_MSP3400C_DFP,r->reg,r->value);
return 0;
}
case MSP_GET_DFPREG:
{
struct msp_dfpreg *r = arg;
if (r->reg < 0 || r->reg >= DFP_COUNT)
return -EINVAL;
r->value = msp3400c_read(client,I2C_MSP3400C_DFP,r->reg);
return 0;
} }
#endif break;
/* --- v4l ioctls --- */ /* --- v4l ioctls --- */
/* take care: bttv does userspace copying, we'll get a /* take care: bttv does userspace copying, we'll get a
...@@ -1495,10 +1743,8 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -1495,10 +1743,8 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
va->bass = msp->bass; va->bass = msp->bass;
va->treble = msp->treble; va->treble = msp->treble;
if (msp->norm != VIDEO_MODE_RADIO) { msp_any_detect_stereo(client);
autodetect_stereo(client); va->mode = mode_v4l2_to_v4l1(msp->rxsubchans);
va->mode = msp->stereo;
}
break; break;
} }
case VIDIOCSAUDIO: case VIDIOCSAUDIO:
...@@ -1517,12 +1763,8 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -1517,12 +1763,8 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
msp3400c_setbass(client,msp->bass); msp3400c_setbass(client,msp->bass);
msp3400c_settreble(client,msp->treble); msp3400c_settreble(client,msp->treble);
if (va->mode != 0 && msp->norm != VIDEO_MODE_RADIO) { if (va->mode != 0 && msp->norm != VIDEO_MODE_RADIO)
msp->watch_stereo=0; msp_any_set_audmode(client,mode_v4l1_to_v4l2(va->mode));
del_timer(&msp->wake_stereo);
msp->stereo = va->mode & 0x0f;
msp3400c_setstereo(client,va->mode & 0x0f);
}
break; break;
} }
case VIDIOCSCHAN: case VIDIOCSCHAN:
...@@ -1531,9 +1773,12 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -1531,9 +1773,12 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
dprintk(KERN_DEBUG "msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm); dprintk(KERN_DEBUG "msp34xx: VIDIOCSCHAN (norm=%d)\n",vc->norm);
msp->norm = vc->norm; msp->norm = vc->norm;
msp_wake_thread(client);
break; break;
} }
case VIDIOCSFREQ: case VIDIOCSFREQ:
case VIDIOC_S_FREQUENCY:
{ {
/* new channel -- kick audio carrier scan */ /* new channel -- kick audio carrier scan */
dprintk(KERN_DEBUG "msp34xx: VIDIOCSFREQ\n"); dprintk(KERN_DEBUG "msp34xx: VIDIOCSFREQ\n");
...@@ -1541,6 +1786,39 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -1541,6 +1786,39 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
break; break;
} }
/* --- v4l2 ioctls --- */
case VIDIOC_G_TUNER:
{
struct v4l2_tuner *vt = arg;
msp_any_detect_stereo(client);
vt->audmode = msp->audmode;
vt->rxsubchans = msp->rxsubchans;
vt->capability = V4L2_TUNER_CAP_STEREO |
V4L2_TUNER_CAP_LANG1|
V4L2_TUNER_CAP_LANG2;
break;
}
case VIDIOC_S_TUNER:
{
struct v4l2_tuner *vt=(struct v4l2_tuner *)arg;
/* only set audmode */
if (vt->audmode != -1 && vt->audmode != 0)
msp_any_set_audmode(client, vt->audmode);
break;
}
/* msp34xx specific */
case MSP_SET_MATRIX:
{
struct msp_matrix *mspm = arg;
dprintk(KERN_DEBUG "msp34xx: MSP_SET_MATRIX\n");
msp3400c_set_scart(client, mspm->input, mspm->output);
break;
}
default: default:
/* nothing */ /* nothing */
break; break;
...@@ -1548,6 +1826,24 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) ...@@ -1548,6 +1826,24 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
return 0; return 0;
} }
static int msp_suspend(struct device * dev, u32 state, u32 level)
{
struct i2c_client *c = container_of(dev, struct i2c_client, dev);
dprintk("msp34xx: suspend\n");
msp3400c_reset(c);
return 0;
}
static int msp_resume(struct device * dev, u32 level)
{
struct i2c_client *c = container_of(dev, struct i2c_client, dev);
dprintk("msp34xx: resume\n");
msp_wake_thread(c);
return 0;
}
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static int __init msp3400_init_module(void) static int __init msp3400_init_module(void)
......
drivers/media/video/msp3400.h
View file @ 82642f64
...@@ -8,7 +8,29 @@ struct msp_dfpreg { ...@@ -8,7 +8,29 @@ struct msp_dfpreg {
int value; int value;
}; };
struct msp_matrix {
int input;
int output;
};
#define MSP_SET_DFPREG _IOW('m',15,struct msp_dfpreg) #define MSP_SET_DFPREG _IOW('m',15,struct msp_dfpreg)
#define MSP_GET_DFPREG _IOW('m',16,struct msp_dfpreg) #define MSP_GET_DFPREG _IOW('m',16,struct msp_dfpreg)
/* ioctl for MSP_SET_MATRIX will have to be registered */
#define MSP_SET_MATRIX _IOW('m',17,struct msp_matrix)
#define SCART_MASK 0
#define SCART_IN1 1
#define SCART_IN2 2
#define SCART_IN1_DA 3
#define SCART_IN2_DA 4
#define SCART_IN3 5
#define SCART_IN4 6
#define SCART_MONO 7
#define SCART_MUTE 8
#define SCART_DSP_IN 0
#define SCART1_OUT 1
#define SCART2_OUT 2
#endif /* MSP3400_H */ #endif /* MSP3400_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7