Skip to content

L
linux-davinci
Commit 3acf2809 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files
Options

[PATCH] v4l: 886: renamed common structures to em28xx 

- Renamed common structures to em28xx
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e0ec29b7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 686 additions and 685 deletions
drivers/media/video/em28xx/em28xx-cards.c
View file @ 3acf2809
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "em28xx.h" #include "em28xx.h"
struct em2820_board em2820_boards[] = { struct em28xx_board em28xx_boards[] = {
[EM2800_BOARD_UNKNOWN] = { [EM2800_BOARD_UNKNOWN] = {
.name = "Unknown EM2800 video grabber", .name = "Unknown EM2800 video grabber",
.is_em2800 = 1, .is_em2800 = 1,
...@@ -42,13 +42,13 @@ struct em2820_board em2820_boards[] = { ...@@ -42,13 +42,13 @@ struct em2820_board em2820_boards[] = {
.norm = VIDEO_MODE_PAL, .norm = VIDEO_MODE_PAL,
.tda9887_conf = TDA9887_PRESENT, .tda9887_conf = TDA9887_PRESENT,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7113, .decoder = EM28XX_SAA7113,
.input = {{ .input = {{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
...@@ -60,13 +60,13 @@ struct em2820_board em2820_boards[] = { ...@@ -60,13 +60,13 @@ struct em2820_board em2820_boards[] = {
.norm = VIDEO_MODE_PAL, .norm = VIDEO_MODE_PAL,
.tda9887_conf = TDA9887_PRESENT, .tda9887_conf = TDA9887_PRESENT,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7113, .decoder = EM28XX_SAA7113,
.input = {{ .input = {{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
...@@ -78,17 +78,17 @@ struct em2820_board em2820_boards[] = { ...@@ -78,17 +78,17 @@ struct em2820_board em2820_boards[] = {
.tuner_type = TUNER_LG_PAL_NEW_TAPC, .tuner_type = TUNER_LG_PAL_NEW_TAPC,
.tda9887_conf = TDA9887_PRESENT, .tda9887_conf = TDA9887_PRESENT,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7113, .decoder = EM28XX_SAA7113,
.input = {{ .input = {{
.type = EM2820_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 2, .vmux = 2,
.amux = 0, .amux = 0,
},{ },{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
...@@ -100,17 +100,17 @@ struct em2820_board em2820_boards[] = { ...@@ -100,17 +100,17 @@ struct em2820_board em2820_boards[] = {
.tuner_type = TUNER_LG_PAL_NEW_TAPC, .tuner_type = TUNER_LG_PAL_NEW_TAPC,
.tda9887_conf = TDA9887_PRESENT, .tda9887_conf = TDA9887_PRESENT,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7113, .decoder = EM28XX_SAA7113,
.input = {{ .input = {{
.type = EM2820_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 2, .vmux = 2,
.amux = 0, .amux = 0,
},{ },{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
...@@ -122,15 +122,15 @@ struct em2820_board em2820_boards[] = { ...@@ -122,15 +122,15 @@ struct em2820_board em2820_boards[] = {
.tuner_type = TUNER_PHILIPS_FM1236_MK3, .tuner_type = TUNER_PHILIPS_FM1236_MK3,
.tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_TVP5150, .decoder = EM28XX_TVP5150,
.has_msp34xx = 1, .has_msp34xx = 1,
/*FIXME: S-Video not tested */ /*FIXME: S-Video not tested */
.input = {{ .input = {{
.type = EM2820_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
.amux = 0, .amux = 0,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 2, .vmux = 2,
.amux = 1, .amux = 1,
}}, }},
...@@ -142,17 +142,17 @@ struct em2820_board em2820_boards[] = { ...@@ -142,17 +142,17 @@ struct em2820_board em2820_boards[] = {
.tuner_type = TUNER_LG_PAL_NEW_TAPC, .tuner_type = TUNER_LG_PAL_NEW_TAPC,
.tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7114, .decoder = EM28XX_SAA7114,
.input = {{ .input = {{
.type = EM2820_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 4, .vmux = 4,
.amux = 0, .amux = 0,
},{ },{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
...@@ -165,17 +165,17 @@ struct em2820_board em2820_boards[] = { ...@@ -165,17 +165,17 @@ struct em2820_board em2820_boards[] = {
.tuner_type = TUNER_LG_PAL_NEW_TAPC, .tuner_type = TUNER_LG_PAL_NEW_TAPC,
.tda9887_conf = TDA9887_PRESENT, .tda9887_conf = TDA9887_PRESENT,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7113, .decoder = EM28XX_SAA7113,
.input = {{ .input = {{
.type = EM2820_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 2, .vmux = 2,
.amux = 0, .amux = 0,
},{ },{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
...@@ -188,17 +188,17 @@ struct em2820_board em2820_boards[] = { ...@@ -188,17 +188,17 @@ struct em2820_board em2820_boards[] = {
.tuner_type = TUNER_LG_PAL_NEW_TAPC, .tuner_type = TUNER_LG_PAL_NEW_TAPC,
.tda9887_conf = TDA9887_PRESENT, .tda9887_conf = TDA9887_PRESENT,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7113, .decoder = EM28XX_SAA7113,
.input = {{ .input = {{
.type = EM2820_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 2, .vmux = 2,
.amux = 0, .amux = 0,
},{ },{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
...@@ -211,17 +211,17 @@ struct em2820_board em2820_boards[] = { ...@@ -211,17 +211,17 @@ struct em2820_board em2820_boards[] = {
.tuner_type = TUNER_PHILIPS_ATSC, .tuner_type = TUNER_PHILIPS_ATSC,
.tda9887_conf = TDA9887_PRESENT, .tda9887_conf = TDA9887_PRESENT,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7113, .decoder = EM28XX_SAA7113,
.input = {{ .input = {{
.type = EM2820_VMUX_TELEVISION, .type = EM28XX_VMUX_TELEVISION,
.vmux = 2, .vmux = 2,
.amux = 0, .amux = 0,
},{ },{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
...@@ -231,22 +231,22 @@ struct em2820_board em2820_boards[] = { ...@@ -231,22 +231,22 @@ struct em2820_board em2820_boards[] = {
.vchannels = 3, .vchannels = 3,
.norm = VIDEO_MODE_PAL, .norm = VIDEO_MODE_PAL,
.has_tuner = 0, .has_tuner = 0,
.decoder = EM2820_SAA7113, .decoder = EM28XX_SAA7113,
.input = {{ .input = {{
.type = EM2820_VMUX_COMPOSITE1, .type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0, .vmux = 0,
.amux = 1, .amux = 1,
},{ },{
.type = EM2820_VMUX_SVIDEO, .type = EM28XX_VMUX_SVIDEO,
.vmux = 9, .vmux = 9,
.amux = 1, .amux = 1,
}}, }},
}, },
}; };
const unsigned int em2820_bcount = ARRAY_SIZE(em2820_boards); const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
/* table of devices that work with this driver */ /* table of devices that work with this driver */
struct usb_device_id em2820_id_table [] = { struct usb_device_id em28xx_id_table [] = {
{ USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN }, { USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN },
{ USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_MSI_VOX_USB_2 }, { USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_MSI_VOX_USB_2 },
{ USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 }, { USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },
...@@ -256,7 +256,7 @@ struct usb_device_id em2820_id_table [] = { ...@@ -256,7 +256,7 @@ struct usb_device_id em2820_id_table [] = {
{ }, { },
}; };
void em2820_card_setup(struct em2820 *dev) void em28xx_card_setup(struct em28xx *dev)
{ {
/* request some modules */ /* request some modules */
if (dev->model == EM2820_BOARD_HAUPPAUGE_WINTV_USB_2) { if (dev->model == EM2820_BOARD_HAUPPAUGE_WINTV_USB_2) {
...@@ -274,14 +274,14 @@ void em2820_card_setup(struct em2820 *dev) ...@@ -274,14 +274,14 @@ void em2820_card_setup(struct em2820 *dev)
if (tv.audio_processor == AUDIO_CHIP_MSP34XX) { if (tv.audio_processor == AUDIO_CHIP_MSP34XX) {
dev->has_msp34xx=1; dev->has_msp34xx=1;
} else dev->has_msp34xx=0; } else dev->has_msp34xx=0;
em2820_write_regs_req(dev,0x06,0x00,"\x40",1);// Serial Bus Frequency Select Register em28xx_write_regs_req(dev,0x06,0x00,"\x40",1);// Serial Bus Frequency Select Register
em2820_write_regs_req(dev,0x0f,0x00,"\x87",1);// XCLK Frequency Select Register em28xx_write_regs_req(dev,0x0f,0x00,"\x87",1);// XCLK Frequency Select Register
em2820_write_regs_req(dev,0x88,0x0d,"\xd0",1); em28xx_write_regs_req(dev,0x88,0x0d,"\xd0",1);
} }
} }
EXPORT_SYMBOL(em2820_boards); EXPORT_SYMBOL(em28xx_boards);
EXPORT_SYMBOL(em2820_bcount); EXPORT_SYMBOL(em28xx_bcount);
EXPORT_SYMBOL(em2820_id_table); EXPORT_SYMBOL(em28xx_id_table);
MODULE_DEVICE_TABLE (usb, em2820_id_table); MODULE_DEVICE_TABLE (usb, em28xx_id_table);
drivers/media/video/em28xx/em28xx-core.c
View file @ 3acf2809
This diff is collapsed.
drivers/media/video/em28xx/em28xx-i2c.c
View file @ 3acf2809
This diff is collapsed.
drivers/media/video/em28xx/em28xx-input.c
View file @ 3acf2809
...@@ -142,7 +142,7 @@ static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) ...@@ -142,7 +142,7 @@ static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir)
{ {
if (disable_ir) { if (disable_ir) {
ir->get_key=NULL; ir->get_key=NULL;
...@@ -159,7 +159,7 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir) ...@@ -159,7 +159,7 @@ void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir)
case (EM2820_BOARD_TERRATEC_CINERGY_250): case (EM2820_BOARD_TERRATEC_CINERGY_250):
ir->ir_codes = ir_codes_em_terratec; ir->ir_codes = ir_codes_em_terratec;
ir->get_key = get_key_terratec; ir->get_key = get_key_terratec;
snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM2820 Terratec)"); snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Terratec)");
break; break;
case (EM2820_BOARD_PINNACLE_USB_2): case (EM2820_BOARD_PINNACLE_USB_2):
break; break;
......
drivers/media/video/em28xx/em28xx-video.c
View file @ 3acf2809
This diff is collapsed.
drivers/media/video/em28xx/em28xx.h
View file @ 3acf2809
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment