Skip to content

Commit

Permalink
V4L/DVB (6866): msp3400: CodingStyle cleanups
Browse files Browse the repository at this point in the history 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent 35df38c commit d52c738
Show file tree
Hide file tree
Showing 2 changed files with 195 additions and 138 deletions.
167 changes: 97 additions & 70 deletions drivers/media/video/msp3400-driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/


Expand Down Expand Up @@ -72,7 +73,8 @@ int msp_debug; /* msp_debug output */
int msp_once; /* no continous stereo monitoring */
int msp_amsound; /* hard-wire AM sound at 6.5 Hz (france),
the autoscan seems work well only with FM... */
int msp_standard = 1; /* Override auto detect of audio msp_standard, if needed. */
int msp_standard = 1; /* Override auto detect of audio msp_standard,
if needed. */
int msp_dolby;

int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual
Expand All @@ -82,12 +84,12 @@ int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual
module_param(opmode, int, 0444);

/* read-write */
module_param_named(once,msp_once, bool, 0644);
module_param_named(debug,msp_debug, int, 0644);
module_param_named(stereo_threshold,msp_stereo_thresh, int, 0644);
module_param_named(standard,msp_standard, int, 0644);
module_param_named(amsound,msp_amsound, bool, 0644);
module_param_named(dolby,msp_dolby, bool, 0644);
module_param_named(once, msp_once, bool, 0644);
module_param_named(debug, msp_debug, int, 0644);
module_param_named(stereo_threshold, msp_stereo_thresh, int, 0644);
module_param_named(standard, msp_standard, int, 0644);
module_param_named(amsound, msp_amsound, bool, 0644);
module_param_named(dolby, msp_dolby, bool, 0644);

MODULE_PARM_DESC(opmode, "Forces a MSP3400 opmode. 0=Manual, 1=Autodetect, 2=Autodetect and autoselect");
MODULE_PARM_DESC(once, "No continuous stereo monitoring");
Expand Down Expand Up @@ -161,12 +163,13 @@ static int msp_read(struct i2c_client *client, int dev, int addr)
schedule_timeout_interruptible(msecs_to_jiffies(10));
}
if (err == 3) {
v4l_warn(client, "giving up, resetting chip. Sound will go off, sorry folks :-|\n");
v4l_warn(client, "resetting chip, sound will go off.\n");
msp_reset(client);
return -1;
}
retval = read[0] << 8 | read[1];
v4l_dbg(3, msp_debug, client, "msp_read(0x%x, 0x%x): 0x%x\n", dev, addr, retval);
v4l_dbg(3, msp_debug, client, "msp_read(0x%x, 0x%x): 0x%x\n",
dev, addr, retval);
return retval;
}

Expand All @@ -191,7 +194,8 @@ static int msp_write(struct i2c_client *client, int dev, int addr, int val)
buffer[3] = val >> 8;
buffer[4] = val & 0xff;

v4l_dbg(3, msp_debug, client, "msp_write(0x%x, 0x%x, 0x%x)\n", dev, addr, val);
v4l_dbg(3, msp_debug, client, "msp_write(0x%x, 0x%x, 0x%x)\n",
dev, addr, val);
for (err = 0; err < 3; err++) {
if (i2c_master_send(client, buffer, 5) == 5)
break;
Expand All @@ -200,7 +204,7 @@ static int msp_write(struct i2c_client *client, int dev, int addr, int val)
schedule_timeout_interruptible(msecs_to_jiffies(10));
}
if (err == 3) {
v4l_warn(client, "giving up, resetting chip. Sound will go off, sorry folks :-|\n");
v4l_warn(client, "resetting chip, sound will go off.\n");
msp_reset(client);
return -1;
}
Expand Down Expand Up @@ -274,7 +278,7 @@ void msp_set_scart(struct i2c_client *client, int in, int out)
state->acb = 0xf60; /* Mute Input and SCART 1 Output */

v4l_dbg(1, msp_debug, client, "scart switch: %s => %d (ACB=0x%04x)\n",
scart_names[in], out, state->acb);
scart_names[in], out, state->acb);
msp_write_dsp(client, 0x13, state->acb);

/* Sets I2S speed 0 = 1.024 Mbps, 1 = 2.048 Mbps */
Expand All @@ -293,7 +297,8 @@ void msp_set_audio(struct i2c_client *client)
val = (state->volume * 0x7f / 65535) << 8;

v4l_dbg(1, msp_debug, client, "mute=%s scanning=%s volume=%d\n",
state->muted ? "on" : "off", state->scan_in_progress ? "yes" : "no",
state->muted ? "on" : "off",
state->scan_in_progress ? "yes" : "no",
state->volume);

msp_write_dsp(client, 0x0000, val);
Expand Down Expand Up @@ -682,14 +687,14 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
v4l_dbg(1, msp_debug, client, "Setting I2S speed to %d\n", *a);

switch (*a) {
case 1024000:
state->i2s_mode = 0;
break;
case 2048000:
state->i2s_mode = 1;
break;
default:
return -EINVAL;
case 1024000:
state->i2s_mode = 0;
break;
case 2048000:
state->i2s_mode = 1;
break;
default:
return -EINVAL;
}
break;
}
Expand All @@ -699,22 +704,22 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
struct v4l2_queryctrl *qc = arg;

switch (qc->id) {
case V4L2_CID_AUDIO_VOLUME:
case V4L2_CID_AUDIO_MUTE:
return v4l2_ctrl_query_fill_std(qc);
default:
break;
case V4L2_CID_AUDIO_VOLUME:
case V4L2_CID_AUDIO_MUTE:
return v4l2_ctrl_query_fill_std(qc);
default:
break;
}
if (!state->has_sound_processing)
return -EINVAL;
switch (qc->id) {
case V4L2_CID_AUDIO_LOUDNESS:
case V4L2_CID_AUDIO_BALANCE:
case V4L2_CID_AUDIO_BASS:
case V4L2_CID_AUDIO_TREBLE:
return v4l2_ctrl_query_fill_std(qc);
default:
return -EINVAL;
case V4L2_CID_AUDIO_LOUDNESS:
case V4L2_CID_AUDIO_BALANCE:
case V4L2_CID_AUDIO_BASS:
case V4L2_CID_AUDIO_TREBLE:
return v4l2_ctrl_query_fill_std(qc);
default:
return -EINVAL;
}
}

Expand All @@ -736,13 +741,14 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
state->volume, state->muted ? " (muted)" : "");
if (state->has_sound_processing) {
v4l_info(client, "Audio: balance %d bass %d treble %d loudness %s\n",
state->balance, state->bass, state->treble,
state->balance, state->bass,
state->treble,
state->loudness ? "on" : "off");
}
switch (state->mode) {
case MSP_MODE_AM_DETECT: p = "AM (for carrier detect)"; break;
case MSP_MODE_FM_RADIO: p = "FM Radio"; break;
case MSP_MODE_FM_TERRA: p = "Terrestial FM-mono + FM-stereo"; break;
case MSP_MODE_FM_TERRA: p = "Terrestial FM-mono/stereo"; break;
case MSP_MODE_FM_SAT: p = "Satellite FM-mono"; break;
case MSP_MODE_FM_NICAM1: p = "NICAM/FM (B/G, D/K)"; break;
case MSP_MODE_FM_NICAM2: p = "NICAM/FM (I)"; break;
Expand Down Expand Up @@ -773,7 +779,8 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
}

case VIDIOC_G_CHIP_IDENT:
return v4l2_chip_ident_i2c_client(client, arg, state->ident, (state->rev1 << 16) | state->rev2);
return v4l2_chip_ident_i2c_client(client, arg, state->ident,
(state->rev1 << 16) | state->rev2);

default:
/* unknown */
Expand Down Expand Up @@ -816,9 +823,8 @@ static int msp_probe(struct i2c_client *client)
}

state = kzalloc(sizeof(*state), GFP_KERNEL);
if (!state) {
if (!state)
return -ENOMEM;
}

i2c_set_clientdata(client, state);

Expand All @@ -840,9 +846,11 @@ static int msp_probe(struct i2c_client *client)
state->rev1 = msp_read_dsp(client, 0x1e);
if (state->rev1 != -1)
state->rev2 = msp_read_dsp(client, 0x1f);
v4l_dbg(1, msp_debug, client, "rev1=0x%04x, rev2=0x%04x\n", state->rev1, state->rev2);
v4l_dbg(1, msp_debug, client, "rev1=0x%04x, rev2=0x%04x\n",
state->rev1, state->rev2);
if (state->rev1 == -1 || (state->rev1 == 0 && state->rev2 == 0)) {
v4l_dbg(1, msp_debug, client, "not an msp3400 (cannot read chip version)\n");
v4l_dbg(1, msp_debug, client,
"not an msp3400 (cannot read chip version)\n");
kfree(state);
return -ENODEV;
}
Expand All @@ -860,37 +868,55 @@ static int msp_probe(struct i2c_client *client)
msp_family, msp_product,
msp_revision, msp_hard, msp_rom);
/* Rev B=2, C=3, D=4, G=7 */
state->ident = msp_family * 10000 + 4000 + msp_product * 10 + msp_revision - '@';
state->ident = msp_family * 10000 + 4000 + msp_product * 10 +
msp_revision - '@';

/* Has NICAM support: all mspx41x and mspx45x products have NICAM */
state->has_nicam = msp_prod_hi == 1 || msp_prod_hi == 5;
state->has_nicam =
msp_prod_hi == 1 || msp_prod_hi == 5;
/* Has radio support: was added with revision G */
state->has_radio = msp_revision >= 'G';
state->has_radio =
msp_revision >= 'G';
/* Has headphones output: not for stripped down products */
state->has_headphones = msp_prod_lo < 5;
state->has_headphones =
msp_prod_lo < 5;
/* Has scart2 input: not in stripped down products of the '3' family */
state->has_scart2 = msp_family >= 4 || msp_prod_lo < 7;
state->has_scart2 =
msp_family >= 4 || msp_prod_lo < 7;
/* Has scart3 input: not in stripped down products of the '3' family */
state->has_scart3 = msp_family >= 4 || msp_prod_lo < 5;
state->has_scart3 =
msp_family >= 4 || msp_prod_lo < 5;
/* Has scart4 input: not in pre D revisions, not in stripped D revs */
state->has_scart4 = msp_family >= 4 || (msp_revision >= 'D' && msp_prod_lo < 5);
/* Has scart2 output: not in stripped down products of the '3' family */
state->has_scart2_out = msp_family >= 4 || msp_prod_lo < 5;
state->has_scart4 =
msp_family >= 4 || (msp_revision >= 'D' && msp_prod_lo < 5);
/* Has scart2 output: not in stripped down products of
* the '3' family */
state->has_scart2_out =
msp_family >= 4 || msp_prod_lo < 5;
/* Has scart2 a volume control? Not in pre-D revisions. */
state->has_scart2_out_volume = msp_revision > 'C' && state->has_scart2_out;
state->has_scart2_out_volume =
msp_revision > 'C' && state->has_scart2_out;
/* Has a configurable i2s out? */
state->has_i2s_conf = msp_revision >= 'G' && msp_prod_lo < 7;
/* Has subwoofer output: not in pre-D revs and not in stripped down products */
state->has_subwoofer = msp_revision >= 'D' && msp_prod_lo < 5;
/* Has soundprocessing (bass/treble/balance/loudness/equalizer): not in
stripped down products */
state->has_sound_processing = msp_prod_lo < 7;
state->has_i2s_conf =
msp_revision >= 'G' && msp_prod_lo < 7;
/* Has subwoofer output: not in pre-D revs and not in stripped down
* products */
state->has_subwoofer =
msp_revision >= 'D' && msp_prod_lo < 5;
/* Has soundprocessing (bass/treble/balance/loudness/equalizer):
* not in stripped down products */
state->has_sound_processing =
msp_prod_lo < 7;
/* Has Virtual Dolby Surround: only in msp34x1 */
state->has_virtual_dolby_surround = msp_revision == 'G' && msp_prod_lo == 1;
state->has_virtual_dolby_surround =
msp_revision == 'G' && msp_prod_lo == 1;
/* Has Virtual Dolby Surround & Dolby Pro Logic: only in msp34x2 */
state->has_dolby_pro_logic = msp_revision == 'G' && msp_prod_lo == 2;
/* The msp343xG supports BTSC only and cannot do Automatic Standard Detection. */
state->force_btsc = msp_family == 3 && msp_revision == 'G' && msp_prod_hi == 3;
state->has_dolby_pro_logic =
msp_revision == 'G' && msp_prod_lo == 2;
/* The msp343xG supports BTSC only and cannot do Automatic Standard
* Detection. */
state->force_btsc =
msp_family == 3 && msp_revision == 'G' && msp_prod_hi == 3;

state->opmode = opmode;
if (state->opmode == OPMODE_AUTO) {
Expand All @@ -905,32 +931,33 @@ static int msp_probe(struct i2c_client *client)
}

/* hello world :-) */
v4l_info(client, "%s found @ 0x%x (%s)\n", client->name, client->addr << 1, client->adapter->name);
v4l_info(client, "%s found @ 0x%x (%s)\n", client->name,
client->addr << 1, client->adapter->name);
v4l_info(client, "%s ", client->name);
if (state->has_nicam && state->has_radio)
printk("supports nicam and radio, ");
printk(KERN_CONT "supports nicam and radio, ");
else if (state->has_nicam)
printk("supports nicam, ");
printk(KERN_CONT "supports nicam, ");
else if (state->has_radio)
printk("supports radio, ");
printk("mode is ");
printk(KERN_CONT "supports radio, ");
printk(KERN_CONT "mode is ");

/* version-specific initialization */
switch (state->opmode) {
case OPMODE_MANUAL:
printk("manual");
printk(KERN_CONT "manual");
thread_func = msp3400c_thread;
break;
case OPMODE_AUTODETECT:
printk("autodetect");
printk(KERN_CONT "autodetect");
thread_func = msp3410d_thread;
break;
case OPMODE_AUTOSELECT:
printk("autodetect and autoselect");
printk(KERN_CONT "autodetect and autoselect");
thread_func = msp34xxg_thread;
break;
}
printk("\n");
printk(KERN_CONT "\n");

/* startup control thread if needed */
if (thread_func) {
Expand Down
Loading

0 comments on commit d52c738

Please sign in to comment.