patch-2.3.34 linux/drivers/char/msp3400.c
Next file: linux/drivers/char/msp3400.h
Previous file: linux/drivers/char/mem.c
Back to the patch index
Back to the overall index
- Lines: 1678
- Date:
Thu Dec 16 13:59:38 1999
- Orig file:
v2.3.33/linux/drivers/char/msp3400.c
- Orig date:
Tue Dec 14 01:27:24 1999
diff -u --recursive --new-file v2.3.33/linux/drivers/char/msp3400.c linux/drivers/char/msp3400.c
@@ -34,7 +34,6 @@
*/
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
@@ -42,6 +41,10 @@
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/malloc.h>
+#include <linux/i2c.h>
+#include <linux/videodev.h>
+#include <asm/semaphore.h>
+
#ifdef __SMP__
#include <asm/pgtable.h>
#include <linux/smp_lock.h>
@@ -51,27 +54,43 @@
#define __KERNEL_SYSCALLS__
#include <linux/unistd.h>
-#include <linux/i2c.h>
-#include <linux/videodev.h>
-
-#include "msp3400.h"
+#include "audiochip.h"
+
+#define WAIT_QUEUE wait_queue_head_t
/* sound mixer stuff */
#include <linux/config.h>
-
-#if LINUX_VERSION_CODE > 0x020140 /* need modular sound driver */
-# if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
-# define REGISTER_MIXER 1
-# endif
+#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
+# define REGISTER_MIXER 1
#endif
+/* Addresses to scan */
+static unsigned short normal_i2c[] = {I2C_CLIENT_END};
+static unsigned short normal_i2c_range[] = {0x40,0x44,I2C_CLIENT_END};
+static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
+static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
+static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
+static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
+static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
+static struct i2c_client_address_data addr_data = {
+ normal_i2c, normal_i2c_range,
+ probe, probe_range,
+ ignore, ignore_range,
+ force
+};
-static int debug = 0; /* insmod parameter */
+/* insmod parameters */
+static int debug = 0; /* debug output */
+static int once = 0; /* no continous stereo monitoring */
+static int amsound = 0; /* hard-wire AM sound at 6.5 Hz (france),
+ the autoscan seems work well only with FM... */
+static int simple = -1; /* use short programming (>= msp3410 only) */
+static int dolby = 0;
+static int mixer = -1;
struct msp3400c {
- struct i2c_bus *bus;
-
+ int simple;
int nicam;
int mode;
int norm;
@@ -84,36 +103,34 @@
/* thread */
struct task_struct *thread;
- wait_queue_head_t wq;
+ WAIT_QUEUE wq;
+
struct semaphore *notify;
int active,restart,rmmod;
int watch_stereo;
struct timer_list wake_stereo;
+
+ /* mixer */
+ int mixer_modcnt;
+ int mixer_num;
};
+#define MSP3400_MAX 4
+static struct i2c_client *msps[MSP3400_MAX];
+
#define VIDEO_MODE_RADIO 16 /* norm magic for radio mode */
/* ---------------------------------------------------------------------- */
#define dprintk if (debug) printk
-#if LINUX_VERSION_CODE < 0x020100
-/* 2.0.x */
-#define signal_pending(current) (current->signal & ~current->blocked)
-#define sigfillset(set)
-#define mdelay(x) udelay(1000*x)
-#else
+MODULE_PARM(once,"i");
MODULE_PARM(debug,"i");
-#endif
-
-#if LINUX_VERSION_CODE < 0x02017f
-void schedule_timeout(int j)
-{
- current->timeout = jiffies + j;
- schedule();
-}
-#endif
+MODULE_PARM(simple,"i");
+MODULE_PARM(amsound,"i");
+MODULE_PARM(dolby,"i");
+MODULE_PARM(mixer,"i");
/* ---------------------------------------------------------------------- */
@@ -124,103 +141,78 @@
/* ----------------------------------------------------------------------- */
/* functions for talking to the MSP3400C Sound processor */
-static int msp3400c_reset(struct i2c_bus *bus)
+static int msp3400c_reset(struct i2c_client *client)
{
- int ret = 0;
-
- mdelay(2);
- i2c_start(bus);
- i2c_sendbyte(bus, I2C_MSP3400C,2000);
- i2c_sendbyte(bus, 0x00,0);
- i2c_sendbyte(bus, 0x80,0);
- i2c_sendbyte(bus, 0x00,0);
- i2c_stop(bus);
- mdelay(2);
- i2c_start(bus);
- if (0 != i2c_sendbyte(bus, I2C_MSP3400C,2000) ||
- 0 != i2c_sendbyte(bus, 0x00,0) ||
- 0 != i2c_sendbyte(bus, 0x00,0) ||
- 0 != i2c_sendbyte(bus, 0x00,0)) {
- ret = -1;
+ static char reset_off[3] = { 0x00, 0x80, 0x00 };
+ static char reset_on[3] = { 0x00, 0x00, 0x00 };
+
+ i2c_master_send(client,reset_off,3); /* XXX ignore errors here */
+ if (3 != i2c_master_send(client,reset_on, 3)) {
printk(KERN_ERR "msp3400: chip reset failed, penguin on i2c bus?\n");
+ return -1;
}
- i2c_stop(bus);
- mdelay(2);
- return ret;
+ return 0;
}
static int
-msp3400c_read(struct i2c_bus *bus, int dev, int addr)
+msp3400c_read(struct i2c_client *client, int dev, int addr)
{
- int err,ret;
- short val=0;
+ int err;
+
+ unsigned char write[3];
+ unsigned char read[2];
+ struct i2c_msg msgs[2] = {
+ { client->addr, 0, 3, write },
+ { client->addr, I2C_M_RD, 2, read }
+ };
+ write[0] = dev+1;
+ write[1] = addr >> 8;
+ write[2] = addr & 0xff;
for (err = 0; err < 3;) {
- ret = 0;
- i2c_start(bus);
- if (0 != i2c_sendbyte(bus, I2C_MSP3400C,2000) ||
- 0 != i2c_sendbyte(bus, dev+1, 0) ||
- 0 != i2c_sendbyte(bus, addr >> 8, 0) ||
- 0 != i2c_sendbyte(bus, addr & 0xff, 0)) {
- ret = -1;
- } else {
- i2c_start(bus);
- if (0 != i2c_sendbyte(bus, I2C_MSP3400C+1,2000)) {
- ret = -1;
- } else {
- val |= (int)i2c_readbyte(bus,0) << 8;
- val |= (int)i2c_readbyte(bus,1);
- }
- }
- i2c_stop(bus);
- if (0 == ret)
+ if (2 == i2c_transfer(client->adapter,msgs,2))
break;
-
- /* some I/O error */
err++;
printk(KERN_WARNING "msp34xx: I/O error #%d (read 0x%02x/0x%02x)\n",
err, dev, addr);
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ/10);
}
- if (-1 == ret) {
+ if (3 == err) {
printk(KERN_WARNING "msp34xx: giving up, reseting chip. Sound will go off, sorry folks :-|\n");
- msp3400c_reset(bus);
+ msp3400c_reset(client);
+ return -1;
}
- return val;
+ return read[0] << 8 | read[1];
}
static int
-msp3400c_write(struct i2c_bus *bus, int dev, int addr, int val)
+msp3400c_write(struct i2c_client *client, int dev, int addr, int val)
{
- int ret,err;
-
+ int err;
+ unsigned char buffer[5];
+
+ buffer[0] = dev;
+ buffer[1] = addr >> 8;
+ buffer[2] = addr & 0xff;
+ buffer[3] = val >> 8;
+ buffer[4] = val & 0xff;
+
for (err = 0; err < 3;) {
- ret = 0;
- i2c_start(bus);
- if (0 != i2c_sendbyte(bus, I2C_MSP3400C,2000) ||
- 0 != i2c_sendbyte(bus, dev, 0) ||
- 0 != i2c_sendbyte(bus, addr >> 8, 0) ||
- 0 != i2c_sendbyte(bus, addr & 0xff, 0) ||
- 0 != i2c_sendbyte(bus, val >> 8, 0) ||
- 0 != i2c_sendbyte(bus, val & 0xff, 0))
- ret = -1;
- i2c_stop(bus);
- if (0 == ret)
+ if (5 == i2c_master_send(client, buffer, 5))
break;
-
- /* some I/O error */
err++;
printk(KERN_WARNING "msp34xx: I/O error #%d (write 0x%02x/0x%02x)\n",
err, dev, addr);
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ/10);
}
- if (-1 == ret) {
+ if (3 == err) {
printk(KERN_WARNING "msp34xx: giving up, reseting chip. Sound will go off, sorry folks :-|\n");
- msp3400c_reset(bus);
+ msp3400c_reset(client);
+ return -1;
}
- return ret;
+ return 0;
}
/* ------------------------------------------------------------------------ */
@@ -235,6 +227,8 @@
#define MSP_MODE_FM_SAT 4
#define MSP_MODE_FM_NICAM1 5
#define MSP_MODE_FM_NICAM2 6
+#define MSP_MODE_AM_NICAM 7
+#define MSP_MODE_BTSC 8
static struct MSP_INIT_DATA_DEM {
int fir1[6];
@@ -271,15 +265,20 @@
MSP_CARRIER(6.5), MSP_CARRIER(6.5),
0x00c6, 0x0480, 0x0000, 0x3000},
- /* NICAM B/G, D/K */
+ /* NICAM/FM -- B/G (5.5/5.85), D/K (6.5/5.85) */
{ { -2, -8, -10, 10, 50, 86 }, { 3, 18, 27, 48, 66, 72 },
MSP_CARRIER(5.5), MSP_CARRIER(5.5),
0x00d0, 0x0040, 0x0120, 0x3000},
- /* NICAM I */
+ /* NICAM/FM -- I (6.0/6.552) */
{ { 2, 4, -6, -4, 40, 94 }, { 3, 18, 27, 48, 66, 72 },
MSP_CARRIER(6.0), MSP_CARRIER(6.0),
0x00d0, 0x0040, 0x0120, 0x3000},
+
+ /* NICAM/AM -- L (6.5/5.85) */
+ { { -2, -8, -10, 10, 50, 86 }, { -4, -12, -9, 23, 79, 126 },
+ MSP_CARRIER(6.5), MSP_CARRIER(6.5),
+ 0x00c6, 0x0140, 0x0120, 0x7000},
};
struct CARRIER_DETECT {
@@ -315,16 +314,16 @@
/* ------------------------------------------------------------------------ */
-static void msp3400c_setcarrier(struct i2c_bus *bus, int cdo1, int cdo2)
+static void msp3400c_setcarrier(struct i2c_client *client, int cdo1, int cdo2)
{
- msp3400c_write(bus,I2C_MSP3400C_DEM, 0x0093, cdo1 & 0xfff);
- msp3400c_write(bus,I2C_MSP3400C_DEM, 0x009b, cdo1 >> 12);
- msp3400c_write(bus,I2C_MSP3400C_DEM, 0x00a3, cdo2 & 0xfff);
- msp3400c_write(bus,I2C_MSP3400C_DEM, 0x00ab, cdo2 >> 12);
- msp3400c_write(bus,I2C_MSP3400C_DEM, 0x0056, 0); /*LOAD_REG_1/2*/
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0093, cdo1 & 0xfff);
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x009b, cdo1 >> 12);
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x00a3, cdo2 & 0xfff);
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x00ab, cdo2 >> 12);
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0056, 0); /*LOAD_REG_1/2*/
}
-static void msp3400c_setvolume(struct i2c_bus *bus, int left, int right)
+static void msp3400c_setvolume(struct i2c_client *client, int left, int right)
{
int vol,val,balance;
@@ -334,94 +333,106 @@
if (vol > 0)
balance = ((right-left) * 127) / vol;
- dprintk("msp3400: setvolume: %d:%d 0x%02x 0x%02x\n",
+ dprintk("msp34xx: setvolume: %d:%d 0x%02x 0x%02x\n",
left,right,val>>8,balance);
- msp3400c_write(bus,I2C_MSP3400C_DFP, 0x0000, val); /* loudspeaker */
- msp3400c_write(bus,I2C_MSP3400C_DFP, 0x0006, val); /* headphones */
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0000, val); /* loudspeaker */
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0006, val); /* headphones */
/* scart - on/off only */
- msp3400c_write(bus,I2C_MSP3400C_DFP, 0x0007, val ? 0x4000 : 0);
- msp3400c_write(bus,I2C_MSP3400C_DFP, 0x0001, balance << 8);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0007, val ? 0x4000 : 0);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0001, balance << 8);
}
-static void msp3400c_setbass(struct i2c_bus *bus, int bass)
+static void msp3400c_setbass(struct i2c_client *client, int bass)
{
int val = ((bass-32768) * 0x60 / 65535) << 8;
- dprintk("msp3400: setbass: %d 0x%02x\n",bass, val>>8);
- msp3400c_write(bus,I2C_MSP3400C_DFP, 0x0002, val); /* loudspeaker */
+ dprintk("msp34xx: setbass: %d 0x%02x\n",bass, val>>8);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0002, val); /* loudspeaker */
}
-static void msp3400c_settreble(struct i2c_bus *bus, int treble)
+static void msp3400c_settreble(struct i2c_client *client, int treble)
{
int val = ((treble-32768) * 0x60 / 65535) << 8;
- dprintk("msp3400: settreble: %d 0x%02x\n",treble, val>>8);
- msp3400c_write(bus,I2C_MSP3400C_DFP, 0x0003, val); /* loudspeaker */
+ dprintk("msp34xx: settreble: %d 0x%02x\n",treble, val>>8);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0003, val); /* loudspeaker */
}
-static void msp3400c_setmode(struct msp3400c *msp, int type)
+static void msp3400c_setmode(struct i2c_client *client, int type)
{
+ struct msp3400c *msp = client->data;
int i;
dprintk("msp3400: setmode: %d\n",type);
msp->mode = type;
msp->stereo = VIDEO_SOUND_MONO;
- msp3400c_write(msp->bus,I2C_MSP3400C_DEM, 0x00bb, /* ad_cv */
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x00bb, /* ad_cv */
msp_init_data[type].ad_cv);
for (i = 5; i >= 0; i--) /* fir 1 */
- msp3400c_write(msp->bus,I2C_MSP3400C_DEM, 0x0001,
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0001,
msp_init_data[type].fir1[i]);
- msp3400c_write(msp->bus,I2C_MSP3400C_DEM, 0x0005, 0x0004); /* fir 2 */
- msp3400c_write(msp->bus,I2C_MSP3400C_DEM, 0x0005, 0x0040);
- msp3400c_write(msp->bus,I2C_MSP3400C_DEM, 0x0005, 0x0000);
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0005, 0x0004); /* fir 2 */
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0005, 0x0040);
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0005, 0x0000);
for (i = 5; i >= 0; i--)
- msp3400c_write(msp->bus,I2C_MSP3400C_DEM, 0x0005,
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0005,
msp_init_data[type].fir2[i]);
- msp3400c_write(msp->bus,I2C_MSP3400C_DEM, 0x0083, /* MODE_REG */
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0083, /* MODE_REG */
msp_init_data[type].mode_reg);
- msp3400c_setcarrier(msp->bus, msp_init_data[type].cdo1,
+ msp3400c_setcarrier(client, msp_init_data[type].cdo1,
msp_init_data[type].cdo2);
- msp3400c_write(msp->bus,I2C_MSP3400C_DEM, 0x0056, 0); /*LOAD_REG_1/2*/
+ msp3400c_write(client,I2C_MSP3400C_DEM, 0x0056, 0); /*LOAD_REG_1/2*/
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x0008,
- msp_init_data[type].dfp_src);
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x0009,
- msp_init_data[type].dfp_src);
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x000a,
+ if (dolby) {
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,
+ 0x0520); /* I2S1 */
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0009,
+ 0x0620); /* I2S2 */
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x000b,
+ msp_init_data[type].dfp_src);
+ } else {
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,
+ msp_init_data[type].dfp_src);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0009,
+ msp_init_data[type].dfp_src);
+ }
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x000a,
msp_init_data[type].dfp_src);
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x000e,
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e,
msp_init_data[type].dfp_matrix);
if (msp->nicam) {
- /* msp3410 needs some more initialization */
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x0010, 0x3000);
+ /* nicam prescale */
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0010, 0x3000);
}
}
-static void msp3400c_setstereo(struct msp3400c *msp, int mode)
+/* turn on/off nicam + stereo */
+static void msp3400c_setstereo(struct i2c_client *client, int mode)
{
+ struct msp3400c *msp = client->data;
int nicam=0; /* channel source: FM/AM or nicam */
int src=0;
-
+
/* switch demodulator */
switch (msp->mode) {
case MSP_MODE_FM_TERRA:
dprintk("msp3400: FM setstereo: %d\n",mode);
- msp3400c_setcarrier(msp->bus,msp->second,msp->main);
+ msp3400c_setcarrier(client,msp->second,msp->main);
switch (mode) {
case VIDEO_SOUND_STEREO:
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x000e, 0x3001);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3001);
break;
case VIDEO_SOUND_MONO:
case VIDEO_SOUND_LANG1:
case VIDEO_SOUND_LANG2:
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x000e, 0x3000);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x000e, 0x3000);
break;
}
break;
@@ -429,29 +440,33 @@
dprintk("msp3400: SAT setstereo: %d\n",mode);
switch (mode) {
case VIDEO_SOUND_MONO:
- msp3400c_setcarrier(msp->bus, MSP_CARRIER(6.5), MSP_CARRIER(6.5));
+ msp3400c_setcarrier(client, MSP_CARRIER(6.5), MSP_CARRIER(6.5));
break;
case VIDEO_SOUND_STEREO:
- msp3400c_setcarrier(msp->bus, MSP_CARRIER(7.2), MSP_CARRIER(7.02));
+ msp3400c_setcarrier(client, MSP_CARRIER(7.2), MSP_CARRIER(7.02));
break;
case VIDEO_SOUND_LANG1:
- msp3400c_setcarrier(msp->bus, MSP_CARRIER(7.38), MSP_CARRIER(7.02));
+ msp3400c_setcarrier(client, MSP_CARRIER(7.38), MSP_CARRIER(7.02));
break;
case VIDEO_SOUND_LANG2:
- msp3400c_setcarrier(msp->bus, MSP_CARRIER(7.38), MSP_CARRIER(7.02));
+ msp3400c_setcarrier(client, MSP_CARRIER(7.38), MSP_CARRIER(7.02));
break;
}
break;
case MSP_MODE_FM_NICAM1:
case MSP_MODE_FM_NICAM2:
+ case MSP_MODE_AM_NICAM:
dprintk("msp3400: NICAM setstereo: %d\n",mode);
- msp->stereo = mode;
- msp3400c_setcarrier(msp->bus,msp->second,msp->main);
+ msp3400c_setcarrier(client,msp->second,msp->main);
if (msp->nicam_on)
nicam=0x0100;
break;
+ case MSP_MODE_BTSC:
+ dprintk("msp3400: BTSC setstereo: %d\n",mode);
+ nicam=0x0300;
+ break;
default:
- /* can't do stereo - abort here */
+ dprintk("msp3400: mono setstereo\n");
return;
}
@@ -459,8 +474,8 @@
switch (mode) {
case VIDEO_SOUND_STEREO:
src = 0x0020 | nicam;
-#if 0
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x0005,0x4000);
+#if 0
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0005,0x4000);
#endif
break;
case VIDEO_SOUND_MONO:
@@ -471,9 +486,16 @@
src = 0x0010 | nicam;
break;
}
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x0008,src);
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x0009,src);
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x000a,src);
+ if (dolby) {
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,0x0520);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0009,0x0620);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x000a,src);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x000b,src);
+ } else {
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0008,src);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0009,src);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x000a,src);
+ }
}
static void
@@ -488,7 +510,10 @@
}
if (msp->mode == MSP_MODE_FM_NICAM1 ||
msp->mode == MSP_MODE_FM_NICAM2)
- printk("msp3400: NICAM carrier : %d.%03d MHz\n",
+ printk("msp3400: NICAM/FM carrier : %d.%03d MHz\n",
+ msp->second/910000,(msp->second/910)%1000);
+ if (msp->mode == MSP_MODE_AM_NICAM)
+ printk("msp3400: NICAM/AM carrier : %d.%03d MHz\n",
msp->second/910000,(msp->second/910)%1000);
if (msp->mode == MSP_MODE_FM_TERRA &&
msp->main != msp->second) {
@@ -513,8 +538,9 @@
};
static int
-autodetect_stereo(struct msp3400c *msp)
+autodetect_stereo(struct i2c_client *client)
{
+ struct msp3400c *msp = client->data;
int val;
int newstereo = msp->stereo;
int newnicam = msp->nicam_on;
@@ -522,7 +548,9 @@
switch (msp->mode) {
case MSP_MODE_FM_TERRA:
- val = msp3400c_read(msp->bus, I2C_MSP3400C_DFP, 0x18);
+ val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x18);
+ if (val > 32768)
+ val -= 65536;
dprintk("msp3400: stereo detect register: %d\n",val);
if (val > 4096) {
@@ -536,7 +564,8 @@
break;
case MSP_MODE_FM_NICAM1:
case MSP_MODE_FM_NICAM2:
- val = msp3400c_read(msp->bus, I2C_MSP3400C_DEM, 0x23);
+ case MSP_MODE_AM_NICAM:
+ val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x23);
dprintk("msp3400: nicam sync=%d, mode=%d\n",val & 1, (val & 0x1e) >> 1);
if (val & 1) {
@@ -564,6 +593,16 @@
newnicam=1;
} else {
newnicam=0;
+#if 0 /* fixme: quick & dirty for testing */
+ if (msp->main == MSP_CARRIER(6.5)) {
+ /* This is a french mono channel => AM */
+ printk("msp3400: switching to AM mono\n");
+ msp3400c_setstereo(msp, VIDEO_SOUND_MONO);
+ msp->second = msp->main;
+ msp3400c_setmode(msp, MSP_MODE_AM_DETECT);
+ msp3400c_setcarrier(client, msp->second, msp->main);
+ }
+#endif
newstereo = VIDEO_SOUND_MONO;
}
break;
@@ -596,20 +635,20 @@
}
/* stereo/multilang monitoring */
-static void watch_stereo(struct msp3400c *msp)
+static void watch_stereo(struct i2c_client *client)
{
- LOCK_FLAGS;
+ struct msp3400c *msp = client->data;
- LOCK_I2C_BUS(msp->bus);
- if (autodetect_stereo(msp)) {
+ if (autodetect_stereo(client)) {
if (msp->stereo & VIDEO_SOUND_STEREO)
- msp3400c_setstereo(msp,VIDEO_SOUND_STEREO);
+ msp3400c_setstereo(client,VIDEO_SOUND_STEREO);
else if (msp->stereo & VIDEO_SOUND_LANG1)
- msp3400c_setstereo(msp,VIDEO_SOUND_LANG1);
+ msp3400c_setstereo(client,VIDEO_SOUND_LANG1);
else
- msp3400c_setstereo(msp,VIDEO_SOUND_MONO);
+ msp3400c_setstereo(client,VIDEO_SOUND_MONO);
}
- UNLOCK_I2C_BUS(msp->bus);
+ if (once)
+ msp->watch_stereo = 0;
if (msp->watch_stereo) {
del_timer(&msp->wake_stereo);
msp->wake_stereo.expires = jiffies + 5*HZ;
@@ -619,11 +658,11 @@
static int msp3400c_thread(void *data)
{
- struct msp3400c *msp = data;
+ struct i2c_client *client = data;
+ struct msp3400c *msp = client->data;
struct CARRIER_DETECT *cd;
int count, max1,max2,val1,val2, val,this;
- LOCK_FLAGS;
#ifdef __SMP__
lock_kernel();
@@ -663,15 +702,14 @@
msp->active = 1;
if (msp->watch_stereo) {
- watch_stereo(msp);
+ watch_stereo(client);
msp->active = 0;
continue;
}
restart:
- LOCK_I2C_BUS(msp->bus);
- msp3400c_setvolume(msp->bus, 0, 0);
- msp3400c_setmode(msp, MSP_MODE_AM_DETECT /* +1 */ );
+ msp3400c_setvolume(client, 0, 0);
+ msp3400c_setmode(client, MSP_MODE_AM_DETECT /* +1 */ );
val1 = val2 = 0;
max1 = max2 = -1;
del_timer(&msp->wake_stereo);
@@ -680,8 +718,7 @@
/* carrier detect pass #1 -- main carrier */
cd = carrier_detect_main; count = CARRIER_COUNT(carrier_detect_main);
for (this = 0; this < count; this++) {
- msp3400c_setcarrier(msp->bus, cd[this].cdo,cd[this].cdo);
- UNLOCK_I2C_BUS(msp->bus);
+ msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo);
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ/25);
@@ -692,12 +729,17 @@
goto restart;
}
- LOCK_I2C_BUS(msp->bus);
- val = msp3400c_read(msp->bus, I2C_MSP3400C_DFP, 0x1b);
+ val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b);
if (val1 < val)
val1 = val, max1 = this;
dprintk("msp3400: carrier1 val: %5d / %s\n", val,cd[this].name);
}
+
+ if (amsound) {
+ /* autodetect does'nt work well with AM ... */
+ max1 = 3;
+ dprintk("msp3400: AM sound override\n");
+ }
/* carrier detect pass #2 -- second (stereo) carrier */
switch (max1) {
@@ -714,8 +756,7 @@
break;
}
for (this = 0; this < count; this++) {
- msp3400c_setcarrier(msp->bus, cd[this].cdo,cd[this].cdo);
- UNLOCK_I2C_BUS(msp->bus);
+ msp3400c_setcarrier(client, cd[this].cdo,cd[this].cdo);
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ/25);
@@ -726,8 +767,7 @@
goto restart;
}
- LOCK_I2C_BUS(msp->bus);
- val = msp3400c_read(msp->bus, I2C_MSP3400C_DFP, 0x1b);
+ val = msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b);
if (val2 < val)
val2 = val, max2 = this;
dprintk("msp3400: carrier2 val: %5d / %s\n", val,cd[this].name);
@@ -740,16 +780,16 @@
if (max2 == 0) {
/* B/G FM-stereo */
msp->second = carrier_detect_55[max2].cdo;
- msp3400c_setmode(msp, MSP_MODE_FM_TERRA);
+ msp3400c_setmode(client, MSP_MODE_FM_TERRA);
msp->nicam_on = 0;
- msp3400c_setstereo(msp, VIDEO_SOUND_MONO);
+ msp3400c_setstereo(client, VIDEO_SOUND_MONO);
msp->watch_stereo = 1;
} else if (max2 == 1 && msp->nicam) {
/* B/G NICAM */
msp->second = carrier_detect_55[max2].cdo;
- msp3400c_setmode(msp, MSP_MODE_FM_NICAM1);
+ msp3400c_setmode(client, MSP_MODE_FM_NICAM1);
msp->nicam_on = 1;
- msp3400c_setcarrier(msp->bus, msp->second, msp->main);
+ msp3400c_setcarrier(client, msp->second, msp->main);
msp->watch_stereo = 1;
} else {
goto no_second;
@@ -758,25 +798,33 @@
case 2: /* 6.0 */
/* PAL I NICAM */
msp->second = MSP_CARRIER(6.552);
- msp3400c_setmode(msp, MSP_MODE_FM_NICAM2);
+ msp3400c_setmode(client, MSP_MODE_FM_NICAM2);
msp->nicam_on = 1;
- msp3400c_setcarrier(msp->bus, msp->second, msp->main);
+ msp3400c_setcarrier(client, msp->second, msp->main);
msp->watch_stereo = 1;
break;
case 3: /* 6.5 */
if (max2 == 1 || max2 == 2) {
/* D/K FM-stereo */
msp->second = carrier_detect_65[max2].cdo;
- msp3400c_setmode(msp, MSP_MODE_FM_TERRA);
+ msp3400c_setmode(client, MSP_MODE_FM_TERRA);
msp->nicam_on = 0;
- msp3400c_setstereo(msp, VIDEO_SOUND_MONO);
+ msp3400c_setstereo(client, VIDEO_SOUND_MONO);
+ msp->watch_stereo = 1;
+ } else if (max2 == 0 && msp->nicam &&
+ msp->norm == VIDEO_MODE_SECAM) {
+ /* L NICAM */
+ msp->second = carrier_detect_65[max2].cdo;
+ msp3400c_setmode(client, MSP_MODE_AM_NICAM);
+ msp->nicam_on = 1;
+ msp3400c_setcarrier(client, msp->second, msp->main);
msp->watch_stereo = 1;
} else if (max2 == 0 && msp->nicam) {
/* D/K NICAM */
msp->second = carrier_detect_65[max2].cdo;
- msp3400c_setmode(msp, MSP_MODE_FM_NICAM1);
+ msp3400c_setmode(client, MSP_MODE_FM_NICAM1);
msp->nicam_on = 1;
- msp3400c_setcarrier(msp->bus, msp->second, msp->main);
+ msp3400c_setcarrier(client, msp->second, msp->main);
msp->watch_stereo = 1;
} else {
goto no_second;
@@ -786,17 +834,16 @@
default:
no_second:
msp->second = carrier_detect_main[max1].cdo;
- msp3400c_setmode(msp, MSP_MODE_FM_TERRA);
+ msp3400c_setmode(client, MSP_MODE_FM_TERRA);
msp->nicam_on = 0;
- msp3400c_setcarrier(msp->bus, msp->second, msp->main);
+ msp3400c_setcarrier(client, msp->second, msp->main);
msp->stereo = VIDEO_SOUND_MONO;
- msp3400c_setstereo(msp, VIDEO_SOUND_MONO);
+ msp3400c_setstereo(client, VIDEO_SOUND_MONO);
break;
}
/* unmute */
- msp3400c_setvolume(msp->bus, msp->left, msp->right);
- UNLOCK_I2C_BUS(msp->bus);
+ msp3400c_setvolume(client, msp->left, msp->right);
if (msp->watch_stereo) {
del_timer(&msp->wake_stereo);
@@ -820,85 +867,208 @@
return 0;
}
-#if 0 /* not finished yet */
+/* ----------------------------------------------------------------------- */
+/* this one uses the automatic sound standard detection of newer */
+/* msp34xx chip versions */
+static struct MODES {
+ int retval;
+ int main, second;
+ char *name;
+} modelist[] = {
+ { 0x0000, 0, 0, "ERROR" },
+ { 0x0001, 0, 0, "autodetect start" },
+ { 0x0002, MSP_CARRIER(4.5), MSP_CARRIER(4.72), "4.5/4.72 M Dual FM-Stereo" },
+ { 0x0003, MSP_CARRIER(5.5), MSP_CARRIER(5.7421875), "5.5/5.74 B/G Dual FM-Stereo" },
+ { 0x0004, MSP_CARRIER(6.5), MSP_CARRIER(6.2578125), "6.5/6.25 D/K1 Dual FM-Stereo" },
+ { 0x0005, MSP_CARRIER(6.5), MSP_CARRIER(6.7421875), "6.5/6.74 D/K2 Dual FM-Stereo" },
+ { 0x0006, MSP_CARRIER(6.5), MSP_CARRIER(6.5), "6.5 D/K FM-Mono (HDEV3)" },
+ { 0x0008, MSP_CARRIER(5.5), MSP_CARRIER(5.85), "5.5/5.85 B/G NICAM FM" },
+ { 0x0009, MSP_CARRIER(6.5), MSP_CARRIER(5.85), "6.5/5.85 L NICAM AM" },
+ { 0x000a, MSP_CARRIER(6.0), MSP_CARRIER(6.55), "6.0/6.55 I NICAM FM" },
+ { 0x000b, MSP_CARRIER(6.5), MSP_CARRIER(5.85), "6.5/5.85 D/K NICAM FM" },
+ { 0x000c, MSP_CARRIER(6.5), MSP_CARRIER(5.85), "6.5/5.85 D/K NICAM FM (HDEV2)" },
+ { 0x0020, MSP_CARRIER(4.5), MSP_CARRIER(4.5), "4.5 M BTSC-Stereo" },
+ { 0x0021, MSP_CARRIER(4.5), MSP_CARRIER(4.5), "4.5 M BTSC-Mono + SAP" },
+ { 0x0030, MSP_CARRIER(4.5), MSP_CARRIER(4.5), "4.5 M EIA-J Japan Stereo" },
+ { 0x0040, MSP_CARRIER(10.7), MSP_CARRIER(10.7), "10.7 FM-Stereo Radio" },
+ { 0x0050, MSP_CARRIER(6.5), MSP_CARRIER(6.5), "6.5 SAT-Mono" },
+ { 0x0051, MSP_CARRIER(7.02), MSP_CARRIER(7.20), "7.02/7.20 SAT-Stereo" },
+ { 0x0060, MSP_CARRIER(7.2), MSP_CARRIER(7.2), "7.2 SAT ADR" },
+ { -1, 0, 0, NULL }, /* EOF */
+};
+
static int msp3410d_thread(void *data)
{
- unsigned long flags;
- struct msp3400c *msp = data;
- DECLARE_MUTEX_LOCKED(sem);
- int i, val;
-
- /* lock_kernel(); */
+ struct i2c_client *client = data;
+ struct msp3400c *msp = client->data;
+ int mode,val,i,std;
+
+#ifdef __SMP__
+ lock_kernel();
+#endif
exit_mm(current);
current->session = 1;
current->pgrp = 1;
sigfillset(¤t->blocked);
current->fs->umask = 0;
- strcpy(current->comm,"msp3410 (nicam)");
+ strcpy(current->comm,"msp3410 [auto]");
- msp->wait = &sem;
msp->thread = current;
- /* unlock_kernel(); */
+#ifdef __SMP__
+ unlock_kernel();
+#endif
- dprintk("msp3410: thread: start\n");
+ printk("msp3410: daemon started\n");
if(msp->notify != NULL)
up(msp->notify);
for (;;) {
if (msp->rmmod)
goto done;
- dprintk("msp3410: thread: sleep\n");
- down_interruptible(&sem);
- dprintk("msp3410: thread: wakeup\n");
- if (msp->rmmod)
+ if (debug > 1)
+ printk("msp3410: thread: sleep\n");
+ interruptible_sleep_on(&msp->wq);
+ if (debug > 1)
+ printk("msp3410: thread: wakeup\n");
+ if (msp->rmmod || signal_pending(current))
goto done;
-
+
if (VIDEO_MODE_RADIO == msp->norm)
continue; /* nothing to do */
msp->active = 1;
- restart:
- LOCK_I2C_BUS(msp->bus);
- /* mute */
- msp3400c_setvolume(msp->bus, 0);
- /* quick & dirty hack:
- get the audio proccessor into some useful state */
- msp3400c_setmode(msp, MSP_MODE_FM_NICAM1);
- /* kick autodetect */
- msp3400c_write(msp->bus, I2C_MSP3400C_DFP, 0x20, 0x01);
- msp3400c_write(msp->bus, I2C_MSP3400C_DFP, 0x21, 0x01);
- UNLOCK_I2C_BUS(msp->bus);
-
- /* wait 1 sec */
- __set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ);
- if (signal_pending(current))
- goto done;
- if (msp->restart) {
- msp->restart = 0;
- goto restart;
+ if (msp->watch_stereo) {
+#if 1 /* dump status register */
+ val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x200);
+ printk("msp3410: status=0x%x (pri=%s, sec=%s, %s%s%s)\n",
+ val,
+ (val & 0x0002) ? "no" : "yes",
+ (val & 0x0004) ? "no" : "yes",
+ (val & 0x0040) ? "stereo" : "mono",
+ (val & 0x0080) ? ", nicam 2nd mono" : "",
+ (val & 0x0100) ? ", bilingual/SAP" : "");
+ msp->watch_stereo = 0;
+#else
+ watch_stereo(msp);
+#endif
+ msp->active = 0;
+ continue;
}
- LOCK_I2C_BUS(msp->bus);
- /* debug register dump */
- for (i = 0; i < sizeof(d1)/sizeof(struct REGISTER_DUMP); i++) {
- val = msp3400c_read(msp->bus,I2C_MSP3400C_DEM,d1[i].addr);
- printk(KERN_DEBUG "msp3400: %s = 0x%x\n",d1[i].name,val);
- }
+ restart:
+ del_timer(&msp->wake_stereo);
+ msp->watch_stereo = 0;
+
+ /* put into sane state (and mute) */
+ msp3400c_reset(client);
+
+ /* start autodetect */
+ switch (msp->norm) {
+ case VIDEO_MODE_PAL:
+ mode = 0x1003;
+ std = 1;
+ break;
+ case VIDEO_MODE_NTSC: /* BTSC */
+ mode = 0x2003;
+ std = 0x0020;
+ break;
+ case VIDEO_MODE_SECAM:
+ default:
+ mode = 0x0003;
+ std = 1;
+ break;
+ }
+ msp3400c_write(client, I2C_MSP3400C_DEM, 0x30, mode);
+ msp3400c_write(client, I2C_MSP3400C_DEM, 0x20, std);
+ msp3400c_write(client, I2C_MSP3400C_DFP, 0x0e, 0x2403);
+ msp3400c_write(client, I2C_MSP3400C_DFP, 0x10, 0x5a00);
+ if (debug) {
+ int i;
+ for (i = 0; modelist[i].name != NULL; i++)
+ if (modelist[i].retval == std)
+ break;
+ printk("msp3410: setting mode: %s (0x%04x)\n",
+ modelist[i].name ? modelist[i].name : "unknown",std);
+ }
+
+ if (std != 1) {
+ /* programmed some specific mode */
+ val = std;
+ } else {
+ /* triggered autodetect */
+ for (;;) {
+ current->state = TASK_INTERRUPTIBLE;
+ schedule_timeout(HZ/10);
+ if (signal_pending(current))
+ goto done;
+ if (msp->restart) {
+ msp->restart = 0;
+ goto restart;
+ }
+
+ /* check results */
+ val = msp3400c_read(client, I2C_MSP3400C_DEM, 0x7e);
+ if (val < 0x07ff)
+ break;
+ dprintk("msp3410: detection still in progress\n");
+ }
+ }
+ for (i = 0; modelist[i].name != NULL; i++)
+ if (modelist[i].retval == val)
+ break;
+ if (debug)
+ printk("msp3410: current mode: %s (0x%04x)\n",
+ modelist[i].name ? modelist[i].name : "unknown",
+ val);
+ msp->main = modelist[i].main;
+ msp->second = modelist[i].second;
+
+ /* set prescale / stereo */
+ switch (val) {
+ case 0x0009:
+ msp3400c_write(client, I2C_MSP3400C_DFP, 0x0e, 0x7c03); /* AM */
+ msp3400c_write(client, I2C_MSP3400C_DFP, 0x10, 0x5a00); /* NICAM */
+ break;
+ case 0x0020: /* BTSC */
+ /* just turn on stereo */
+ msp->mode = MSP_MODE_BTSC;
+ msp->stereo = VIDEO_SOUND_STEREO;
+ msp->watch_stereo = 1;
+ msp3400c_setstereo(client,VIDEO_SOUND_STEREO);
+ /* set prescale */
+ msp3400c_write(client, I2C_MSP3400C_DFP, 0x0e, 0x2403); /* FM */
+ break;
+ case 0x0003:
+ msp->mode = MSP_MODE_FM_TERRA;
+ msp->stereo = VIDEO_SOUND_MONO;
+ msp->watch_stereo = 1;
+ /* fall */
+ default:
+ msp3400c_write(client, I2C_MSP3400C_DFP, 0x0e, 0x2403); /* FM */
+ msp3400c_write(client, I2C_MSP3400C_DFP, 0x10, 0x5a00); /* NICAM */
+ break;
+ }
+
/* unmute */
- msp3400c_setvolume(msp->bus, msp->volume);
- UNLOCK_I2C_BUS(msp->bus);
+ msp3400c_setbass(client, msp->bass);
+ msp3400c_settreble(client, msp->treble);
+ msp3400c_setvolume(client, msp->left, msp->right);
+
+ if (msp->watch_stereo) {
+ del_timer(&msp->wake_stereo);
+ msp->wake_stereo.expires = jiffies + HZ;
+ add_timer(&msp->wake_stereo);
+ }
msp->active = 0;
}
done:
dprintk("msp3410: thread: exit\n");
- msp->wait = NULL;
msp->active = 0;
msp->thread = NULL;
@@ -906,23 +1076,17 @@
up(msp->notify);
return 0;
}
-#endif
/* ----------------------------------------------------------------------- */
/* mixer stuff -- with the modular sound driver in 2.1.x we can easily */
/* register the msp3400 as mixer device */
-#ifdef REGISTER_MIXER
+#ifdef REGISTER_MIXER
#include <linux/sound.h>
#include <linux/soundcard.h>
#include <asm/uaccess.h>
-static struct msp3400c *mspmix = NULL; /* ugly hack, should do something more sensible */
-static int mixer_num;
-static int mixer_modcnt = 0;
-static DECLARE_MUTEX(mixer_sem);
-
static int mix_to_v4l(int i)
{
int r;
@@ -957,14 +1121,22 @@
static int
msp3400c_mixer_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
{
+ struct i2c_client *client;
+ struct msp3400c *msp;
int ret,val = 0;
- LOCK_FLAGS;
+ client = file->private_data;
+ if (!client)
+ return -ENODEV;
+ msp = client->data;
+ if (!msp)
+ return -ENODEV;
+
if (cmd == SOUND_MIXER_INFO) {
mixer_info info;
strncpy(info.id, "MSP3400", sizeof(info.id));
strncpy(info.name, "MSP 3400", sizeof(info.name));
- info.modify_counter = mixer_modcnt;
+ info.modify_counter = msp->mixer_modcnt;
if (copy_to_user((void *)arg, &info, sizeof(info)))
return -EFAULT;
return 0;
@@ -984,12 +1156,6 @@
if (get_user(val, (int *)arg))
return -EFAULT;
- down(&mixer_sem);
- if (!mspmix) {
- up(&mixer_sem);
- return -ENODEV;
- }
-
switch (cmd) {
case MIXER_READ(SOUND_MIXER_RECMASK):
case MIXER_READ(SOUND_MIXER_CAPS):
@@ -1006,44 +1172,36 @@
break;
case MIXER_WRITE(SOUND_MIXER_VOLUME):
- mspmix->left = mix_to_v4l(val);
- mspmix->right = mix_to_v4l(val >> 8);
- LOCK_I2C_BUS(mspmix->bus);
- msp3400c_setvolume(mspmix->bus,mspmix->left,mspmix->right);
- UNLOCK_I2C_BUS(mspmix->bus);
- mixer_modcnt++;
+ msp->left = mix_to_v4l(val);
+ msp->right = mix_to_v4l(val >> 8);
+ msp3400c_setvolume(client,msp->left,msp->right);
+ msp->mixer_modcnt++;
/* fall */
case MIXER_READ(SOUND_MIXER_VOLUME):
- ret = v4l_to_mix2(mspmix->left, mspmix->right);
+ ret = v4l_to_mix2(msp->left, msp->right);
break;
case MIXER_WRITE(SOUND_MIXER_BASS):
- mspmix->bass = mix_to_v4l(val);
- LOCK_I2C_BUS(mspmix->bus);
- msp3400c_setbass(mspmix->bus,mspmix->bass);
- UNLOCK_I2C_BUS(mspmix->bus);
- mixer_modcnt++;
+ msp->bass = mix_to_v4l(val);
+ msp3400c_setbass(client,msp->bass);
+ msp->mixer_modcnt++;
/* fall */
case MIXER_READ(SOUND_MIXER_BASS):
- ret = v4l_to_mix(mspmix->bass);
+ ret = v4l_to_mix(msp->bass);
break;
case MIXER_WRITE(SOUND_MIXER_TREBLE):
- mspmix->treble = mix_to_v4l(val);
- LOCK_I2C_BUS(mspmix->bus);
- msp3400c_settreble(mspmix->bus,mspmix->treble);
- UNLOCK_I2C_BUS(mspmix->bus);
- mixer_modcnt++;
+ msp->treble = mix_to_v4l(val);
+ msp3400c_settreble(client,msp->treble);
+ msp->mixer_modcnt++;
/* fall */
case MIXER_READ(SOUND_MIXER_TREBLE):
- ret = v4l_to_mix(mspmix->treble);
+ ret = v4l_to_mix(msp->treble);
break;
default:
- up(&mixer_sem);
return -EINVAL;
}
- up(&mixer_sem);
if (put_user(ret, (int *)arg))
return -EFAULT;
return 0;
@@ -1052,6 +1210,21 @@
static int
msp3400c_mixer_open(struct inode *inode, struct file *file)
{
+ int minor = MINOR(inode->i_rdev);
+ struct msp3400c *msp;
+ int i;
+
+ /* search for the right one... */
+ for (i = 0; i < MSP3400_MAX; i++) {
+ msp = msps[i]->data;
+ if (msp->mixer_num == minor) {
+ file->private_data = msps[i];
+ break;
+ }
+ }
+ if (MSP3400_MAX == i)
+ return -ENODEV;
+
MOD_INC_USE_COUNT;
return 0;
}
@@ -1069,7 +1242,7 @@
return -ESPIPE;
}
-static /*const*/ struct file_operations msp3400c_mixer_fops = {
+static struct file_operations msp3400c_mixer_fops = {
msp3400c_mixer_llseek,
NULL, /* read */
NULL, /* write */
@@ -1091,36 +1264,72 @@
/* ----------------------------------------------------------------------- */
-static int msp3400c_attach(struct i2c_device *device)
+static int msp_attach(struct i2c_adapter *adap, int addr,
+ unsigned short flags, int kind);
+static int msp_detach(struct i2c_client *client);
+static int msp_probe(struct i2c_adapter *adap);
+static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
+
+static struct i2c_driver driver = {
+ "i2c msp3400 driver",
+ I2C_DRIVERID_MSP3400,
+ I2C_DF_NOTIFY,
+ msp_probe,
+ msp_detach,
+ msp_command,
+};
+
+static struct i2c_client client_template =
+{
+ "unset",
+ -1,
+ 0,
+ 0,
+ NULL,
+ &driver
+};
+
+static int msp_attach(struct i2c_adapter *adap, int addr,
+ unsigned short flags, int kind)
{
DECLARE_MUTEX_LOCKED(sem);
struct msp3400c *msp;
- int rev1,rev2;
- LOCK_FLAGS;
+ struct i2c_client *c;
+ int rev1,rev2,i;
+
+ client_template.adapter = adap;
+ client_template.addr = addr;
- device->data = msp = kmalloc(sizeof(struct msp3400c),GFP_KERNEL);
- if (NULL == msp)
+ if (-1 == msp3400c_reset(&client_template)) {
+ dprintk("msp3400: no chip found\n");
+ return -1;
+ }
+
+ if (NULL == (c = kmalloc(sizeof(struct i2c_client),GFP_KERNEL)))
+ return -ENOMEM;
+ memcpy(c,&client_template,sizeof(struct i2c_client));
+ if (NULL == (msp = kmalloc(sizeof(struct msp3400c),GFP_KERNEL))) {
+ kfree(c);
return -ENOMEM;
+ }
+
memset(msp,0,sizeof(struct msp3400c));
- msp->bus = device->bus;
msp->left = 65535;
msp->right = 65535;
msp->bass = 32768;
msp->treble = 32768;
+ c->data = msp;
init_waitqueue_head(&msp->wq);
- LOCK_I2C_BUS(msp->bus);
- if (-1 == msp3400c_reset(msp->bus)) {
- UNLOCK_I2C_BUS(msp->bus);
+ if (-1 == msp3400c_reset(c)) {
kfree(msp);
dprintk("msp3400: no chip found\n");
return -1;
}
- rev1 = msp3400c_read(msp->bus, I2C_MSP3400C_DFP, 0x1e);
- rev2 = msp3400c_read(msp->bus, I2C_MSP3400C_DFP, 0x1f);
+ rev1 = msp3400c_read(c, I2C_MSP3400C_DFP, 0x1e);
+ rev2 = msp3400c_read(c, I2C_MSP3400C_DFP, 0x1f);
if (0 == rev1 && 0 == rev2) {
- UNLOCK_I2C_BUS(msp->bus);
kfree(msp);
printk("msp3400: error while reading chip version\n");
return -1;
@@ -1128,48 +1337,67 @@
#if 0
/* this will turn on a 1kHz beep - might be useful for debugging... */
- msp3400c_write(msp->bus,I2C_MSP3400C_DFP, 0x0014, 0x1040);
+ msp3400c_write(client,I2C_MSP3400C_DFP, 0x0014, 0x1040);
#endif
- UNLOCK_I2C_BUS(msp->bus);
- sprintf(device->name,"MSP34%02d%c-%c%d",
+ sprintf(c->name,"MSP34%02d%c-%c%d",
(rev2>>8)&0xff, (rev1&0xff)+'@', ((rev1>>8)&0xff)+'@', rev2&0x1f);
msp->nicam = (((rev2>>8)&0xff) != 00) ? 1 : 0;
+ if (simple == -1) {
+ /* default mode */
+ msp->simple = 0;
+ } else {
+ /* use insmod option */
+ msp->simple = simple;
+ }
+
/* timer for stereo checking */
msp->wake_stereo.function = msp3400c_stereo_wake;
msp->wake_stereo.data = (unsigned long)msp;
+ /* hello world :-) */
+ printk(KERN_INFO "msp3400: init: chip=%s",c->name);
+ if (msp->nicam)
+ printk(", has NICAM support");
+ printk("\n");
+
/* startup control thread */
MOD_INC_USE_COUNT;
msp->notify = &sem;
- kernel_thread(msp3400c_thread, (void *)msp, 0);
+ kernel_thread(msp->simple ? msp3410d_thread : msp3400c_thread,
+ (void *)c, 0);
down(&sem);
msp->notify = NULL;
wake_up_interruptible(&msp->wq);
- printk(KERN_INFO "msp3400: init: chip=%s",device->name);
- if (msp->nicam)
- printk(", has NICAM support");
#ifdef REGISTER_MIXER
- down(&mixer_sem);
- mspmix = msp;
- up(&mixer_sem);
+ if ((msp->mixer_num = register_sound_mixer(&msp3400c_mixer_fops,mixer)) < 0)
+ printk(KERN_ERR "msp3400c: cannot allocate mixer device\n");
#endif
- printk("\n");
+
+ /* update our own array */
+ for (i = 0; i < MSP3400_MAX; i++) {
+ if (NULL == msps[i]) {
+ msps[i] = c;
+ break;
+ }
+ }
+
+ /* done */
+ i2c_attach_client(c);
return 0;
}
-static int msp3400c_detach(struct i2c_device *device)
+static int msp_detach(struct i2c_client *client)
{
DECLARE_MUTEX_LOCKED(sem);
- struct msp3400c *msp = (struct msp3400c*)device->data;
- LOCK_FLAGS;
-
+ struct msp3400c *msp = (struct msp3400c*)client->data;
+ int i;
+
#ifdef REGISTER_MIXER
- down(&mixer_sem);
- mspmix = NULL;
- up(&mixer_sem);
+ if (msp->mixer_num >= 0)
+ unregister_sound_mixer(msp->mixer_num);
#endif
/* shutdown control thread */
@@ -1182,47 +1410,143 @@
down(&sem);
msp->notify = NULL;
}
-
- LOCK_I2C_BUS(msp->bus);
- msp3400c_reset(msp->bus);
- UNLOCK_I2C_BUS(msp->bus);
+ msp3400c_reset(client);
+
+ /* update our own array */
+ for (i = 0; i < MSP3400_MAX; i++) {
+ if (client == msps[i]) {
+ msps[i] = NULL;
+ break;
+ }
+ }
+ i2c_detach_client(client);
kfree(msp);
+ kfree(client);
MOD_DEC_USE_COUNT;
return 0;
}
-static int msp3400c_command(struct i2c_device *device,
- unsigned int cmd, void *arg)
+static int msp_probe(struct i2c_adapter *adap)
{
- struct msp3400c *msp = (struct msp3400c*)device->data;
+ if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+ return i2c_probe(adap, &addr_data, msp_attach);
+ return 0;
+}
+
+static int msp_command(struct i2c_client *client,unsigned int cmd, void *arg)
+{
+ struct msp3400c *msp = (struct msp3400c*)client->data;
+#if 0
int *iarg = (int*)arg;
__u16 *sarg = arg;
- LOCK_FLAGS;
+#endif
switch (cmd) {
- case MSP_SET_RADIO:
+
+ case AUDC_SET_RADIO:
msp->norm = VIDEO_MODE_RADIO;
msp->watch_stereo=0;
del_timer(&msp->wake_stereo);
- LOCK_I2C_BUS(msp->bus);
- msp3400c_setmode(msp,MSP_MODE_FM_RADIO);
- msp3400c_setcarrier(msp->bus, MSP_CARRIER(10.7),MSP_CARRIER(10.7));
- msp3400c_setvolume(msp->bus,msp->left, msp->right);
- UNLOCK_I2C_BUS(msp->bus);
+ if (msp->simple) {
+ msp3400c_reset(client);
+ msp3400c_write(client, I2C_MSP3400C_DEM, 0x30, 0x0003); /* automatic */
+ msp3400c_write(client, I2C_MSP3400C_DEM, 0x20, 0x0040); /* FM Radio */
+ msp3400c_write(client, I2C_MSP3400C_DFP, 0x0e, 0x2403); /* FM prescale */
+ msp3400c_setbass(client, msp->bass);
+ msp3400c_settreble(client, msp->treble);
+ msp3400c_setvolume(client, msp->left, msp->right);
+ } else {
+ msp3400c_setmode(client,MSP_MODE_FM_RADIO);
+ msp3400c_setcarrier(client, MSP_CARRIER(10.7),MSP_CARRIER(10.7));
+ msp3400c_setvolume(client,msp->left, msp->right);
+ }
+ break;
+
+ /* --- v4l ioctls --- */
+ /* take care: bttv does userspace copying, we'll get a
+ kernel pointer here... */
+ case VIDIOCGAUDIO:
+ {
+ struct video_audio *va = arg;
+
+ va->flags |= VIDEO_AUDIO_VOLUME |
+ VIDEO_AUDIO_BASS |
+ VIDEO_AUDIO_TREBLE;
+ va->volume=MAX(msp->left,msp->right);
+ va->balance=(32768*MIN(msp->left,msp->right))/
+ (va->volume ? va->volume : 1);
+ va->balance=(msp->left<msp->right)?
+ (65535-va->balance) : va->balance;
+ va->bass = msp->bass;
+ va->treble = msp->treble;
+
+ if (msp->simple) {
+ /* fixme */
+ } else {
+ autodetect_stereo(client);
+ va->mode = msp->stereo;
+ }
+ break;
+ }
+ case VIDIOCSAUDIO:
+ {
+ struct video_audio *va = arg;
+
+ msp->left = (MIN(65536 - va->balance,32768) *
+ va->volume) / 32768;
+ msp->right = (MIN(va->balance,32768) *
+ va->volume) / 32768;
+ msp->bass = va->bass;
+ msp->treble = va->treble;
+ msp3400c_setvolume(client,msp->left, msp->right);
+ msp3400c_setbass(client,msp->bass);
+ msp3400c_settreble(client,msp->treble);
+
+ if (msp->simple) {
+ /* fixme */
+ } else if (va->mode != 0) {
+ msp->watch_stereo=0;
+ del_timer(&msp->wake_stereo);
+ msp->stereo = va->mode;
+ msp3400c_setstereo(client,va->mode);
+ }
+ break;
+ }
+ case VIDIOCSCHAN:
+ {
+ struct video_channel *vc = arg;
+
+ msp->norm = vc->norm;
+ break;
+ }
+ case VIDIOCSFREQ:
+ {
+ /* new channel -- kick audio carrier scan */
+ msp3400c_setvolume(client,0,0);
+ msp->watch_stereo=0;
+ del_timer(&msp->wake_stereo);
+ if (msp->active)
+ msp->restart = 1;
+ wake_up_interruptible(&msp->wq);
break;
- case MSP_SET_TVNORM:
+ }
+
+ /* --- v4l2 ioctls --- */
+ /* NOT YET */
+
+#if 0
+ /* --- old, obsolete interface --- */
+ case AUDC_SET_TVNORM:
msp->norm = *iarg;
break;
- case MSP_SWITCH_MUTE:
+ case AUDC_SWITCH_MUTE:
/* channels switching step one -- mute */
msp->watch_stereo=0;
del_timer(&msp->wake_stereo);
- LOCK_I2C_BUS(msp->bus);
- msp3400c_setvolume(msp->bus,0,0);
- UNLOCK_I2C_BUS(msp->bus);
+ msp3400c_setvolume(client,0,0);
break;
- case MSP_NEWCHANNEL:
+ case AUDC_NEWCHANNEL:
/* channels switching step two -- trigger sound carrier scan */
msp->watch_stereo=0;
del_timer(&msp->wake_stereo);
@@ -1231,96 +1555,85 @@
wake_up_interruptible(&msp->wq);
break;
- case MSP_GET_VOLUME:
- *sarg = (msp->left > msp->right) ? msp->left : msp->right;
+ case AUDC_GET_VOLUME_LEFT:
+ *sarg = msp->left;
+ break;
+ case AUDC_GET_VOLUME_RIGHT:
+ *sarg = msp->right;
break;
- case MSP_SET_VOLUME:
- msp->left = msp->right = *sarg;
- LOCK_I2C_BUS(msp->bus);
- msp3400c_setvolume(msp->bus,msp->left, msp->right);
- UNLOCK_I2C_BUS(msp->bus);
+ case AUDC_SET_VOLUME_LEFT:
+ msp->left = *sarg;
+ msp3400c_setvolume(client,msp->left, msp->right);
+ break;
+ case AUDC_SET_VOLUME_RIGHT:
+ msp->right = *sarg;
+ msp3400c_setvolume(client,msp->left, msp->right);
break;
- case MSP_GET_BASS:
+ case AUDC_GET_BASS:
*sarg = msp->bass;
break;
- case MSP_SET_BASS:
+ case AUDC_SET_BASS:
msp->bass = *sarg;
- LOCK_I2C_BUS(msp->bus);
- msp3400c_setbass(msp->bus,msp->bass);
- UNLOCK_I2C_BUS(msp->bus);
+ msp3400c_setbass(client,msp->bass);
break;
- case MSP_GET_TREBLE:
+ case AUDC_GET_TREBLE:
*sarg = msp->treble;
break;
- case MSP_SET_TREBLE:
+ case AUDC_SET_TREBLE:
msp->treble = *sarg;
- LOCK_I2C_BUS(msp->bus);
- msp3400c_settreble(msp->bus,msp->treble);
- UNLOCK_I2C_BUS(msp->bus);
+ msp3400c_settreble(client,msp->treble);
break;
- case MSP_GET_STEREO:
- *sarg = msp->stereo;
+ case AUDC_GET_STEREO:
+ if (msp->simple) {
+ *sarg = 0; /* fixme */
+ } else {
+ autodetect_stereo(client);
+ *sarg = msp->stereo;
+ }
break;
- case MSP_SET_STEREO:
+ case AUDC_SET_STEREO:
+ if (msp->simple)
+ break; /* fixme */
if (*sarg) {
msp->watch_stereo=0;
del_timer(&msp->wake_stereo);
- LOCK_I2C_BUS(msp->bus);
- msp3400c_setstereo(msp,*sarg);
- UNLOCK_I2C_BUS(msp->bus);
+ msp->stereo = *sarg;
+ msp3400c_setstereo(client,*sarg);
}
break;
- case MSP_GET_DC:
- LOCK_I2C_BUS(msp->bus);
- *sarg = ((int)msp3400c_read(msp->bus, I2C_MSP3400C_DFP, 0x1b) +
- (int)msp3400c_read(msp->bus, I2C_MSP3400C_DFP, 0x1c));
- UNLOCK_I2C_BUS(msp->bus);
+ case AUDC_GET_DC:
+ if (msp->simple)
+ break; /* fixme */
+ *sarg = ((int)msp3400c_read(client, I2C_MSP3400C_DFP, 0x1b) +
+ (int)msp3400c_read(client, I2C_MSP3400C_DFP, 0x1c));
break;
-
+#endif
default:
- return -EINVAL;
+ /* nothing */
}
return 0;
}
/* ----------------------------------------------------------------------- */
-struct i2c_driver i2c_driver_msp = {
- "msp3400", /* name */
- I2C_DRIVERID_MSP3400, /* ID */
- I2C_MSP3400C, I2C_MSP3400C, /* addr range */
-
- msp3400c_attach,
- msp3400c_detach,
- msp3400c_command
-};
-
#ifdef MODULE
int init_module(void)
#else
- int msp3400c_init(void)
+int msp3400c_init(void)
#endif
{
- i2c_register_driver(&i2c_driver_msp);
-#ifdef REGISTER_MIXER
- if ((mixer_num = register_sound_mixer(&msp3400c_mixer_fops, -1)) < 0)
- printk(KERN_ERR "msp3400c: cannot allocate mixer device\n");
-#endif
+ i2c_add_driver(&driver);
return 0;
}
#ifdef MODULE
void cleanup_module(void)
{
- i2c_unregister_driver(&i2c_driver_msp);
-#ifdef REGISTER_MIXER
- if (mixer_num >= 0)
- unregister_sound_mixer(mixer_num);
-#endif
+ i2c_del_driver(&driver);
}
#endif
@@ -1331,3 +1644,4 @@
* c-basic-offset: 8
* End:
*/
+
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)