From 272f66a045dd7363c586745f3cd1b9580546716a Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Sun, 12 Feb 2006 04:51:29 +0100 Subject: Fixed saa7134 ALSA initialization with multiple cards From: Ricardo Cerqueira When multiple cards were installed, only the first card would have audio initialized, because only the first position in the array parameter defaulted to "1" To make things worse, the "enable" parameter wasn't enabled, so there was no workaround. Signed-off-by: Ricardo Cerqueira --- linux/drivers/media/video/saa7134/saa7134-alsa.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c index 1339b18ad..5f1f32ecb 100644 --- a/linux/drivers/media/video/saa7134/saa7134-alsa.c +++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c @@ -57,15 +57,18 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]"); static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ -static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0}; +static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1}; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) static int dummy; module_param_array(index, int, dummy, 0444); +module_param_array(enable, int, dummy, 0444); #else module_param_array(index, int, NULL, 0444); +module_param_array(enable, int, NULL, 0444); #endif MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); +MODULE_PARM_DESC(enable, "Enable (or not) the SAA7134 capture interface(s)."); #define dprintk(fmt, arg...) if (debug) \ printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg) -- cgit v1.2.3 From 7bd11e9006dbf97f22d4670078f7a9dd6ca475e5 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Sun, 12 Feb 2006 17:01:56 +0100 Subject: remote control codes for BTTV_BOARD_CONTVFMI From: BoyZonder The remote control interface for this board is the same as the one for BTTV_BOARD_CONCEPTRONIC_CTVFMI2 Signed-off-by: Ricardo Cerqueira --- linux/drivers/media/video/bttv-input.c | 1 + 1 file changed, 1 insertion(+) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/video/bttv-input.c b/linux/drivers/media/video/bttv-input.c index 245fccc8e..8a619ddb1 100644 --- a/linux/drivers/media/video/bttv-input.c +++ b/linux/drivers/media/video/bttv-input.c @@ -330,6 +330,7 @@ int bttv_input_init(struct bttv *btv) ir->polling = 50; // ms break; case BTTV_BOARD_CONCEPTRONIC_CTVFMI2: + case BTTV_BOARD_CONTVFMI: ir_codes = ir_codes_pixelview; ir->mask_keycode = 0x001F00; ir->mask_keyup = 0x006000; -- cgit v1.2.3