Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history 
V4L/DVB (3345): Fixes some bad global variables


- Debug global var is already used inside kernel.
- v4l_dbg now expects the debug var
- global vars inside msp34xx renamed to msp_*

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Mauro Carvalho Chehab committed Jan 11, 2006
1 parent b2a17e4 commit f167cb4
Show file tree
Hide file tree
Showing 11 changed files with 180 additions and 181 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/bt832.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ int bt832_hexdump(struct i2c_client *i2c_client_s, unsigned char *buf)

if(debug>1) {
int i;
v4l_dbg(2,i2c_client_s,"hexdump:");
v4l_dbg(2, debug,i2c_client_s,"hexdump:");
for(i=1;i<65;i++) {
if(i!=1) {
if(((i-1)%8)==0) printk(" ");
if(((i-1)%16)==0) {
printk("\n");
v4l_dbg(2,i2c_client_s,"hexdump:");
v4l_dbg(2, debug,i2c_client_s,"hexdump:");
}
}
printk(" %02x",buf[i]);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/video/cs53l32a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
for (i = 1; i <= 7; i++) {
u8 v = cs53l32a_read(client, i);

v4l_dbg(1, client, "Read Reg %d %02x\n", i, v);
v4l_dbg(1, debug, client, "Read Reg %d %02x\n", i, v);
}

/* Set cs53l32a internal register for Adaptec 2010/2410 setup */
Expand All @@ -173,7 +173,7 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
for (i = 1; i <= 7; i++) {
u8 v = cs53l32a_read(client, i);

v4l_dbg(1, client, "Read Reg %d %02x\n", i, v);
v4l_dbg(1, debug, client, "Read Reg %d %02x\n", i, v);
}

i2c_attach_client(client);
Expand Down
12 changes: 6 additions & 6 deletions drivers/media/video/cx25840/cx25840-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp
vid_input <= CX25840_COMPOSITE8);
u8 reg;

v4l_dbg(1, client, "decoder set video input %d, audio input %d\n",
v4l_dbg(1, debug, client, "decoder set video input %d, audio input %d\n",
vid_input, aud_input);

if (is_composite) {
Expand Down Expand Up @@ -533,7 +533,7 @@ static int set_v4lfmt(struct i2c_client *client, struct v4l2_format *fmt)
else
filter = 3;

v4l_dbg(1, client, "decoder set size %dx%d -> scale %ux%u\n",
v4l_dbg(1, debug, client, "decoder set size %dx%d -> scale %ux%u\n",
pix->width, pix->height, HSC, VSC);

/* HSCALE=HSC */
Expand Down Expand Up @@ -687,13 +687,13 @@ static int cx25840_command(struct i2c_client *client, unsigned int cmd,
return cx25840_audio(client, cmd, arg);

case VIDIOC_STREAMON:
v4l_dbg(1, client, "enable output\n");
v4l_dbg(1, debug, client, "enable output\n");
cx25840_write(client, 0x115, 0x8c);
cx25840_write(client, 0x116, 0x07);
break;

case VIDIOC_STREAMOFF:
v4l_dbg(1, client, "disable output\n");
v4l_dbg(1, debug, client, "disable output\n");
cx25840_write(client, 0x115, 0x00);
cx25840_write(client, 0x116, 0x00);
break;
Expand Down Expand Up @@ -871,15 +871,15 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
client->driver = &i2c_driver_cx25840;
snprintf(client->name, sizeof(client->name) - 1, "cx25840");

v4l_dbg(1, client, "detecting cx25840 client on address 0x%x\n", address << 1);
v4l_dbg(1, debug, client, "detecting cx25840 client on address 0x%x\n", address << 1);

device_id = cx25840_read(client, 0x101) << 8;
device_id |= cx25840_read(client, 0x100);

/* The high byte of the device ID should be
* 0x84 if chip is present */
if ((device_id & 0xff00) != 0x8400) {
v4l_dbg(1, client, "cx25840 not found\n");
v4l_dbg(1, debug, client, "cx25840 not found\n");
kfree(client);
return 0;
}
Expand Down
64 changes: 32 additions & 32 deletions drivers/media/video/msp3400-driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,26 @@ MODULE_LICENSE("GPL");

/* module parameters */
static int opmode = OPMODE_AUTO;
int debug = 0; /* debug output */
int once = 0; /* no continous stereo monitoring */
int amsound = 0; /* hard-wire AM sound at 6.5 Hz (france),
int msp_debug = 0; /* msp_debug output */
int msp_once = 0; /* no continous stereo monitoring */
int msp_amsound = 0; /* hard-wire AM sound at 6.5 Hz (france),
the autoscan seems work well only with FM... */
int standard = 1; /* Override auto detect of audio standard, if needed. */
int dolby = 0;
int msp_standard = 1; /* Override auto detect of audio msp_standard, if needed. */
int msp_dolby = 0;

int stereo_threshold = 0x190; /* a2 threshold for stereo/bilingual
int msp_stereo_thresh = 0x190; /* a2 threshold for stereo/bilingual
(msp34xxg only) 0x00a0-0x03c0 */

/* read-only */
module_param(opmode, int, 0444);

/* read-write */
module_param(once, bool, 0644);
module_param(debug, int, 0644);
module_param(stereo_threshold, int, 0644);
module_param(standard, int, 0644);
module_param(amsound, bool, 0644);
module_param(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 @@ -127,7 +127,7 @@ int msp_reset(struct i2c_client *client)
{ client->addr, I2C_M_RD, 2, read },
};

v4l_dbg(3, client, "msp_reset\n");
v4l_dbg(3, msp_debug, client, "msp_reset\n");
if (i2c_transfer(client->adapter, &reset[0], 1) != 1 ||
i2c_transfer(client->adapter, &reset[1], 1) != 1 ||
i2c_transfer(client->adapter, test, 2) != 2) {
Expand Down Expand Up @@ -165,7 +165,7 @@ static int msp_read(struct i2c_client *client, int dev, int addr)
return -1;
}
retval = read[0] << 8 | read[1];
v4l_dbg(3, 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 @@ -190,7 +190,7 @@ 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, 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 Down Expand Up @@ -273,7 +273,7 @@ void msp_set_scart(struct i2c_client *client, int in, int out)
} else
state->acb = 0xf60; /* Mute Input and SCART 1 Output */

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

Expand All @@ -285,7 +285,7 @@ void msp_set_mute(struct i2c_client *client)
{
struct msp_state *state = i2c_get_clientdata(client);

v4l_dbg(1, client, "mute audio\n");
v4l_dbg(1, msp_debug, client, "mute audio\n");
msp_write_dsp(client, 0x0000, 0);
msp_write_dsp(client, 0x0007, 1);
if (state->has_scart2_out_volume)
Expand All @@ -303,7 +303,7 @@ void msp_set_audio(struct i2c_client *client)
if (!state->muted)
val = (state->volume * 0x7f / 65535) << 8;

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

msp_write_dsp(client, 0x0000, val);
Expand All @@ -321,7 +321,7 @@ void msp_set_audio(struct i2c_client *client)
treble = ((state->treble - 32768) * 0x60 / 65535) << 8;
loudness = state->loudness ? ((5 * 4) << 8) : 0;

v4l_dbg(1, client, "balance=%d bass=%d treble=%d loudness=%d\n",
v4l_dbg(1, msp_debug, client, "balance=%d bass=%d treble=%d loudness=%d\n",
state->balance, state->bass, state->treble, state->loudness);

msp_write_dsp(client, 0x0001, bal << 8);
Expand All @@ -341,12 +341,12 @@ int msp_modus(struct i2c_client *client)
struct msp_state *state = i2c_get_clientdata(client);

if (state->radio) {
v4l_dbg(1, client, "video mode selected to Radio\n");
v4l_dbg(1, msp_debug, client, "video mode selected to Radio\n");
return 0x0003;
}

if (state->v4l2_std & V4L2_STD_PAL) {
v4l_dbg(1, client, "video mode selected to PAL\n");
v4l_dbg(1, msp_debug, client, "video mode selected to PAL\n");

#if 1
/* experimental: not sure this works with all chip versions */
Expand All @@ -357,11 +357,11 @@ int msp_modus(struct i2c_client *client)
#endif
}
if (state->v4l2_std & V4L2_STD_NTSC) {
v4l_dbg(1, client, "video mode selected to NTSC\n");
v4l_dbg(1, msp_debug, client, "video mode selected to NTSC\n");
return 0x2003;
}
if (state->v4l2_std & V4L2_STD_SECAM) {
v4l_dbg(1, client, "video mode selected to SECAM\n");
v4l_dbg(1, msp_debug, client, "video mode selected to SECAM\n");
return 0x0003;
}
return 0x0003;
Expand Down Expand Up @@ -619,7 +619,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
u16 *sarg = arg;
int scart = 0;

if (debug >= 2)
if (msp_debug >= 2)
v4l_i2c_print_ioctl(client, cmd);

switch (cmd) {
Expand Down Expand Up @@ -666,7 +666,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
if (state->radio)
return 0;
state->radio = 1;
v4l_dbg(1, client, "switching to radio mode\n");
v4l_dbg(1, msp_debug, client, "switching to radio mode\n");
state->watch_stereo = 0;
switch (state->opmode) {
case OPMODE_MANUAL:
Expand Down Expand Up @@ -937,7 +937,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
if (a->index < 0 || a->index > 2)
return -EINVAL;

v4l_dbg(1, client, "Setting audio out on msp34xx to input %i\n", a->index);
v4l_dbg(1, msp_debug, client, "Setting audio out on msp34xx to input %i\n", a->index);
msp_set_scart(client, state->in_scart, a->index + 1);

break;
Expand All @@ -947,7 +947,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
u32 *a = (u32 *)arg;

v4l_dbg(1, client, "Setting I2S speed to %d\n", *a);
v4l_dbg(1, msp_debug, client, "Setting I2S speed to %d\n", *a);

switch (*a) {
case 1024000:
Expand Down Expand Up @@ -1041,7 +1041,7 @@ static int msp_suspend(struct device * dev, pm_message_t state)
{
struct i2c_client *client = container_of(dev, struct i2c_client, dev);

v4l_dbg(1, client, "suspend\n");
v4l_dbg(1, msp_debug, client, "suspend\n");
msp_reset(client);
return 0;
}
Expand All @@ -1050,7 +1050,7 @@ static int msp_resume(struct device * dev)
{
struct i2c_client *client = container_of(dev, struct i2c_client, dev);

v4l_dbg(1, client, "resume\n");
v4l_dbg(1, msp_debug, client, "resume\n");
msp_wake_thread(client);
return 0;
}
Expand Down Expand Up @@ -1080,7 +1080,7 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind)
snprintf(client->name, sizeof(client->name) - 1, "msp3400");

if (msp_reset(client) == -1) {
v4l_dbg(1, client, "msp3400 not found\n");
v4l_dbg(1, msp_debug, client, "msp3400 not found\n");
kfree(client);
return -1;
}
Expand All @@ -1107,9 +1107,9 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind)
state->rev1 = msp_read_dsp(client, 0x1e);
if (state->rev1 != -1)
state->rev2 = msp_read_dsp(client, 0x1f);
v4l_dbg(1, 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, 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);
kfree(client);
return -1;
Expand Down
Loading

0 comments on commit f167cb4

Please sign in to comment.