git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
em28xx
/
em28xx-cards.c
diff --git
a/drivers/media/video/em28xx/em28xx-cards.c
b/drivers/media/video/em28xx/em28xx-cards.c
index
3ba3439
..
ed882eb
100644
(file)
--- a/
drivers/media/video/em28xx/em28xx-cards.c
+++ b/
drivers/media/video/em28xx/em28xx-cards.c
@@
-3,7
+3,7
@@
Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
Markus Rechberger <mrechberger@gmail.com>
Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it>
Markus Rechberger <mrechberger@gmail.com>
- Mauro Carvalho Chehab <mchehab@
brturbo.com.br
>
+ Mauro Carvalho Chehab <mchehab@
infradead.org
>
Sascha Sommer <saschasommer@freenet.de>
This program is free software; you can redistribute it and/or modify
Sascha Sommer <saschasommer@freenet.de>
This program is free software; you can redistribute it and/or modify
@@
-29,6
+29,8
@@
#include <linux/usb.h>
#include <media/tuner.h>
#include <media/msp3400.h>
#include <linux/usb.h>
#include <media/tuner.h>
#include <media/msp3400.h>
+#include <media/saa7115.h>
+#include <media/tvp5150.h>
#include <media/tveeprom.h>
#include <media/audiochip.h>
#include <media/v4l2-common.h>
#include <media/tveeprom.h>
#include <media/audiochip.h>
#include <media/v4l2-common.h>
@@
-46,11
+48,11
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_COMPOSITE1,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-64,11
+66,11
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_COMPOSITE1,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-82,11
+84,11
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_COMPOSITE1,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-100,15
+102,15
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
- .vmux = 2,
+ .vmux =
SAA7115_COMPOSITE
2,
.amux = 1,
},{
.type = EM28XX_VMUX_COMPOSITE1,
.amux = 1,
},{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-122,15
+124,15
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
- .vmux = 2,
+ .vmux =
SAA7115_COMPOSITE
2,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-146,11
+148,11
@@
struct em28xx_board em28xx_boards[] = {
/*FIXME: S-Video not tested */
.input = {{
.type = EM28XX_VMUX_TELEVISION,
/*FIXME: S-Video not tested */
.input = {{
.type = EM28XX_VMUX_TELEVISION,
- .vmux = 0,
+ .vmux =
TVP5150_COMPOSITE
0,
.amux = MSP_INPUT_DEFAULT,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = MSP_INPUT_DEFAULT,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
2
,
+ .vmux =
TVP5150_SVIDEO
,
.amux = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),
}},
.amux = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
MSP_DSP_IN_SCART, MSP_DSP_IN_SCART),
}},
@@
-165,15
+167,15
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7114,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
.decoder = EM28XX_SAA7114,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
- .vmux = 4,
+ .vmux =
SAA7115_COMPOSITE
4,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-188,15
+190,15
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
- .vmux = 2,
+ .vmux =
SAA7115_COMPOSITE
2,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-211,15
+213,15
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
- .vmux = 2,
+ .vmux =
SAA7115_COMPOSITE
2,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-234,15
+236,15
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_TELEVISION,
- .vmux = 2,
+ .vmux =
SAA7115_COMPOSITE
2,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
.amux = 0,
},{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-254,11
+256,11
@@
struct em28xx_board em28xx_boards[] = {
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_COMPOSITE1,
.decoder = EM28XX_SAA7113,
.input = {{
.type = EM28XX_VMUX_COMPOSITE1,
- .vmux = 0,
+ .vmux =
SAA7115_COMPOSITE
0,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
.amux = 1,
},{
.type = EM28XX_VMUX_SVIDEO,
- .vmux =
9
,
+ .vmux =
SAA7115_SVIDEO3
,
.amux = 1,
}},
},
.amux = 1,
}},
},
@@
-324,8
+326,4
@@
void em28xx_card_setup(struct em28xx *dev)
}
}
}
}
-EXPORT_SYMBOL(em28xx_boards);
-EXPORT_SYMBOL(em28xx_bcount);
-EXPORT_SYMBOL(em28xx_id_table);
-
MODULE_DEVICE_TABLE (usb, em28xx_id_table);
MODULE_DEVICE_TABLE (usb, em28xx_id_table);