Attachment #25051 for bug #15184

View | Details | Raw Unified | Return to bug 15184
Collapse All | Expand All

Lines 388-394 int __devinit init_bttv_i2c(struct bttv Link Here

(-)linux-2.6.32.orig/drivers/media/video/bt8xx/bttv-i2c.c (-2 / +6 lines)
388	if (0 == btv->i2c_rc && i2c_scan)	388	if (0 == btv->i2c_rc && i2c_scan)
389	do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);	389	do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);
390		390
391	/* Instantiate the IR receiver device, if present */	391	return btv->i2c_rc;
		392	}
		393
		394	/* Instantiate the I2C IR receiver device, if present */
		395	void __devinit init_bttv_i2c_ir(struct bttv *btv)
		396	{
392	if (0 == btv->i2c_rc) {	397	if (0 == btv->i2c_rc) {
393	struct i2c_board_info info;	398	struct i2c_board_info info;
394	/* The external IR receiver is at i2c address 0x34 (0x35 for	399	/* The external IR receiver is at i2c address 0x34 (0x35 for
Lines 408-414 int __devinit init_bttv_i2c(struct bttv Link Here
408	strlcpy(info.type, "ir_video", I2C_NAME_SIZE);	413	strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
409	i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);	414	i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);
410	}	415	}
411	return btv->i2c_rc;
412	}	416	}
413		417
414	int __devexit fini_bttv_i2c(struct bttv *btv)	418	int __devexit fini_bttv_i2c(struct bttv *btv)

Lines 279-284 extern unsigned int bttv_debug; Link Here

(-)linux-2.6.32.orig/drivers/media/video/bt8xx/bttvp.h (+1 lines)
279	extern unsigned int bttv_gpio;	279	extern unsigned int bttv_gpio;
280	extern void bttv_gpio_tracking(struct bttv btv, char comment);	280	extern void bttv_gpio_tracking(struct bttv btv, char comment);
281	extern int init_bttv_i2c(struct bttv *btv);	281	extern int init_bttv_i2c(struct bttv *btv);
		282	extern void init_bttv_i2c_ir(struct bttv *btv);
282	extern int fini_bttv_i2c(struct bttv *btv);	283	extern int fini_bttv_i2c(struct bttv *btv);
283		284
284	#define bttv_printk if (bttv_verbose) printk	285	#define bttv_printk if (bttv_verbose) printk




static int radio_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
static int vbi_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
static int debug_latency;
static int disable_ir;

static unsigned int fdsr;


module_param(bttv_debug,        int, 0644);
module_param(irq_debug,         int, 0644);
module_param(debug_latency,     int, 0644);
module_param(disable_ir,        int, 0444);

module_param(fdsr,              int, 0444);
module_param(gbuffers,          int, 0444);

MODULE_PARM_DESC(bttv_gpio,"log gpio changes, default is 0 (no)");
MODULE_PARM_DESC(bttv_debug,"debug messages, default is 0 (no)");
MODULE_PARM_DESC(irq_debug,"irq handler debug messages, default is 0 (no)");
MODULE_PARM_DESC(disable_ir, "disable infrared remote support");
MODULE_PARM_DESC(gbuffers,"number of capture buffers. range 2-32, default 8");
MODULE_PARM_DESC(gbufsize,"size of the capture buffers, default is 0x208000");
MODULE_PARM_DESC(reset_crop,"reset cropping parameters at open(), default "

		request_modules(btv);
	}

	if (!disable_ir) {
		init_bttv_i2c_ir(btv);
		bttv_input_init(btv);
	}

	/* everything is fine */
	bttv_num++;

Return to bug 15184

Lines 81-86 static int video_nr[BTTV_MAX] = { [0 ... Link Here

(-)linux-2.6.32.orig/drivers/media/video/bt8xx/bttv-driver.c (-1 / +7 lines)
81	static int radio_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };	81	static int radio_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
82	static int vbi_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };	82	static int vbi_nr[BTTV_MAX] = { [0 ... (BTTV_MAX-1)] = -1 };
83	static int debug_latency;	83	static int debug_latency;
		84	static int disable_ir;
84		85
85	static unsigned int fdsr;	86	static unsigned int fdsr;
86		87
Lines 107-112 module_param(bttv_gpio, int, 064 Link Here
107	module_param(bttv_debug, int, 0644);	108	module_param(bttv_debug, int, 0644);
108	module_param(irq_debug, int, 0644);	109	module_param(irq_debug, int, 0644);
109	module_param(debug_latency, int, 0644);	110	module_param(debug_latency, int, 0644);
		111	module_param(disable_ir, int, 0444);
110		112
111	module_param(fdsr, int, 0444);	113	module_param(fdsr, int, 0444);
112	module_param(gbuffers, int, 0444);	114	module_param(gbuffers, int, 0444);
Lines 139-144 MODULE_PARM_DESC(bttv_verbose,"verbose s Link Here
139	MODULE_PARM_DESC(bttv_gpio,"log gpio changes, default is 0 (no)");	141	MODULE_PARM_DESC(bttv_gpio,"log gpio changes, default is 0 (no)");
140	MODULE_PARM_DESC(bttv_debug,"debug messages, default is 0 (no)");	142	MODULE_PARM_DESC(bttv_debug,"debug messages, default is 0 (no)");
141	MODULE_PARM_DESC(irq_debug,"irq handler debug messages, default is 0 (no)");	143	MODULE_PARM_DESC(irq_debug,"irq handler debug messages, default is 0 (no)");
		144	MODULE_PARM_DESC(disable_ir, "disable infrared remote support");
142	MODULE_PARM_DESC(gbuffers,"number of capture buffers. range 2-32, default 8");	145	MODULE_PARM_DESC(gbuffers,"number of capture buffers. range 2-32, default 8");
143	MODULE_PARM_DESC(gbufsize,"size of the capture buffers, default is 0x208000");	146	MODULE_PARM_DESC(gbufsize,"size of the capture buffers, default is 0x208000");
144	MODULE_PARM_DESC(reset_crop,"reset cropping parameters at open(), default "	147	MODULE_PARM_DESC(reset_crop,"reset cropping parameters at open(), default "
Lines 4468-4474 static int __devinit bttv_probe(struct p Link Here
4468	request_modules(btv);	4471	request_modules(btv);
4469	}	4472	}
4470		4473
4471	bttv_input_init(btv);	4474	if (!disable_ir) {
		4475	init_bttv_i2c_ir(btv);
		4476	bttv_input_init(btv);
		4477	}
4472		4478
4473	/* everything is fine */	4479	/* everything is fine */
4474	bttv_num++;	4480	bttv_num++;