Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 142427
b: refs/heads/master
c: 38350ba
h: refs/heads/master
i:
  142425: 70fb855
  142423: 79123f3
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Apr 7, 2009
1 parent 6b8d404 commit 198a570
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 90960744a1ea83b70ace7983c80173220c9451c3
refs/heads/master: 38350ba9549b8c981f58ad3d037b335cbae14c43
34 changes: 18 additions & 16 deletions trunk/drivers/media/video/cx231xx/cx231xx-pcb-cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#include "cx231xx.h"
#include "cx231xx-conf-reg.h"

static unsigned int pcb_debug;
module_param(pcb_debug, int, 0644);
MODULE_PARM_DESC(pcb_debug, "enable pcb config debug messages [video]");

/******************************************************************************/

struct pcb_config cx231xx_Scenario[] = {
Expand Down Expand Up @@ -659,11 +663,8 @@ u32 initialize_cx231xx(struct cx231xx *dev)
u32 ts1_source = 0;
u32 ts2_source = 0;
u32 analog_source = 0;
u8 tmp = 0;
u8 _current_scenario_idx = 0xff;

cx231xx_info("PcbConfig::initialize \n");

ts1_source = SOURCE_TS_BDA;
ts2_source = SOURCE_TS_BDA;

Expand All @@ -672,7 +673,6 @@ u32 initialize_cx231xx(struct cx231xx *dev)
cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT, data, 4);

config_info = *((u32 *) data);
cx231xx_info("SC(0x00) register = 0x%x\n", config_info);
usb_speed = (u8) (config_info & 0x1);

/* Verify this device belongs to Bus power or Self power device */
Expand Down Expand Up @@ -776,18 +776,20 @@ u32 initialize_cx231xx(struct cx231xx *dev)
memcpy(&dev->current_pcb_config, p_pcb_info,
sizeof(struct pcb_config));

/*******************************************************************/
tmp = (dev->current_pcb_config.index) + 1;

cx231xx_info("scenario %d\n", tmp);
cx231xx_info("type=%x\n", dev->current_pcb_config.type);
cx231xx_info("mode=%x\n", dev->current_pcb_config.mode);
cx231xx_info("speed=%x\n", dev->current_pcb_config.speed);
cx231xx_info("ts1_source=%x\n", dev->current_pcb_config.ts1_source);
cx231xx_info("ts2_source=%x\n", dev->current_pcb_config.ts2_source);
cx231xx_info("analog_source=%x\n",
dev->current_pcb_config.analog_source);
/*******************************************************************/
if (pcb_debug) {
cx231xx_info("SC(0x00) register = 0x%x\n", config_info);
cx231xx_info("scenario %d\n",
(dev->current_pcb_config.index) + 1);
cx231xx_info("type=%x\n", dev->current_pcb_config.type);
cx231xx_info("mode=%x\n", dev->current_pcb_config.mode);
cx231xx_info("speed=%x\n", dev->current_pcb_config.speed);
cx231xx_info("ts1_source=%x\n",
dev->current_pcb_config.ts1_source);
cx231xx_info("ts2_source=%x\n",
dev->current_pcb_config.ts2_source);
cx231xx_info("analog_source=%x\n",
dev->current_pcb_config.analog_source);
}

return 0;
}

0 comments on commit 198a570

Please sign in to comment.