Skip to content

L
linux
Commit 3e746831 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h
parents 6825fbc4 e97f4677
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 28013 additions and 11214 deletions
Documentation/DocBook/dvb/dvbapi.xml
View file @ 3e746831
......@@ -29,6 +29,14 @@
<revhistory>
<!-- Put document revisions here, newest first. -->
<revision>
<revnumber>2.0.2</revnumber>
<date>2009-10-25</date>
<authorinitials>mcc</authorinitials>
<revremark>
documents FE_SET_FRONTEND_TUNE_MODE and FE_DISHETWORK_SEND_LEGACY_CMD ioctls.
</revremark>
</revision>
<revision>
<revnumber>2.0.1</revnumber>
<date>2009-09-16</date>
......@@ -85,3 +93,8 @@ Added ISDB-T test originally written by Patrick Boettcher
&sub-examples;
</chapter>
<!-- END OF CHAPTERS -->
<appendix id="frontend_h">
<title>DVB Frontend Header File</title>
&sub-frontend-h;
</appendix>
Documentation/DocBook/dvb/isdbt.xml → Documentation/DocBook/dvb/dvbproperty.xml
View file @ 3e746831
<section id="FE_GET_PROPERTY">
<title>FE_GET_PROPERTY/FE_SET_PROPERTY</title>
<section id="isdbt">
<title>ISDB-T frontend</title>
<para>This section describes shortly what are the possible parameters in the Linux
......@@ -312,3 +315,4 @@
</section>
</section>
</section>
</section>
Documentation/DocBook/dvb/frontend.h.xml 0 → 100644
View file @ 3e746831
This diff is collapsed.
Documentation/DocBook/dvb/frontend.xml
View file @ 3e746831
This diff is collapsed.
Documentation/DocBook/media-entities.tmpl
View file @ 3e746831
......@@ -280,7 +280,7 @@
<!ENTITY sub-v4l2 SYSTEM "v4l/v4l2.xml">
<!ENTITY sub-intro SYSTEM "dvb/intro.xml">
<!ENTITY sub-frontend SYSTEM "dvb/frontend.xml">
<!ENTITY sub-isdbt SYSTEM "dvb/isdbt.xml">
<!ENTITY sub-dvbproperty SYSTEM "dvb/dvbproperty.xml">
<!ENTITY sub-demux SYSTEM "dvb/demux.xml">
<!ENTITY sub-video SYSTEM "dvb/video.xml">
<!ENTITY sub-audio SYSTEM "dvb/audio.xml">
......@@ -288,6 +288,7 @@
<!ENTITY sub-net SYSTEM "dvb/net.xml">
<!ENTITY sub-kdapi SYSTEM "dvb/kdapi.xml">
<!ENTITY sub-examples SYSTEM "dvb/examples.xml">
<!ENTITY sub-frontend-h SYSTEM "dvb/frontend.h.xml">
<!ENTITY sub-dvbapi SYSTEM "dvb/dvbapi.xml">
<!ENTITY sub-media SYSTEM "media.xml">
<!ENTITY sub-media-entities SYSTEM "media-entities.tmpl">
......
Documentation/DocBook/v4l/controls.xml
View file @ 3e746831
......@@ -280,11 +280,29 @@ minimum value disables backlight compensation.</entry>
<constant>V4L2_COLORFX_BW</constant> (1) and
<constant>V4L2_COLORFX_SEPIA</constant> (2).</entry>
</row>
<row>
<entry><constant>V4L2_CID_ROTATE</constant></entry>
<entry>integer</entry>
<entry>Rotates the image by specified angle. Common angles are 90,
270 and 180. Rotating the image to 90 and 270 will reverse the height
and width of the display window. It is necessary to set the new height and
width of the picture using the &VIDIOC-S-FMT; ioctl according to
the rotation angle selected.</entry>
</row>
<row>
<entry><constant>V4L2_CID_BG_COLOR</constant></entry>
<entry>integer</entry>
<entry>Sets the background color on the current output device.
Background color needs to be specified in the RGB24 format. The
supplied 32 bit value is interpreted as bits 0-7 Red color information,
bits 8-15 Green color information, bits 16-23 Blue color
information and bits 24-31 must be zero.</entry>
</row>
<row>
<entry><constant>V4L2_CID_LASTP1</constant></entry>
<entry></entry>
<entry>End of the predefined control IDs (currently
<constant>V4L2_CID_COLORFX</constant> + 1).</entry>
<constant>V4L2_CID_BG_COLOR</constant> + 1).</entry>
</row>
<row>
<entry><constant>V4L2_CID_PRIVATE_BASE</constant></entry>
......
Documentation/DocBook/v4l/pixfmt.xml
View file @ 3e746831
......@@ -770,6 +770,11 @@ kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm
<entry>'S920'</entry>
<entry>YUV 4:2:0 format of the gspca sn9c20x driver.</entry>
</row>
<row id="V4L2-PIX-FMT-STV0680">
<entry><constant>V4L2_PIX_FMT_STV0680</constant></entry>
<entry>'S680'</entry>
<entry>Bayer format of the gspca stv0680 driver.</entry>
</row>
<row id="V4L2-PIX-FMT-WNVA">
<entry><constant>V4L2_PIX_FMT_WNVA</constant></entry>
<entry>'WNVA'</entry>
......
Documentation/DocBook/v4l/videodev2.h.xml
View file @ 3e746831
......@@ -363,6 +363,7 @@ struct <link linkend="v4l2-pix-format">v4l2_pix_format</link> {
#define <link linkend="V4L2-PIX-FMT-OV511">V4L2_PIX_FMT_OV511</link> v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
#define <link linkend="V4L2-PIX-FMT-OV518">V4L2_PIX_FMT_OV518</link> v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
#define <link linkend="V4L2-PIX-FMT-TM6000">V4L2_PIX_FMT_TM6000</link> v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
#define <link linkend="V4L2-PIX-FMT-STV0680">V4L2_PIX_FMT_STV0680</link> v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
/*
* F O R M A T E N U M E R A T I O N
......@@ -565,6 +566,7 @@ struct <link linkend="v4l2-framebuffer">v4l2_framebuffer</link> {
#define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010
#define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020
#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040
#define V4L2_FBUF_CAP_SRC_CHROMAKEY 0x0080
/* Flags for the 'flags' field. */
#define V4L2_FBUF_FLAG_PRIMARY 0x0001
#define V4L2_FBUF_FLAG_OVERLAY 0x0002
......@@ -572,6 +574,7 @@ struct <link linkend="v4l2-framebuffer">v4l2_framebuffer</link> {
#define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008
#define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010
#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020
#define V4L2_FBUF_FLAG_SRC_CHROMAKEY 0x0040
struct <link linkend="v4l2-clip">v4l2_clip</link> {
struct <link linkend="v4l2-rect">v4l2_rect</link> c;
......@@ -914,8 +917,10 @@ enum <link linkend="v4l2-colorfx">v4l2_colorfx</link> {
#define V4L2_CID_AUTOBRIGHTNESS (V4L2_CID_BASE+32)
#define V4L2_CID_BAND_STOP_FILTER (V4L2_CID_BASE+33)
#define V4L2_CID_ROTATE (V4L2_CID_BASE+34)
#define V4L2_CID_BG_COLOR (V4L2_CID_BASE+35)
/* last CID + 1 */
#define V4L2_CID_LASTP1 (V4L2_CID_BASE+34)
#define V4L2_CID_LASTP1 (V4L2_CID_BASE+36)
/* MPEG-class control IDs defined by V4L2 */
#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
......
Documentation/DocBook/v4l/vidioc-g-fbuf.xml
View file @ 3e746831
......@@ -336,6 +336,13 @@ alpha value. Alpha blending makes no sense for destructive overlays.</entry>
inverted alpha channel of the framebuffer or VGA signal. Alpha
blending makes no sense for destructive overlays.</entry>
</row>
<row>
<entry><constant>V4L2_FBUF_CAP_SRC_CHROMAKEY</constant></entry>
<entry>0x0080</entry>
<entry>The device supports Source Chroma-keying. Framebuffer pixels
with the chroma-key colors are replaced by video pixels, which is exactly opposite of
<constant>V4L2_FBUF_CAP_CHROMAKEY</constant></entry>
</row>
</tbody>
</tgroup>
</table>
......@@ -411,6 +418,16 @@ images, but with an inverted alpha value. The blend function is:
output = framebuffer pixel * (1 - alpha) + video pixel * alpha. The
actual alpha depth depends on the framebuffer pixel format.</entry>
</row>
<row>
<entry><constant>V4L2_FBUF_FLAG_SRC_CHROMAKEY</constant></entry>
<entry>0x0040</entry>
<entry>Use source chroma-keying. The source chroma-key color is
determined by the <structfield>chromakey</structfield> field of
&v4l2-window; and negotiated with the &VIDIOC-S-FMT; ioctl, see <xref
linkend="overlay" /> and <xref linkend="osd" />.
Both chroma-keying are mutual exclusive to each other, so same
<structfield>chromakey</structfield> field of &v4l2-window; is being used.</entry>
</row>
</tbody>
</tgroup>
</table>
......
Documentation/video4linux/CARDLIST.cx23885
View file @ 3e746831
......@@ -24,3 +24,5 @@
23 -> Magic-Pro ProHDTV Extreme 2 [14f1:8657]
24 -> Hauppauge WinTV-HVR1850 [0070:8541]
25 -> Compro VideoMate E800 [1858:e800]
26 -> Hauppauge WinTV-HVR1290 [0070:8551]
27 -> Mygica X8558 PRO DMB-TH [14f1:8578]
Documentation/video4linux/CARDLIST.cx88
View file @ 3e746831
......@@ -81,3 +81,4 @@
80 -> Hauppauge WinTV-IR Only [0070:9290]
81 -> Leadtek WinFast DTV1800 Hybrid [107d:6654]
82 -> WinFast DTV2000 H rev. J [107d:6f2b]
83 -> Prof 7301 DVB-S/S2 [b034:3034]
Documentation/video4linux/CARDLIST.em28xx
View file @ 3e746831
0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868]
1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2862,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868]
2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]
3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]
4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]
......@@ -69,3 +69,4 @@
71 -> Silvercrest Webcam 1.3mpix (em2820/em2840)
72 -> Gadmei UTV330+ (em2861)
73 -> Reddo DVB-C USB TV Box (em2870)
74 -> Actionmaster/LinXcel/Digitus VC211A (em2800)
Documentation/video4linux/CARDLIST.saa7134
View file @ 3e746831
......@@ -172,3 +172,5 @@
171 -> Beholder BeholdTV X7 [5ace:7595]
172 -> RoverMedia TV Link Pro FM [19d1:0138]
173 -> Zolid Hybrid TV Tuner PCI [1131:2004]
174 -> Asus Europa Hybrid OEM [1043:4847]
175 -> Leadtek Winfast DTV1000S [107d:6655]
Documentation/video4linux/gspca.txt
View file @ 3e746831
......@@ -7,6 +7,7 @@ The modules are:
xxxx vend:prod
----
spca501 0000:0000 MystFromOri Unknown Camera
spca508 0130:0130 Clone Digital Webcam 11043
m5602 0402:5602 ALi Video Camera Controller
spca501 040a:0002 Kodak DVC-325
spca500 040a:0300 Kodak EZ200
......@@ -37,6 +38,7 @@ ov519 041e:405f Creative Live! VISTA VF0330
ov519 041e:4060 Creative Live! VISTA VF0350
ov519 041e:4061 Creative Live! VISTA VF0400
ov519 041e:4064 Creative Live! VISTA VF0420
ov519 041e:4067 Creative Live! Cam Video IM (VF0350)
ov519 041e:4068 Creative Live! VISTA VF0470
spca561 0458:7004 Genius VideoCAM Express V2
sunplus 0458:7006 Genius Dsc 1.3 Smart
......@@ -68,12 +70,12 @@ zc3xx 046d:08a3 Logitech QC Chat
zc3xx 046d:08a6 Logitech QCim
zc3xx 046d:08a7 Logitech QuickCam Image
zc3xx 046d:08a9 Logitech Notebook Deluxe
zc3xx 046d:08aa Labtec Webcam Notebook
zc3xx 046d:08aa Labtec Webcam Notebook
zc3xx 046d:08ac Logitech QuickCam Cool
zc3xx 046d:08ad Logitech QCCommunicate STX
zc3xx 046d:08ae Logitech QuickCam for Notebooks
zc3xx 046d:08af Logitech QuickCam Cool
zc3xx 046d:08b9 Logitech QC IM ???
zc3xx 046d:08b9 Logitech QuickCam Express
zc3xx 046d:08d7 Logitech QCam STX
zc3xx 046d:08d9 Logitech QuickCam IM/Connect
zc3xx 046d:08d8 Logitech Notebook Deluxe
......@@ -82,7 +84,7 @@ zc3xx 046d:08dd Logitech QuickCam for Notebooks
spca500 046d:0900 Logitech Inc. ClickSmart 310
spca500 046d:0901 Logitech Inc. ClickSmart 510
sunplus 046d:0905 Logitech ClickSmart 820
tv8532 046d:0920 QC Express
tv8532 046d:0920 Logitech QuickCam Express
tv8532 046d:0921 Labtec Webcam
spca561 046d:0928 Logitech QC Express Etch2
spca561 046d:0929 Labtec Webcam Elch2
......@@ -91,7 +93,7 @@ spca561 046d:092b Labtec Webcam Plus
spca561 046d:092c Logitech QC chat Elch2
spca561 046d:092d Logitech QC Elch2
spca561 046d:092e Logitech QC Elch2
spca561 046d:092f Logitech QuickCam Express Plus
spca561 046d:092f Logitech QuickCam Express Plus
sunplus 046d:0960 Logitech ClickSmart 420
sunplus 0471:0322 Philips DMVC1300K
zc3xx 0471:0325 Philips SPC 200 NC
......@@ -187,7 +189,6 @@ sonixj 06f8:3004 Hercules Classic Silver
sonixj 06f8:3008 Hercules Deluxe Optical Glass
pac7311 06f8:3009 Hercules Classic Link
spca508 0733:0110 ViewQuest VQ110
spca508 0130:0130 Clone Digital Webcam 11043
spca501 0733:0401 Intel Create and Share
spca501 0733:0402 ViewQuest M318B
spca505 0733:0430 Intel PC Camera Pro
......@@ -202,6 +203,7 @@ spca500 084d:0003 D-Link DSC-350
spca500 08ca:0103 Aiptek PocketDV
sunplus 08ca:0104 Aiptek PocketDVII 1.3
sunplus 08ca:0106 Aiptek Pocket DV3100+
mr97310a 08ca:0110 Trust Spyc@m 100
mr97310a 08ca:0111 Aiptek PenCam VGA+
sunplus 08ca:2008 Aiptek Mini PenCam 2 M
sunplus 08ca:2010 Aiptek PocketCam 3M
......@@ -222,7 +224,7 @@ pac207 093a:2460 Qtec Webcam 100
pac207 093a:2461 HP Webcam
pac207 093a:2463 Philips SPC 220 NC
pac207 093a:2464 Labtec Webcam 1200
pac207 093a:2468 PAC207
pac207 093a:2468 Webcam WB-1400T
pac207 093a:2470 Genius GF112
pac207 093a:2471 Genius VideoCam ge111
pac207 093a:2472 Genius VideoCam ge110
......@@ -230,7 +232,7 @@ pac207 093a:2474 Genius iLook 111
pac207 093a:2476 Genius e-Messenger 112
pac7311 093a:2600 PAC7311 Typhoon
pac7311 093a:2601 Philips SPC 610 NC
pac7311 093a:2603 PAC7312
pac7311 093a:2603 Philips SPC 500 NC
pac7311 093a:2608 Trust WB-3300p
pac7311 093a:260e Gigaware VGA PC Camera, Trust WB-3350p, SIGMA cam 2350
pac7311 093a:260f SnakeCam
......@@ -239,6 +241,7 @@ pac7311 093a:2621 PAC731x
pac7311 093a:2622 Genius Eye 312
pac7311 093a:2624 PAC7302
pac7311 093a:2626 Labtec 2200
pac7311 093a:2628 Genius iLook 300
pac7311 093a:2629 Genious iSlim 300
pac7311 093a:262a Webcam 300k
pac7311 093a:262c Philips SPC 230 NC
......@@ -250,7 +253,7 @@ vc032x 0ac8:0328 A4Tech PK-130MG
zc3xx 0ac8:301b Z-Star zc301b
zc3xx 0ac8:303b Vimicro 0x303b
zc3xx 0ac8:305b Z-star Vimicro zc0305b
zc3xx 0ac8:307b Ldlc VC302+Ov7620
zc3xx 0ac8:307b PC Camera (ZS0211)
vc032x 0ac8:c001 Sony embedded vimicro
vc032x 0ac8:c002 Sony embedded vimicro
vc032x 0ac8:c301 Samsung Q1 Ultra Premium
......
Documentation/video4linux/si4713.txt
View file @ 3e746831
......@@ -164,7 +164,7 @@ Stereo/Mono and RDS subchannels
The device can also be configured using the available sub channels for
transmission. To do that use S/G_MODULATOR ioctl and configure txsubchans properly.
Refer to v4l2-spec for proper use of this ioctl.
Refer to the V4L2 API specification for proper use of this ioctl.
Testing
=======
......
Documentation/video4linux/zr364xx.txt
View file @ 3e746831
......@@ -66,3 +66,4 @@ Vendor Product Distributor Model
0x0a17 0x004e Pentax Optio 50
0x041e 0x405d Creative DiVi CAM 516
0x08ca 0x2102 Aiptek DV T300
0x06d6 0x003d Trust Powerc@m 910Z
drivers/media/common/Makefile
View file @ 3e746831
saa7146-objs := saa7146_i2c.o saa7146_core.o
saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
ir-common-objs := ir-functions.o ir-keymaps.o
ir-common-objs := ir-functions.o ir-keymaps.o ir-keytable.o
obj-y += tuners/
obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
......
drivers/media/common/ir-functions.c
View file @ 3e746831
......@@ -34,22 +34,19 @@ static int repeat = 1;
module_param(repeat, int, 0444);
MODULE_PARM_DESC(repeat,"auto-repeat for IR keys (default: on)");
static int debug; /* debug level (0,1,2) */
module_param(debug, int, 0644);
#define dprintk(level, fmt, arg...) if (debug >= level) \
printk(KERN_DEBUG fmt , ## arg)
int media_ir_debug; /* media_ir_debug level (0,1,2) */
module_param_named(debug, media_ir_debug, int, 0644);
/* -------------------------------------------------------------------------- */
static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
{
if (KEY_RESERVED == ir->keycode) {
printk(KERN_INFO "%s: unknown key: key=0x%02x raw=0x%02x down=%d\n",
dev->name,ir->ir_key,ir->ir_raw,ir->keypressed);
printk(KERN_INFO "%s: unknown key: key=0x%02x down=%d\n",
dev->name, ir->ir_key, ir->keypressed);
return;
}
dprintk(1,"%s: key event code=%d down=%d\n",
IR_dprintk(1,"%s: key event code=%d down=%d\n",
dev->name,ir->keycode,ir->keypressed);
input_report_key(dev,ir->keycode,ir->keypressed);
input_sync(dev);
......@@ -57,39 +54,34 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
/* -------------------------------------------------------------------------- */
void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
int ir_type, struct ir_scancode_table *ir_codes)
{
int i;
ir->ir_type = ir_type;
memset(ir->ir_codes, 0, sizeof(ir->ir_codes));
ir->keytable.size = ir_roundup_tablesize(ir_codes->size);
ir->keytable.scan = kzalloc(ir->keytable.size *
sizeof(struct ir_scancode), GFP_KERNEL);
if (!ir->keytable.scan)
return -ENOMEM;
/*
* FIXME: This is a temporary workaround to use the new IR tables
* with the old approach. Later patches will replace this to a
* proper method
*/
IR_dprintk(1, "Allocated space for %d keycode entries (%zd bytes)\n",
ir->keytable.size,
ir->keytable.size * sizeof(ir->keytable.scan));
if (ir_codes)
for (i = 0; i < ir_codes->size; i++)
if (ir_codes->scan[i].scancode < IR_KEYTAB_SIZE)
ir->ir_codes[ir_codes->scan[i].scancode] = ir_codes->scan[i].keycode;
ir_copy_table(&ir->keytable, ir_codes);
ir_set_keycode_table(dev, &ir->keytable);
dev->keycode = ir->ir_codes;
dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
dev->keycodemax = IR_KEYTAB_SIZE;
for (i = 0; i < IR_KEYTAB_SIZE; i++)
set_bit(ir->ir_codes[i], dev->keybit);
clear_bit(0, dev->keybit);
set_bit(EV_KEY, dev->evbit);
if (repeat)
set_bit(EV_REP, dev->evbit);
return 0;
}
EXPORT_SYMBOL_GPL(ir_input_init);
void ir_input_nokey(struct input_dev *dev, struct ir_input_state *ir)
{
if (ir->keypressed) {
......@@ -100,9 +92,9 @@ void ir_input_nokey(struct input_dev *dev, struct ir_input_state *ir)
EXPORT_SYMBOL_GPL(ir_input_nokey);
void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
u32 ir_key, u32 ir_raw)
u32 ir_key)
{
u32 keycode = IR_KEYCODE(ir->ir_codes, ir_key);
u32 keycode = ir_g_keycode_from_table(dev, ir_key);
if (ir->keypressed && ir->keycode != keycode) {
ir->keypressed = 0;
......@@ -110,7 +102,6 @@ void ir_input_keydown(struct input_dev *dev, struct ir_input_state *ir,
}
if (!ir->keypressed) {
ir->ir_key = ir_key;
ir->ir_raw = ir_raw;
ir->keycode = keycode;
ir->keypressed = 1;
ir_input_key_event(dev,ir);
......@@ -275,7 +266,7 @@ EXPORT_SYMBOL_GPL(ir_decode_biphase);
* saa7134 */
/* decode raw bit pattern to RC5 code */
static u32 ir_rc5_decode(unsigned int code)
u32 ir_rc5_decode(unsigned int code)
{
unsigned int org_code = code;
unsigned int pair;
......@@ -295,15 +286,16 @@ static u32 ir_rc5_decode(unsigned int code)
rc5 |= 1;
break;
case 3:
dprintk(1, "ir-common: ir_rc5_decode(%x) bad code\n", org_code);
IR_dprintk(1, "ir-common: ir_rc5_decode(%x) bad code\n", org_code);
return 0;
}
}
dprintk(1, "ir-common: code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
IR_dprintk(1, "ir-common: code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
"instr=%x\n", rc5, org_code, RC5_START(rc5),
RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
return rc5;
}
EXPORT_SYMBOL_GPL(ir_rc5_decode);
void ir_rc5_timer_end(unsigned long data)
{
......@@ -330,20 +322,20 @@ void ir_rc5_timer_end(unsigned long data)
/* Allow some timer jitter (RC5 is ~24ms anyway so this is ok) */
if (gap < 28000) {
dprintk(1, "ir-common: spurious timer_end\n");
IR_dprintk(1, "ir-common: spurious timer_end\n");
return;
}
if (ir->last_bit < 20) {
/* ignore spurious codes (caused by light/other remotes) */
dprintk(1, "ir-common: short code: %x\n", ir->code);
IR_dprintk(1, "ir-common: short code: %x\n", ir->code);
} else {
ir->code = (ir->code << ir->shift_by) | 1;
rc5 = ir_rc5_decode(ir->code);
/* two start bits? */
if (RC5_START(rc5) != ir->start) {
dprintk(1, "ir-common: rc5 start bits invalid: %u\n", RC5_START(rc5));
IR_dprintk(1, "ir-common: rc5 start bits invalid: %u\n", RC5_START(rc5));
/* right address? */
} else if (RC5_ADDR(rc5) == ir->addr) {
......@@ -353,11 +345,10 @@ void ir_rc5_timer_end(unsigned long data)
/* Good code, decide if repeat/repress */
if (toggle != RC5_TOGGLE(ir->last_rc5) ||
instr != RC5_INSTR(ir->last_rc5)) {
dprintk(1, "ir-common: instruction %x, toggle %x\n", instr,
IR_dprintk(1, "ir-common: instruction %x, toggle %x\n", instr,
toggle);
ir_input_nokey(ir->dev, &ir->ir);
ir_input_keydown(ir->dev, &ir->ir, instr,
instr);
ir_input_keydown(ir->dev, &ir->ir, instr);
}
/* Set/reset key-up timer */
......@@ -376,7 +367,7 @@ void ir_rc5_timer_keyup(unsigned long data)
{
struct card_ir *ir = (struct card_ir *)data;
dprintk(1, "ir-common: key released\n");
IR_dprintk(1, "ir-common: key released\n");
ir_input_nokey(ir->dev, &ir->ir);
}
EXPORT_SYMBOL_GPL(ir_rc5_timer_keyup);
drivers/media/common/ir-keymaps.c
View file @ 3e746831
......@@ -1705,6 +1705,7 @@ static struct ir_scancode ir_codes_winfast[] = {
{ 0x37, KEY_RADIO }, /* FM */
{ 0x38, KEY_DVD },
{ 0x1a, KEY_MODE}, /* change to MCE mode on Y04G0051 */
{ 0x3e, KEY_F21 }, /* MCE +VOL, on Y04G0033 */
{ 0x3a, KEY_F22 }, /* MCE -VOL, on Y04G0033 */
{ 0x3b, KEY_F23 }, /* MCE +CH, on Y04G0033 */
......@@ -1846,6 +1847,76 @@ struct ir_scancode_table ir_codes_hauppauge_new_table = {
};
EXPORT_SYMBOL_GPL(ir_codes_hauppauge_new_table);
/*
* Hauppauge:the newer, gray remotes (seems there are multiple
* slightly different versions), shipped with cx88+ivtv cards.
*
* This table contains the complete RC5 code, instead of just the data part
*/
static struct ir_scancode ir_codes_rc5_hauppauge_new[] = {
/* Keys 0 to 9 */
{ 0x1e00, KEY_0 },
{ 0x1e01, KEY_1 },
{ 0x1e02, KEY_2 },
{ 0x1e03, KEY_3 },
{ 0x1e04, KEY_4 },
{ 0x1e05, KEY_5 },
{ 0x1e06, KEY_6 },
{ 0x1e07, KEY_7 },
{ 0x1e08, KEY_8 },
{ 0x1e09, KEY_9 },
{ 0x1e0a, KEY_TEXT }, /* keypad asterisk as well */
{ 0x1e0b, KEY_RED }, /* red button */
{ 0x1e0c, KEY_RADIO },
{ 0x1e0d, KEY_MENU },
{ 0x1e0e, KEY_SUBTITLE }, /* also the # key */
{ 0x1e0f, KEY_MUTE },
{ 0x1e10, KEY_VOLUMEUP },
{ 0x1e11, KEY_VOLUMEDOWN },
{ 0x1e12, KEY_PREVIOUS }, /* previous channel */
{ 0x1e14, KEY_UP },
{ 0x1e15, KEY_DOWN },
{ 0x1e16, KEY_LEFT },
{ 0x1e17, KEY_RIGHT },
{ 0x1e18, KEY_VIDEO }, /* Videos */
{ 0x1e19, KEY_AUDIO }, /* Music */
/* 0x1e1a: Pictures - presume this means
"Multimedia Home Platform" -
no "PICTURES" key in input.h
*/
{ 0x1e1a, KEY_MHP },
{ 0x1e1b, KEY_EPG }, /* Guide */
{ 0x1e1c, KEY_TV },
{ 0x1e1e, KEY_NEXTSONG }, /* skip >| */
{ 0x1e1f, KEY_EXIT }, /* back/exit */
{ 0x1e20, KEY_CHANNELUP }, /* channel / program + */
{ 0x1e21, KEY_CHANNELDOWN }, /* channel / program - */
{ 0x1e22, KEY_CHANNEL }, /* source (old black remote) */
{ 0x1e24, KEY_PREVIOUSSONG }, /* replay |< */
{ 0x1e25, KEY_ENTER }, /* OK */
{ 0x1e26, KEY_SLEEP }, /* minimize (old black remote) */
{ 0x1e29, KEY_BLUE }, /* blue key */
{ 0x1e2e, KEY_GREEN }, /* green button */
{ 0x1e30, KEY_PAUSE }, /* pause */
{ 0x1e32, KEY_REWIND }, /* backward << */
{ 0x1e34, KEY_FASTFORWARD }, /* forward >> */
{ 0x1e35, KEY_PLAY },
{ 0x1e36, KEY_STOP },
{ 0x1e37, KEY_RECORD }, /* recording */
{ 0x1e38, KEY_YELLOW }, /* yellow key */
{ 0x1e3b, KEY_SELECT }, /* top right button */
{ 0x1e3c, KEY_ZOOM }, /* full */
{ 0x1e3d, KEY_POWER }, /* system power (green button) */
};
struct ir_scancode_table ir_codes_rc5_hauppauge_new_table = {
.scan = ir_codes_rc5_hauppauge_new,
.size = ARRAY_SIZE(ir_codes_rc5_hauppauge_new),
};
EXPORT_SYMBOL_GPL(ir_codes_rc5_hauppauge_new_table);
static struct ir_scancode ir_codes_npgtech[] = {
{ 0x1d, KEY_SWITCHVIDEOMODE }, /* switch inputs */
{ 0x2a, KEY_FRONT },
......@@ -2964,6 +3035,101 @@ struct ir_scancode_table ir_codes_dm1105_nec_table = {
};
EXPORT_SYMBOL_GPL(ir_codes_dm1105_nec_table);
static struct ir_scancode ir_codes_tevii_nec[] = {
{ 0x0a, KEY_POWER2},
{ 0x0c, KEY_MUTE},
{ 0x11, KEY_1},
{ 0x12, KEY_2},
{ 0x13, KEY_3},
{ 0x14, KEY_4},
{ 0x15, KEY_5},
{ 0x16, KEY_6},
{ 0x17, KEY_7},
{ 0x18, KEY_8},
{ 0x19, KEY_9},
{ 0x10, KEY_0},
{ 0x1c, KEY_MENU},
{ 0x0f, KEY_VOLUMEDOWN},
{ 0x1a, KEY_LAST},
{ 0x0e, KEY_OPEN},
{ 0x04, KEY_RECORD},
{ 0x09, KEY_VOLUMEUP},
{ 0x08, KEY_CHANNELUP},
{ 0x07, KEY_PVR},
{ 0x0b, KEY_TIME},
{ 0x02, KEY_RIGHT},
{ 0x03, KEY_LEFT},
{ 0x00, KEY_UP},
{ 0x1f, KEY_OK},
{ 0x01, KEY_DOWN},
{ 0x05, KEY_TUNER},
{ 0x06, KEY_CHANNELDOWN},
{ 0x40, KEY_PLAYPAUSE},
{ 0x1e, KEY_REWIND},
{ 0x1b, KEY_FAVORITES},
{ 0x1d, KEY_BACK},
{ 0x4d, KEY_FASTFORWARD},
{ 0x44, KEY_EPG},
{ 0x4c, KEY_INFO},
{ 0x41, KEY_AB},
{ 0x43, KEY_AUDIO},
{ 0x45, KEY_SUBTITLE},
{ 0x4a, KEY_LIST},
{ 0x46, KEY_F1},
{ 0x47, KEY_F2},
{ 0x5e, KEY_F3},
{ 0x5c, KEY_F4},
{ 0x52, KEY_F5},
{ 0x5a, KEY_F6},
{ 0x56, KEY_MODE},
{ 0x58, KEY_SWITCHVIDEOMODE},
};
struct ir_scancode_table ir_codes_tevii_nec_table = {
.scan = ir_codes_tevii_nec,
.size = ARRAY_SIZE(ir_codes_tevii_nec),
};
EXPORT_SYMBOL_GPL(ir_codes_tevii_nec_table);
static struct ir_scancode ir_codes_tbs_nec[] = {
{ 0x04, KEY_POWER2}, /*power*/
{ 0x14, KEY_MUTE}, /*mute*/
{ 0x07, KEY_1},
{ 0x06, KEY_2},
{ 0x05, KEY_3},
{ 0x0b, KEY_4},
{ 0x0a, KEY_5},
{ 0x09, KEY_6},
{ 0x0f, KEY_7},
{ 0x0e, KEY_8},
{ 0x0d, KEY_9},
{ 0x12, KEY_0},
{ 0x16, KEY_CHANNELUP}, /*ch+*/
{ 0x11, KEY_CHANNELDOWN},/*ch-*/
{ 0x13, KEY_VOLUMEUP}, /*vol+*/
{ 0x0c, KEY_VOLUMEDOWN},/*vol-*/
{ 0x03, KEY_RECORD}, /*rec*/
{ 0x18, KEY_PAUSE}, /*pause*/
{ 0x19, KEY_OK}, /*ok*/
{ 0x1a, KEY_CAMERA}, /* snapshot */
{ 0x01, KEY_UP},
{ 0x10, KEY_LEFT},
{ 0x02, KEY_RIGHT},
{ 0x08, KEY_DOWN},
{ 0x15, KEY_FAVORITES},
{ 0x17, KEY_SUBTITLE},
{ 0x1d, KEY_ZOOM},
{ 0x1f, KEY_EXIT},
{ 0x1e, KEY_MENU},
{ 0x1c, KEY_EPG},
{ 0x00, KEY_PREVIOUS},
{ 0x1b, KEY_MODE},
};
struct ir_scancode_table ir_codes_tbs_nec_table = {
.scan = ir_codes_tbs_nec,
.size = ARRAY_SIZE(ir_codes_tbs_nec),
};
EXPORT_SYMBOL_GPL(ir_codes_tbs_nec_table);
/* Terratec Cinergy Hybrid T USB XS
Devin Heitmueller <dheitmueller@linuxtv.org>
*/
......@@ -3147,3 +3313,4 @@ struct ir_scancode_table ir_codes_gadmei_rm008z_table = {
.size = ARRAY_SIZE(ir_codes_gadmei_rm008z),
};
EXPORT_SYMBOL_GPL(ir_codes_gadmei_rm008z_table);
drivers/media/common/ir-keytable.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/common/saa7146_video.c
View file @ 3e746831
......@@ -1205,6 +1205,13 @@ static int buffer_activate (struct saa7146_dev *dev,
return 0;
}
static void release_all_pagetables(struct saa7146_dev *dev, struct saa7146_buf *buf)
{
saa7146_pgtable_free(dev->pci, &buf->pt[0]);
saa7146_pgtable_free(dev->pci, &buf->pt[1]);
saa7146_pgtable_free(dev->pci, &buf->pt[2]);
}
static int buffer_prepare(struct videobuf_queue *q,
struct videobuf_buffer *vb, enum v4l2_field field)
{
......@@ -1257,16 +1264,12 @@ static int buffer_prepare(struct videobuf_queue *q,
sfmt = format_by_fourcc(dev,buf->fmt->pixelformat);
release_all_pagetables(dev, buf);
if( 0 != IS_PLANAR(sfmt->trans)) {
saa7146_pgtable_free(dev->pci, &buf->pt[0]);
saa7146_pgtable_free(dev->pci, &buf->pt[1]);
saa7146_pgtable_free(dev->pci, &buf->pt[2]);
saa7146_pgtable_alloc(dev->pci, &buf->pt[0]);
saa7146_pgtable_alloc(dev->pci, &buf->pt[1]);
saa7146_pgtable_alloc(dev->pci, &buf->pt[2]);
} else {
saa7146_pgtable_free(dev->pci, &buf->pt[0]);
saa7146_pgtable_alloc(dev->pci, &buf->pt[0]);
}
......@@ -1329,6 +1332,9 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
struct saa7146_buf *buf = (struct saa7146_buf *)vb;
DEB_CAP(("vbuf:%p\n",vb));
release_all_pagetables(dev, buf);
saa7146_dma_free(dev,q,buf);
}
......
drivers/media/common/tuners/Kconfig
View file @ 3e746831
......@@ -172,4 +172,11 @@ config MEDIA_TUNER_MC44S803
help
Say Y here to support the Freescale MC44S803 based tuners
config MEDIA_TUNER_MAX2165
tristate "Maxim MAX2165 silicon tuner"
depends on VIDEO_MEDIA && I2C
default m if MEDIA_TUNER_CUSTOMISE
help
A driver for the silicon tuner MAX2165 from Maxim.
endif # MEDIA_TUNER_CUSTOMISE
drivers/media/common/tuners/Makefile
View file @ 3e746831
......@@ -23,6 +23,7 @@ obj-$(CONFIG_MEDIA_TUNER_MT2131) += mt2131.o
obj-$(CONFIG_MEDIA_TUNER_MXL5005S) += mxl5005s.o
obj-$(CONFIG_MEDIA_TUNER_MXL5007T) += mxl5007t.o
obj-$(CONFIG_MEDIA_TUNER_MC44S803) += mc44s803.o
obj-$(CONFIG_MEDIA_TUNER_MAX2165) += max2165.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
drivers/media/common/tuners/max2165.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/common/tuners/max2165.h 0 → 100644
View file @ 3e746831
/*
* Driver for Maxim MAX2165 silicon tuner
*
* Copyright (c) 2009 David T. L. Wong <davidtlwong@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __MAX2165_H__
#define __MAX2165_H__
struct dvb_frontend;
struct i2c_adapter;
struct max2165_config {
u8 i2c_address;
u8 osc_clk; /* in MHz, selectable values: 4,16,18,20,22,24,26,28 */
};
#if defined(CONFIG_MEDIA_TUNER_MAX2165) || \
(defined(CONFIG_MEDIA_TUNER_MAX2165_MODULE) && defined(MODULE))
extern struct dvb_frontend *max2165_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c,
struct max2165_config *cfg);
#else
static inline struct dvb_frontend *max2165_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c,
struct max2165_config *cfg)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return NULL;
}
#endif
#endif
drivers/media/common/tuners/max2165_priv.h 0 → 100644
View file @ 3e746831
/*
* Driver for Maxim MAX2165 silicon tuner
*
* Copyright (c) 2009 David T. L. Wong <davidtlwong@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __MAX2165_PRIV_H__
#define __MAX2165_PRIV_H__
#define REG_NDIV_INT 0x00
#define REG_NDIV_FRAC2 0x01
#define REG_NDIV_FRAC1 0x02
#define REG_NDIV_FRAC0 0x03
#define REG_TRACK_FILTER 0x04
#define REG_LNA 0x05
#define REG_PLL_CFG 0x06
#define REG_TEST 0x07
#define REG_SHUTDOWN 0x08
#define REG_VCO_CTRL 0x09
#define REG_BASEBAND_CTRL 0x0A
#define REG_DC_OFFSET_CTRL 0x0B
#define REG_DC_OFFSET_DAC 0x0C
#define REG_ROM_TABLE_ADDR 0x0D
/* Read Only Registers */
#define REG_ROM_TABLE_DATA 0x10
#define REG_STATUS 0x11
#define REG_AUTOTUNE 0x12
struct max2165_priv {
struct max2165_config *config;
struct i2c_adapter *i2c;
u32 frequency;
u32 bandwidth;
u8 tf_ntch_low_cfg;
u8 tf_ntch_hi_cfg;
u8 tf_balun_low_ref;
u8 tf_balun_hi_ref;
u8 bb_filter_7mhz_cfg;
u8 bb_filter_8mhz_cfg;
};
#endif
drivers/media/common/tuners/mxl5005s.c
View file @ 3e746831
......@@ -2789,7 +2789,10 @@ static u16 MXL_TuneRF(struct dvb_frontend *fe, u32 RF_Freq)
/* add for 2.6.5 Special setting for QAM */
if (state->Mod_Type == MXL_QAM) {
if (state->RF_IN < 680000000)
if (state->config->qam_gain != 0)
status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN,
state->config->qam_gain);
else if (state->RF_IN < 680000000)
status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 3);
else
status += MXL_ControlWrite(fe, RFSYN_CHP_GAIN, 2);
......
drivers/media/common/tuners/mxl5005s.h
View file @ 3e746831
......@@ -108,6 +108,10 @@ struct mxl5005s_config {
#define MXL_LOW_IF 1
u8 if_mode;
/* Some boards need to override the built-in logic for determining
the gain when in QAM mode (the HVR-1600 is one such case) */
u8 qam_gain;
/* Stuff I don't know what to do with */
u8 AgcMasterByte;
};
......
drivers/media/common/tuners/mxl5007t.c
View file @ 3e746831
......@@ -196,7 +196,7 @@ static void copy_reg_bits(struct reg_pair_t *reg_pair1,
i = j = 0;
while (reg_pair1[i].reg || reg_pair1[i].val) {
while (reg_pair2[j].reg || reg_pair2[j].reg) {
while (reg_pair2[j].reg || reg_pair2[j].val) {
if (reg_pair1[i].reg != reg_pair2[j].reg) {
j++;
continue;
......
drivers/media/common/tuners/tda18271-common.c
View file @ 3e746831
......@@ -326,12 +326,24 @@ int tda18271_init_regs(struct dvb_frontend *fe)
regs[R_EB22] = 0x48;
regs[R_EB23] = 0xb0;
if (priv->small_i2c) {
switch (priv->small_i2c) {
case TDA18271_08_BYTE_CHUNK_INIT:
tda18271_write_regs(fe, 0x00, 0x08);
tda18271_write_regs(fe, 0x08, 0x08);
tda18271_write_regs(fe, 0x10, 0x08);
tda18271_write_regs(fe, 0x18, 0x08);
tda18271_write_regs(fe, 0x20, 0x07);
break;
case TDA18271_16_BYTE_CHUNK_INIT:
tda18271_write_regs(fe, 0x00, 0x10);
tda18271_write_regs(fe, 0x10, 0x10);
tda18271_write_regs(fe, 0x20, 0x07);
} else
break;
case TDA18271_39_BYTE_CHUNK_INIT:
default:
tda18271_write_regs(fe, 0x00, TDA18271_NUM_REGS);
break;
}
/* setup agc1 gain */
regs[R_EB17] = 0x00;
......
drivers/media/common/tuners/tda18271-fe.c
View file @ 3e746831
......@@ -256,8 +256,9 @@ static int tda18271c2_rf_tracking_filters_correction(struct dvb_frontend *fe,
struct tda18271_priv *priv = fe->tuner_priv;
struct tda18271_rf_tracking_filter_cal *map = priv->rf_cal_state;
unsigned char *regs = priv->tda18271_regs;
int tm_current, rfcal_comp, approx, i, ret;
u8 dc_over_dt, rf_tab;
int i, ret;
u8 tm_current, dc_over_dt, rf_tab;
s32 rfcal_comp, approx;
/* power up */
ret = tda18271_set_standby_mode(fe, 0, 0, 0);
......@@ -277,11 +278,11 @@ static int tda18271c2_rf_tracking_filters_correction(struct dvb_frontend *fe,
return i;
if ((0 == map[i].rf3) || (freq / 1000 < map[i].rf2)) {
approx = map[i].rf_a1 *
(freq / 1000 - map[i].rf1) + map[i].rf_b1 + rf_tab;
approx = map[i].rf_a1 * (s32)(freq / 1000 - map[i].rf1) +
map[i].rf_b1 + rf_tab;
} else {
approx = map[i].rf_a2 *
(freq / 1000 - map[i].rf2) + map[i].rf_b2 + rf_tab;
approx = map[i].rf_a2 * (s32)(freq / 1000 - map[i].rf2) +
map[i].rf_b2 + rf_tab;
}
if (approx < 0)
......@@ -292,9 +293,9 @@ static int tda18271c2_rf_tracking_filters_correction(struct dvb_frontend *fe,
tda18271_lookup_map(fe, RF_CAL_DC_OVER_DT, &freq, &dc_over_dt);
/* calculate temperature compensation */
rfcal_comp = dc_over_dt * (tm_current - priv->tm_rfcal) / 1000;
rfcal_comp = dc_over_dt * (s32)(tm_current - priv->tm_rfcal) / 1000;
regs[R_EB14] = approx + rfcal_comp;
regs[R_EB14] = (unsigned char)(approx + rfcal_comp);
ret = tda18271_write_regs(fe, R_EB14, 1);
fail:
return ret;
......@@ -572,6 +573,7 @@ static int tda18271_rf_tracking_filters_init(struct dvb_frontend *fe, u32 freq)
struct tda18271_rf_tracking_filter_cal *map = priv->rf_cal_state;
unsigned char *regs = priv->tda18271_regs;
int bcal, rf, i;
s32 divisor, dividend;
#define RF1 0
#define RF2 1
#define RF3 2
......@@ -610,20 +612,22 @@ static int tda18271_rf_tracking_filters_init(struct dvb_frontend *fe, u32 freq)
switch (rf) {
case RF1:
map[i].rf_a1 = 0;
map[i].rf_b1 = prog_cal[RF1] - prog_tab[RF1];
map[i].rf_b1 = (s32)(prog_cal[RF1] - prog_tab[RF1]);
map[i].rf1 = rf_freq[RF1] / 1000;
break;
case RF2:
map[i].rf_a1 = (prog_cal[RF2] - prog_tab[RF2] -
prog_cal[RF1] + prog_tab[RF1]) /
(s32)((rf_freq[RF2] - rf_freq[RF1]) / 1000);
dividend = (s32)(prog_cal[RF2] - prog_tab[RF2]) -
(s32)(prog_cal[RF1] + prog_tab[RF1]);
divisor = (s32)(rf_freq[RF2] - rf_freq[RF1]) / 1000;
map[i].rf_a1 = (dividend / divisor);
map[i].rf2 = rf_freq[RF2] / 1000;
break;
case RF3:
map[i].rf_a2 = (prog_cal[RF3] - prog_tab[RF3] -
prog_cal[RF2] + prog_tab[RF2]) /
(s32)((rf_freq[RF3] - rf_freq[RF2]) / 1000);
map[i].rf_b2 = prog_cal[RF2] - prog_tab[RF2];
dividend = (s32)(prog_cal[RF3] - prog_tab[RF3]) -
(s32)(prog_cal[RF2] + prog_tab[RF2]);
divisor = (s32)(rf_freq[RF3] - rf_freq[RF2]) / 1000;
map[i].rf_a2 = (dividend / divisor);
map[i].rf_b2 = (s32)(prog_cal[RF2] - prog_tab[RF2]);
map[i].rf3 = rf_freq[RF3] / 1000;
break;
default:
......@@ -1181,6 +1185,48 @@ static int tda18271_get_id(struct dvb_frontend *fe)
return ret;
}
static int tda18271_setup_configuration(struct dvb_frontend *fe,
struct tda18271_config *cfg)
{
struct tda18271_priv *priv = fe->tuner_priv;
priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
priv->config = (cfg) ? cfg->config : 0;
priv->small_i2c = (cfg) ?
cfg->small_i2c : TDA18271_39_BYTE_CHUNK_INIT;
priv->output_opt = (cfg) ?
cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON;
return 0;
}
static inline int tda18271_need_cal_on_startup(struct tda18271_config *cfg)
{
/* tda18271_cal_on_startup == -1 when cal module option is unset */
return ((tda18271_cal_on_startup == -1) ?
/* honor configuration setting */
((cfg) && (cfg->rf_cal_on_startup)) :
/* module option overrides configuration setting */
(tda18271_cal_on_startup)) ? 1 : 0;
}
static int tda18271_set_config(struct dvb_frontend *fe, void *priv_cfg)
{
struct tda18271_config *cfg = (struct tda18271_config *) priv_cfg;
tda18271_setup_configuration(fe, cfg);
if (tda18271_need_cal_on_startup(cfg))
tda18271_init(fe);
/* override default std map with values in config struct */
if ((cfg) && (cfg->std_map))
tda18271_update_std_map(fe, cfg->std_map);
return 0;
}
static struct dvb_tuner_ops tda18271_tuner_ops = {
.info = {
.name = "NXP TDA18271HD",
......@@ -1193,6 +1239,7 @@ static struct dvb_tuner_ops tda18271_tuner_ops = {
.set_params = tda18271_set_params,
.set_analog_params = tda18271_set_analog_params,
.release = tda18271_release,
.set_config = tda18271_set_config,
.get_frequency = tda18271_get_frequency,
.get_bandwidth = tda18271_get_bandwidth,
};
......@@ -1213,33 +1260,14 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
case 0:
goto fail;
case 1:
{
/* new tuner instance */
int rf_cal_on_startup;
priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
priv->config = (cfg) ? cfg->config : 0;
priv->small_i2c = (cfg) ? cfg->small_i2c : 0;
priv->output_opt = (cfg) ?
cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON;
/* tda18271_cal_on_startup == -1 when cal
* module option is unset */
if (tda18271_cal_on_startup == -1) {
/* honor attach-time configuration */
rf_cal_on_startup =
((cfg) && (cfg->rf_cal_on_startup)) ? 1 : 0;
} else {
/* module option overrides attach configuration */
rf_cal_on_startup = tda18271_cal_on_startup;
}
fe->tuner_priv = priv;
tda18271_setup_configuration(fe, cfg);
priv->cal_initialized = false;
mutex_init(&priv->lock);
fe->tuner_priv = priv;
if (tda_fail(tda18271_get_id(fe)))
goto fail;
......@@ -1249,12 +1277,12 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
mutex_lock(&priv->lock);
tda18271_init_regs(fe);
if ((rf_cal_on_startup) && (priv->id == TDA18271HDC2))
if ((tda18271_need_cal_on_startup(cfg)) &&
(priv->id == TDA18271HDC2))
tda18271c2_rf_cal_init(fe);
mutex_unlock(&priv->lock);
break;
}
default:
/* existing tuner instance */
fe->tuner_priv = priv;
......@@ -1271,7 +1299,11 @@ struct dvb_frontend *tda18271_attach(struct dvb_frontend *fe, u8 addr,
priv->small_i2c = cfg->small_i2c;
if (cfg->output_opt)
priv->output_opt = cfg->output_opt;
if (cfg->std_map)
tda18271_update_std_map(fe, cfg->std_map);
}
if (tda18271_need_cal_on_startup(cfg))
tda18271_init(fe);
break;
}
......@@ -1298,7 +1330,7 @@ EXPORT_SYMBOL_GPL(tda18271_attach);
MODULE_DESCRIPTION("NXP TDA18271HD analog / digital tuner driver");
MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
MODULE_LICENSE("GPL");
MODULE_VERSION("0.3");
MODULE_VERSION("0.4");
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
......
drivers/media/common/tuners/tda18271-maps.c
View file @ 3e746831
......@@ -978,6 +978,7 @@ static struct tda18271_cid_target_map tda18271_cid_target[] = {
int tda18271_lookup_cid_target(struct dvb_frontend *fe,
u32 *freq, u8 *cid_target, u16 *count_limit)
{
struct tda18271_priv *priv = fe->tuner_priv;
int i = 0;
while ((tda18271_cid_target[i].rfmax * 1000) < *freq) {
......
drivers/media/common/tuners/tda18271-priv.h
View file @ 3e746831
......@@ -80,10 +80,10 @@ struct tda18271_rf_tracking_filter_cal {
u32 rf1;
u32 rf2;
u32 rf3;
int rf_a1;
int rf_b1;
int rf_a2;
int rf_b2;
s32 rf_a1;
s32 rf_b1;
s32 rf_a2;
s32 rf_b2;
};
enum tda18271_pll {
......@@ -109,11 +109,12 @@ struct tda18271_priv {
enum tda18271_i2c_gate gate;
enum tda18271_ver id;
enum tda18271_output_options output_opt;
enum tda18271_small_i2c small_i2c;
unsigned int config; /* interface to saa713x / tda829x */
unsigned int tm_rfcal;
unsigned int cal_initialized:1;
unsigned int small_i2c:1;
u8 tm_rfcal;
struct tda18271_map_layout *maps;
struct tda18271_std_map std;
......@@ -135,27 +136,37 @@ extern int tda18271_debug;
#define DBG_ADV 8
#define DBG_CAL 16
#define tda_printk(kern, fmt, arg...) \
printk(kern "%s: " fmt, __func__, ##arg)
#define tda_dprintk(lvl, fmt, arg...) do {\
#define tda_printk(st, kern, fmt, arg...) do {\
if (st) { \
struct tda18271_priv *state = st; \
printk(kern "%s: [%d-%04x|%s] " fmt, __func__, \
i2c_adapter_id(state->i2c_props.adap), \
state->i2c_props.addr, \
(state->role == TDA18271_MASTER) \
? "M" : "S", ##arg); \
} else \
printk(kern "%s: " fmt, __func__, ##arg); \
} while (0)
#define tda_dprintk(st, lvl, fmt, arg...) do {\
if (tda18271_debug & lvl) \
tda_printk(KERN_DEBUG, fmt, ##arg); } while (0)
tda_printk(st, KERN_DEBUG, fmt, ##arg); } while (0)
#define tda_info(fmt, arg...) printk(KERN_INFO fmt, ##arg)
#define tda_warn(fmt, arg...) tda_printk(KERN_WARNING, fmt, ##arg)
#define tda_err(fmt, arg...) tda_printk(KERN_ERR, fmt, ##arg)
#define tda_dbg(fmt, arg...) tda_dprintk(DBG_INFO, fmt, ##arg)
#define tda_map(fmt, arg...) tda_dprintk(DBG_MAP, fmt, ##arg)
#define tda_reg(fmt, arg...) tda_dprintk(DBG_REG, fmt, ##arg)
#define tda_cal(fmt, arg...) tda_dprintk(DBG_CAL, fmt, ##arg)
#define tda_warn(fmt, arg...) tda_printk(priv, KERN_WARNING, fmt, ##arg)
#define tda_err(fmt, arg...) tda_printk(priv, KERN_ERR, fmt, ##arg)
#define tda_dbg(fmt, arg...) tda_dprintk(priv, DBG_INFO, fmt, ##arg)
#define tda_map(fmt, arg...) tda_dprintk(priv, DBG_MAP, fmt, ##arg)
#define tda_reg(fmt, arg...) tda_dprintk(priv, DBG_REG, fmt, ##arg)
#define tda_cal(fmt, arg...) tda_dprintk(priv, DBG_CAL, fmt, ##arg)
#define tda_fail(ret) \
({ \
int __ret; \
__ret = (ret < 0); \
if (__ret) \
tda_printk(KERN_ERR, "error %d on line %d\n", ret, __LINE__);\
tda_printk(priv, KERN_ERR, \
"error %d on line %d\n", ret, __LINE__); \
__ret; \
})
......
drivers/media/common/tuners/tda18271.h
View file @ 3e746831
......@@ -78,6 +78,12 @@ enum tda18271_output_options {
TDA18271_OUTPUT_XT_OFF = 2,
};
enum tda18271_small_i2c {
TDA18271_39_BYTE_CHUNK_INIT = 0,
TDA18271_16_BYTE_CHUNK_INIT = 1,
TDA18271_08_BYTE_CHUNK_INIT = 2,
};
struct tda18271_config {
/* override default if freq / std settings (optional) */
struct tda18271_std_map *std_map;
......@@ -91,12 +97,12 @@ struct tda18271_config {
/* output options that can be disabled */
enum tda18271_output_options output_opt;
/* some i2c providers cant write all 39 registers at once */
enum tda18271_small_i2c small_i2c;
/* force rf tracking filter calibration on startup */
unsigned int rf_cal_on_startup:1;
/* some i2c providers cant write all 39 registers at once */
unsigned int small_i2c:1;
/* interface to saa713x / tda829x */
unsigned int config;
};
......
drivers/media/common/tuners/tda8290.c
View file @ 3e746831
......@@ -33,6 +33,7 @@ module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable verbose debug messages");
static int deemphasis_50;
module_param(deemphasis_50, int, 0644);
MODULE_PARM_DESC(deemphasis_50, "0 - 75us deemphasis; 1 - 50us deemphasis");
/* ---------------------------------------------------------------------- */
......
drivers/media/common/tuners/tda9887.c
View file @ 3e746831
......@@ -463,7 +463,7 @@ static int tda9887_set_insmod(struct dvb_frontend *fe)
buf[1] &= ~cQSS;
}
if (adjust >= 0x00 && adjust < 0x20) {
if (adjust < 0x20) {
buf[2] &= ~cTopMask;
buf[2] |= adjust;
}
......
drivers/media/common/tuners/xc5000.c
View file @ 3e746831
......@@ -61,6 +61,7 @@ struct xc5000_priv {
u32 bandwidth;
u8 video_standard;
u8 rf_mode;
u8 radio_input;
};
/* Misc Defines */
......@@ -632,8 +633,12 @@ static int xc5000_set_params(struct dvb_frontend *fe,
struct xc5000_priv *priv = fe->tuner_priv;
int ret;
if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS)
xc_load_fw_and_init_tuner(fe);
if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS) {
if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) {
dprintk(1, "Unable to load firmware and init tuner\n");
return -EINVAL;
}
}
dprintk(1, "%s() frequency=%d (Hz)\n", __func__, params->frequency);
......@@ -739,15 +744,12 @@ static int xc5000_is_firmware_loaded(struct dvb_frontend *fe)
return ret;
}
static int xc5000_set_analog_params(struct dvb_frontend *fe,
static int xc5000_set_tv_freq(struct dvb_frontend *fe,
struct analog_parameters *params)
{
struct xc5000_priv *priv = fe->tuner_priv;
int ret;
if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS)
xc_load_fw_and_init_tuner(fe);
dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n",
__func__, params->frequency);
......@@ -827,6 +829,86 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe,
return 0;
}
static int xc5000_set_radio_freq(struct dvb_frontend *fe,
struct analog_parameters *params)
{
struct xc5000_priv *priv = fe->tuner_priv;
int ret = -EINVAL;
u8 radio_input;
dprintk(1, "%s() frequency=%d (in units of khz)\n",
__func__, params->frequency);
if (priv->radio_input == XC5000_RADIO_NOT_CONFIGURED) {
dprintk(1, "%s() radio input not configured\n", __func__);
return -EINVAL;
}
if (priv->radio_input == XC5000_RADIO_FM1)
radio_input = FM_Radio_INPUT1;
else if (priv->radio_input == XC5000_RADIO_FM2)
radio_input = FM_Radio_INPUT2;
else {
dprintk(1, "%s() unknown radio input %d\n", __func__,
priv->radio_input);
return -EINVAL;
}
priv->freq_hz = params->frequency * 125 / 2;
priv->rf_mode = XC_RF_MODE_AIR;
ret = xc_SetTVStandard(priv, XC5000_Standard[radio_input].VideoMode,
XC5000_Standard[radio_input].AudioMode);
if (ret != XC_RESULT_SUCCESS) {
printk(KERN_ERR "xc5000: xc_SetTVStandard failed\n");
return -EREMOTEIO;
}
ret = xc_SetSignalSource(priv, priv->rf_mode);
if (ret != XC_RESULT_SUCCESS) {
printk(KERN_ERR
"xc5000: xc_SetSignalSource(%d) failed\n",
priv->rf_mode);
return -EREMOTEIO;
}
xc_tune_channel(priv, priv->freq_hz, XC_TUNE_ANALOG);
return 0;
}
static int xc5000_set_analog_params(struct dvb_frontend *fe,
struct analog_parameters *params)
{
struct xc5000_priv *priv = fe->tuner_priv;
int ret = -EINVAL;
if (priv->i2c_props.adap == NULL)
return -EINVAL;
if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS) {
if (xc_load_fw_and_init_tuner(fe) != XC_RESULT_SUCCESS) {
dprintk(1, "Unable to load firmware and init tuner\n");
return -EINVAL;
}
}
switch (params->mode) {
case V4L2_TUNER_RADIO:
ret = xc5000_set_radio_freq(fe, params);
break;
case V4L2_TUNER_ANALOG_TV:
case V4L2_TUNER_DIGITAL_TV:
ret = xc5000_set_tv_freq(fe, params);
break;
}
return ret;
}
static int xc5000_get_frequency(struct dvb_frontend *fe, u32 *freq)
{
struct xc5000_priv *priv = fe->tuner_priv;
......@@ -1000,6 +1082,9 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
priv->if_khz = cfg->if_khz;
}
if (priv->radio_input == 0)
priv->radio_input = cfg->radio_input;
/* Check if firmware has been loaded. It is possible that another
instance of the driver has loaded the firmware.
*/
......
drivers/media/common/tuners/xc5000.h
View file @ 3e746831
......@@ -30,11 +30,17 @@ struct i2c_adapter;
struct xc5000_config {
u8 i2c_address;
u32 if_khz;
u8 radio_input;
};
/* xc5000 callback command */
#define XC5000_TUNER_RESET 0
/* Possible Radio inputs */
#define XC5000_RADIO_NOT_CONFIGURED 0
#define XC5000_RADIO_FM1 1
#define XC5000_RADIO_FM2 2
/* For each bridge framework, when it attaches either analog or digital,
* it has to store a reference back to its _core equivalent structure,
* so that it can service the hardware by steering gpio's etc.
......
drivers/media/dvb/bt8xx/dvb-bt8xx.c
View file @ 3e746831
......@@ -215,7 +215,7 @@ static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend
freq = 2150000; /* satellite IF is 950..2150MHz */
/* decide which VCO to use for the input frequency */
for(i = 1; (i < ARRAY_SIZE(osci)) && (osci[i] < freq); i++);
for(i = 1; (i < ARRAY_SIZE(osci) - 1) && (osci[i] < freq); i++);
printk("cx24108 debug: select vco #%d (f=%d)\n",i,freq);
band=bandsel[i];
/* the gain values must be set by SetSymbolrate */
......
drivers/media/dvb/dm1105/dm1105.c
View file @ 3e746831
......@@ -510,7 +510,7 @@ static void dm1105_emit_key(struct work_struct *work)
data = (ircom >> 8) & 0x7f;
ir_input_keydown(ir->input_dev, &ir->ir, data, data);
ir_input_keydown(ir->input_dev, &ir->ir, data);
ir_input_nokey(ir->input_dev, &ir->ir);
}
......@@ -589,7 +589,12 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
snprintf(dm1105->ir.input_phys, sizeof(dm1105->ir.input_phys),
"pci-%s/ir0", pci_name(dm1105->pdev));
ir_input_init(input_dev, &dm1105->ir.ir, ir_type, ir_codes);
err = ir_input_init(input_dev, &dm1105->ir.ir, ir_type, ir_codes);
if (err < 0) {
input_free_device(input_dev);
return err;
}
input_dev->name = "DVB on-card IR receiver";
input_dev->phys = dm1105->ir.input_phys;
input_dev->id.bustype = BUS_PCI;
......@@ -608,6 +613,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
err = input_register_device(input_dev);
if (err) {
ir_input_free(input_dev);
input_free_device(input_dev);
return err;
}
......@@ -617,8 +623,8 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105)
void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105)
{
ir_input_free(dm1105->ir.input_dev);
input_unregister_device(dm1105->ir.input_dev);
}
static int __devinit dm1105dvb_hw_init(struct dm1105dvb *dm1105dvb)
......
drivers/media/dvb/dvb-core/dvb_demux.c
View file @ 3e746831
......@@ -30,6 +30,7 @@
#include <linux/string.h>
#include <linux/crc32.h>
#include <asm/uaccess.h>
#include <asm/div64.h>
#include "dvb_demux.h"
......@@ -44,6 +45,11 @@ module_param(dvb_demux_tscheck, int, 0644);
MODULE_PARM_DESC(dvb_demux_tscheck,
"enable transport stream continuity and TEI check");
static int dvb_demux_speedcheck;
module_param(dvb_demux_speedcheck, int, 0644);
MODULE_PARM_DESC(dvb_demux_speedcheck,
"enable transport stream speed check");
#define dprintk_tscheck(x...) do { \
if (dvb_demux_tscheck && printk_ratelimit()) \
printk(x); \
......@@ -387,6 +393,39 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
u16 pid = ts_pid(buf);
int dvr_done = 0;
if (dvb_demux_speedcheck) {
struct timespec cur_time, delta_time;
u64 speed_bytes, speed_timedelta;
demux->speed_pkts_cnt++;
/* show speed every SPEED_PKTS_INTERVAL packets */
if (!(demux->speed_pkts_cnt % SPEED_PKTS_INTERVAL)) {
cur_time = current_kernel_time();
if (demux->speed_last_time.tv_sec != 0 &&
demux->speed_last_time.tv_nsec != 0) {
delta_time = timespec_sub(cur_time,
demux->speed_last_time);
speed_bytes = (u64)demux->speed_pkts_cnt
* 188 * 8;
/* convert to 1024 basis */
speed_bytes = 1000 * div64_u64(speed_bytes,
1024);
speed_timedelta =
(u64)timespec_to_ns(&delta_time);
speed_timedelta = div64_u64(speed_timedelta,
1000000); /* nsec -> usec */
printk(KERN_INFO "TS speed %llu Kbits/sec \n",
div64_u64(speed_bytes,
speed_timedelta));
};
demux->speed_last_time = cur_time;
demux->speed_pkts_cnt = 0;
};
};
if (dvb_demux_tscheck) {
if (!demux->cnt_storage)
demux->cnt_storage = vmalloc(MAX_PID + 1);
......
drivers/media/dvb/dvb-core/dvb_demux.h
View file @ 3e746831
......@@ -44,6 +44,8 @@
#define MAX_PID 0x1fff
#define SPEED_PKTS_INTERVAL 50000
struct dvb_demux_filter {
struct dmx_section_filter filter;
u8 maskandmode[DMX_MAX_FILTER_SIZE];
......@@ -131,6 +133,9 @@ struct dvb_demux {
spinlock_t lock;
uint8_t *cnt_storage; /* for TS continuity check */
struct timespec speed_last_time; /* for TS speed check */
uint32_t speed_pkts_cnt; /* for TS speed check */
};
int dvb_dmx_init(struct dvb_demux *dvbdemux);
......
drivers/media/dvb/dvb-core/dvb_frontend.c
View file @ 3e746831
......@@ -895,104 +895,27 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
}
static struct dtv_cmds_h dtv_cmds[] = {
[DTV_TUNE] = {
.name = "DTV_TUNE",
.cmd = DTV_TUNE,
.set = 1,
},
[DTV_CLEAR] = {
.name = "DTV_CLEAR",
.cmd = DTV_CLEAR,
.set = 1,
},
_DTV_CMD(DTV_TUNE, 1, 0),
_DTV_CMD(DTV_CLEAR, 1, 0),
/* Set */
[DTV_FREQUENCY] = {
.name = "DTV_FREQUENCY",
.cmd = DTV_FREQUENCY,
.set = 1,
},
[DTV_BANDWIDTH_HZ] = {
.name = "DTV_BANDWIDTH_HZ",
.cmd = DTV_BANDWIDTH_HZ,
.set = 1,
},
[DTV_MODULATION] = {
.name = "DTV_MODULATION",
.cmd = DTV_MODULATION,
.set = 1,
},
[DTV_INVERSION] = {
.name = "DTV_INVERSION",
.cmd = DTV_INVERSION,
.set = 1,
},
[DTV_DISEQC_MASTER] = {
.name = "DTV_DISEQC_MASTER",
.cmd = DTV_DISEQC_MASTER,
.set = 1,
.buffer = 1,
},
[DTV_SYMBOL_RATE] = {
.name = "DTV_SYMBOL_RATE",
.cmd = DTV_SYMBOL_RATE,
.set = 1,
},
[DTV_INNER_FEC] = {
.name = "DTV_INNER_FEC",
.cmd = DTV_INNER_FEC,
.set = 1,
},
[DTV_VOLTAGE] = {
.name = "DTV_VOLTAGE",
.cmd = DTV_VOLTAGE,
.set = 1,
},
[DTV_TONE] = {
.name = "DTV_TONE",
.cmd = DTV_TONE,
.set = 1,
},
[DTV_PILOT] = {
.name = "DTV_PILOT",
.cmd = DTV_PILOT,
.set = 1,
},
[DTV_ROLLOFF] = {
.name = "DTV_ROLLOFF",
.cmd = DTV_ROLLOFF,
.set = 1,
},
[DTV_DELIVERY_SYSTEM] = {
.name = "DTV_DELIVERY_SYSTEM",
.cmd = DTV_DELIVERY_SYSTEM,
.set = 1,
},
[DTV_HIERARCHY] = {
.name = "DTV_HIERARCHY",
.cmd = DTV_HIERARCHY,
.set = 1,
},
[DTV_CODE_RATE_HP] = {
.name = "DTV_CODE_RATE_HP",
.cmd = DTV_CODE_RATE_HP,
.set = 1,
},
[DTV_CODE_RATE_LP] = {
.name = "DTV_CODE_RATE_LP",
.cmd = DTV_CODE_RATE_LP,
.set = 1,
},
[DTV_GUARD_INTERVAL] = {
.name = "DTV_GUARD_INTERVAL",
.cmd = DTV_GUARD_INTERVAL,
.set = 1,
},
[DTV_TRANSMISSION_MODE] = {
.name = "DTV_TRANSMISSION_MODE",
.cmd = DTV_TRANSMISSION_MODE,
.set = 1,
},
_DTV_CMD(DTV_FREQUENCY, 1, 0),
_DTV_CMD(DTV_BANDWIDTH_HZ, 1, 0),
_DTV_CMD(DTV_MODULATION, 1, 0),
_DTV_CMD(DTV_INVERSION, 1, 0),
_DTV_CMD(DTV_DISEQC_MASTER, 1, 1),
_DTV_CMD(DTV_SYMBOL_RATE, 1, 0),
_DTV_CMD(DTV_INNER_FEC, 1, 0),
_DTV_CMD(DTV_VOLTAGE, 1, 0),
_DTV_CMD(DTV_TONE, 1, 0),
_DTV_CMD(DTV_PILOT, 1, 0),
_DTV_CMD(DTV_ROLLOFF, 1, 0),
_DTV_CMD(DTV_DELIVERY_SYSTEM, 1, 0),
_DTV_CMD(DTV_HIERARCHY, 1, 0),
_DTV_CMD(DTV_CODE_RATE_HP, 1, 0),
_DTV_CMD(DTV_CODE_RATE_LP, 1, 0),
_DTV_CMD(DTV_GUARD_INTERVAL, 1, 0),
_DTV_CMD(DTV_TRANSMISSION_MODE, 1, 0),
_DTV_CMD(DTV_ISDBT_PARTIAL_RECEPTION, 1, 0),
_DTV_CMD(DTV_ISDBT_SOUND_BROADCASTING, 1, 0),
......@@ -1035,43 +958,13 @@ static struct dtv_cmds_h dtv_cmds[] = {
_DTV_CMD(DTV_ISDBS_TS_ID, 1, 0),
/* Get */
[DTV_DISEQC_SLAVE_REPLY] = {
.name = "DTV_DISEQC_SLAVE_REPLY",
.cmd = DTV_DISEQC_SLAVE_REPLY,
.set = 0,
.buffer = 1,
},
[DTV_API_VERSION] = {
.name = "DTV_API_VERSION",
.cmd = DTV_API_VERSION,
.set = 0,
},
[DTV_CODE_RATE_HP] = {
.name = "DTV_CODE_RATE_HP",
.cmd = DTV_CODE_RATE_HP,
.set = 0,
},
[DTV_CODE_RATE_LP] = {
.name = "DTV_CODE_RATE_LP",
.cmd = DTV_CODE_RATE_LP,
.set = 0,
},
[DTV_GUARD_INTERVAL] = {
.name = "DTV_GUARD_INTERVAL",
.cmd = DTV_GUARD_INTERVAL,
.set = 0,
},
[DTV_TRANSMISSION_MODE] = {
.name = "DTV_TRANSMISSION_MODE",
.cmd = DTV_TRANSMISSION_MODE,
.set = 0,
},
[DTV_HIERARCHY] = {
.name = "DTV_HIERARCHY",
.cmd = DTV_HIERARCHY,
.set = 0,
},
_DTV_CMD(DTV_DISEQC_SLAVE_REPLY, 0, 1),
_DTV_CMD(DTV_API_VERSION, 0, 0),
_DTV_CMD(DTV_CODE_RATE_HP, 0, 0),
_DTV_CMD(DTV_CODE_RATE_LP, 0, 0),
_DTV_CMD(DTV_GUARD_INTERVAL, 0, 0),
_DTV_CMD(DTV_TRANSMISSION_MODE, 0, 0),
_DTV_CMD(DTV_HIERARCHY, 0, 0),
};
static void dtv_property_dump(struct dtv_property *tvp)
......@@ -1712,7 +1605,18 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend *fe = dvbdev->priv;
struct dvb_frontend_private *fepriv = fe->frontend_priv;
int err = -EOPNOTSUPP;
int cb_err, err = -EOPNOTSUPP;
if (fe->dvb->fe_ioctl_override) {
cb_err = fe->dvb->fe_ioctl_override(fe, cmd, parg,
DVB_FE_IOCTL_PRE);
if (cb_err < 0)
return cb_err;
if (cb_err > 0)
return 0;
/* fe_ioctl_override returning 0 allows
* dvb-core to continue handling the ioctl */
}
switch (cmd) {
case FE_GET_INFO: {
......@@ -1978,6 +1882,13 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
break;
};
if (fe->dvb->fe_ioctl_override) {
cb_err = fe->dvb->fe_ioctl_override(fe, cmd, parg,
DVB_FE_IOCTL_POST);
if (cb_err < 0)
return cb_err;
}
return err;
}
......
drivers/media/dvb/dvb-core/dvbdev.h
View file @ 3e746831
......@@ -54,6 +54,8 @@
module_param_array(adapter_nr, short, NULL, 0444); \
MODULE_PARM_DESC(adapter_nr, "DVB adapter numbers")
struct dvb_frontend;
struct dvb_adapter {
int num;
struct list_head list_head;
......@@ -69,6 +71,32 @@ struct dvb_adapter {
int mfe_shared; /* indicates mutually exclusive frontends */
struct dvb_device *mfe_dvbdev; /* frontend device in use */
struct mutex mfe_lock; /* access lock for thread creation */
/* Allow the adapter/bridge driver to perform an action before and/or
* after the core handles an ioctl:
*
* DVB_FE_IOCTL_PRE indicates that the ioctl has not yet been handled.
* DVB_FE_IOCTL_POST indicates that the ioctl has been handled.
*
* When DVB_FE_IOCTL_PRE is passed to the callback as the stage arg:
*
* return 0 to allow dvb-core to handle the ioctl.
* return a positive int to prevent dvb-core from handling the ioctl,
* and exit without error.
* return a negative int to prevent dvb-core from handling the ioctl,
* and return that value as an error.
*
* When DVB_FE_IOCTL_POST is passed to the callback as the stage arg:
*
* return 0 to allow the dvb_frontend ioctl handler to exit normally.
* return a negative int to cause the dvb_frontend ioctl handler to
* return that value as an error.
*/
#define DVB_FE_IOCTL_PRE 0
#define DVB_FE_IOCTL_POST 1
int (*fe_ioctl_override)(struct dvb_frontend *fe,
unsigned int cmd, void *parg,
unsigned int stage);
};
......
drivers/media/dvb/dvb-usb/Kconfig
View file @ 3e746831
......@@ -322,3 +322,11 @@ config DVB_USB_FRIIO
depends on DVB_USB
help
Say Y here to support the Japanese DTV receiver Friio.
config DVB_USB_EC168
tristate "E3C EC168 DVB-T USB2.0 support"
depends on DVB_USB && EXPERIMENTAL
select DVB_EC100
select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMISE
help
Say Y here to support the E3C EC168 DVB-T USB2.0 receiver.
drivers/media/dvb/dvb-usb/Makefile
View file @ 3e746831
......@@ -82,6 +82,9 @@ obj-$(CONFIG_DVB_USB_CE6230) += dvb-usb-ce6230.o
dvb-usb-friio-objs = friio.o friio-fe.o
obj-$(CONFIG_DVB_USB_FRIIO) += dvb-usb-friio.o
dvb-usb-ec168-objs = ec168.o
obj-$(CONFIG_DVB_USB_EC168) += dvb-usb-ec168.o
EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
# due to tuner-xc3028
EXTRA_CFLAGS += -Idrivers/media/common/tuners
......
drivers/media/dvb/dvb-usb/af9015.c
View file @ 3e746831
......@@ -730,7 +730,7 @@ static int af9015_read_config(struct usb_device *udev)
goto error;
deb_info("%s: IR mode:%d\n", __func__, val);
for (i = 0; i < af9015_properties_count; i++) {
if (val == AF9015_IR_MODE_DISABLED || val == 0x04) {
if (val == AF9015_IR_MODE_DISABLED) {
af9015_properties[i].rc_key_map = NULL;
af9015_properties[i].rc_key_map_size = 0;
} else if (dvb_usb_af9015_remote) {
......@@ -868,6 +868,16 @@ static int af9015_read_config(struct usb_device *udev)
af9015_config.ir_table_size =
ARRAY_SIZE(af9015_ir_table_avermedia);
break;
case USB_VID_MSI_2:
af9015_properties[i].rc_key_map =
af9015_rc_keys_msi_digivox_iii;
af9015_properties[i].rc_key_map_size =
ARRAY_SIZE(af9015_rc_keys_msi_digivox_iii);
af9015_config.ir_table =
af9015_ir_table_msi_digivox_iii;
af9015_config.ir_table_size =
ARRAY_SIZE(af9015_ir_table_msi_digivox_iii);
break;
}
}
}
......@@ -1283,6 +1293,8 @@ static struct usb_device_id af9015_usb_table[] = {
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_MC810)},
{USB_DEVICE(USB_VID_KYE, USB_PID_GENIUS_TVGO_DVB_T03)},
/* 25 */{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_399U_2)},
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_PC160_T)},
{USB_DEVICE(USB_VID_KWORLD_2, USB_PID_SVEON_STV20)},
{0},
};
MODULE_DEVICE_TABLE(usb, af9015_usb_table);
......@@ -1296,7 +1308,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.firmware = "dvb-usb-af9015.fw",
.no_reconnect = 1,
.size_of_priv = sizeof(struct af9015_state), \
.size_of_priv = sizeof(struct af9015_state),
.num_adapters = 2,
.adapter = {
......@@ -1402,7 +1414,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.firmware = "dvb-usb-af9015.fw",
.no_reconnect = 1,
.size_of_priv = sizeof(struct af9015_state), \
.size_of_priv = sizeof(struct af9015_state),
.num_adapters = 2,
.adapter = {
......@@ -1508,7 +1520,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.firmware = "dvb-usb-af9015.fw",
.no_reconnect = 1,
.size_of_priv = sizeof(struct af9015_state), \
.size_of_priv = sizeof(struct af9015_state),
.num_adapters = 2,
.adapter = {
......@@ -1554,7 +1566,7 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.i2c_algo = &af9015_i2c_algo,
.num_device_descs = 4, /* max 9 */
.num_device_descs = 6, /* max 9 */
.devices = {
{
.name = "AverMedia AVerTV Volar GPS 805 (A805)",
......@@ -1577,6 +1589,17 @@ static struct dvb_usb_device_properties af9015_properties[] = {
.cold_ids = {&af9015_usb_table[24], NULL},
.warm_ids = {NULL},
},
{
.name = "KWorld PlusTV DVB-T PCI Pro Card " \
"(DVB-T PC160-T)",
.cold_ids = {&af9015_usb_table[26], NULL},
.warm_ids = {NULL},
},
{
.name = "Sveon STV20 Tuner USB DVB-T HDTV",
.cold_ids = {&af9015_usb_table[27], NULL},
.warm_ids = {NULL},
},
}
},
};
......
drivers/media/dvb/dvb-usb/af9015.h
View file @ 3e746831
......@@ -95,6 +95,7 @@ enum af9015_ir_mode {
AF9015_IR_MODE_HID,
AF9015_IR_MODE_RLC,
AF9015_IR_MODE_RC6,
AF9015_IR_MODE_POLLING, /* just guess */
};
struct af9015_state {
......@@ -119,6 +120,7 @@ enum af9015_remote {
/* 5 */ AF9015_REMOTE_AVERMEDIA_KS,
};
/* LeadTek - Y04G0051 */
/* Leadtek WinFast DTV Dongle Gold */
static struct dvb_usb_rc_key af9015_rc_keys_leadtek[] = {
{ 0x001e, KEY_1 },
......@@ -131,64 +133,96 @@ static struct dvb_usb_rc_key af9015_rc_keys_leadtek[] = {
{ 0x0025, KEY_8 },
{ 0x0026, KEY_9 },
{ 0x0027, KEY_0 },
{ 0x0028, KEY_ENTER },
{ 0x004f, KEY_VOLUMEUP },
{ 0x0050, KEY_VOLUMEDOWN },
{ 0x0051, KEY_CHANNELDOWN },
{ 0x0052, KEY_CHANNELUP },
{ 0x0028, KEY_OK },
{ 0x004f, KEY_RIGHT },
{ 0x0050, KEY_LEFT },
{ 0x0051, KEY_DOWN },
{ 0x0052, KEY_UP },
{ 0x011a, KEY_POWER2 },
{ 0x04b4, KEY_TV },
{ 0x04b3, KEY_RED },
{ 0x04b2, KEY_GREEN },
{ 0x04b1, KEY_YELLOW },
{ 0x04b0, KEY_BLUE },
{ 0x003d, KEY_TEXT },
{ 0x0113, KEY_SLEEP },
{ 0x0010, KEY_MUTE },
{ 0x0105, KEY_ESC },
{ 0x0009, KEY_SCREEN },
{ 0x010f, KEY_MENU },
{ 0x003f, KEY_CHANNEL },
{ 0x0013, KEY_REWIND },
{ 0x0012, KEY_PLAY },
{ 0x0011, KEY_FASTFORWARD },
{ 0x0005, KEY_PREVIOUS },
{ 0x0029, KEY_STOP },
{ 0x002b, KEY_NEXT },
{ 0x0041, KEY_EPG },
{ 0x0019, KEY_VIDEO },
{ 0x0016, KEY_AUDIO },
{ 0x0037, KEY_DOT },
{ 0x002a, KEY_AGAIN },
{ 0x002c, KEY_CAMERA },
{ 0x003c, KEY_NEW },
{ 0x0115, KEY_RECORD },
{ 0x010b, KEY_TIME },
{ 0x0043, KEY_VOLUMEUP },
{ 0x0042, KEY_VOLUMEDOWN },
{ 0x004b, KEY_CHANNELUP },
{ 0x004e, KEY_CHANNELDOWN },
};
static u8 af9015_ir_table_leadtek[] = {
0x03, 0xfc, 0x00, 0xff, 0x1a, 0x01, 0x00,
0x03, 0xfc, 0x56, 0xa9, 0x00, 0x00, 0x00,
0x03, 0xfc, 0x4b, 0xb4, 0x00, 0x00, 0x00,
0x03, 0xfc, 0x4c, 0xb3, 0xb2, 0x04, 0x00,
0x03, 0xfc, 0x4d, 0xb2, 0x00, 0x00, 0x00,
0x03, 0xfc, 0x4e, 0xb1, 0x00, 0x00, 0x00,
0x03, 0xfc, 0x1f, 0xe0, 0x3d, 0x00, 0x00,
0x03, 0xfc, 0x40, 0xbf, 0x13, 0x01, 0x00,
0x03, 0xfc, 0x14, 0xeb, 0x10, 0x00, 0x00,
0x03, 0xfc, 0x49, 0xb6, 0x05, 0x01, 0x00,
0x03, 0xfc, 0x50, 0xaf, 0x29, 0x00, 0x00,
0x03, 0xfc, 0x0c, 0xf3, 0x52, 0x00, 0x00,
0x03, 0xfc, 0x03, 0xfc, 0x09, 0x00, 0x00,
0x03, 0xfc, 0x08, 0xf7, 0x50, 0x00, 0x00,
0x03, 0xfc, 0x13, 0xec, 0x28, 0x00, 0x00,
0x03, 0xfc, 0x04, 0xfb, 0x4f, 0x00, 0x00,
0x03, 0xfc, 0x4f, 0xb0, 0x0f, 0x01, 0x00,
0x03, 0xfc, 0x10, 0xef, 0x51, 0x00, 0x00,
0x03, 0xfc, 0x51, 0xae, 0x3f, 0x00, 0x00,
0x03, 0xfc, 0x42, 0xbd, 0x13, 0x00, 0x00,
0x03, 0xfc, 0x43, 0xbc, 0x00, 0x00, 0x00,
0x03, 0xfc, 0x44, 0xbb, 0x11, 0x00, 0x00,
0x03, 0xfc, 0x52, 0xad, 0x19, 0x00, 0x00,
0x03, 0xfc, 0x54, 0xab, 0x05, 0x00, 0x00,
0x03, 0xfc, 0x46, 0xb9, 0x29, 0x00, 0x00,
0x03, 0xfc, 0x55, 0xaa, 0x2b, 0x00, 0x00,
0x03, 0xfc, 0x53, 0xac, 0x41, 0x00, 0x00,
0x03, 0xfc, 0x05, 0xfa, 0x1e, 0x00, 0x00,
0x03, 0xfc, 0x06, 0xf9, 0x1f, 0x00, 0x00,
0x03, 0xfc, 0x07, 0xf8, 0x20, 0x00, 0x00,
0x03, 0xfc, 0x1e, 0xe1, 0x19, 0x00, 0x00,
0x03, 0xfc, 0x09, 0xf6, 0x21, 0x00, 0x00,
0x03, 0xfc, 0x0a, 0xf5, 0x22, 0x00, 0x00,
0x03, 0xfc, 0x0b, 0xf4, 0x23, 0x00, 0x00,
0x03, 0xfc, 0x1b, 0xe4, 0x16, 0x00, 0x00,
0x03, 0xfc, 0x0d, 0xf2, 0x24, 0x00, 0x00,
0x03, 0xfc, 0x0e, 0xf1, 0x25, 0x00, 0x00,
0x03, 0xfc, 0x0f, 0xf0, 0x26, 0x00, 0x00,
0x03, 0xfc, 0x16, 0xe9, 0x28, 0x00, 0x00,
0x03, 0xfc, 0x41, 0xbe, 0x37, 0x00, 0x00,
0x03, 0xfc, 0x12, 0xed, 0x27, 0x00, 0x00,
0x03, 0xfc, 0x11, 0xee, 0x2a, 0x00, 0x00,
0x03, 0xfc, 0x48, 0xb7, 0x2c, 0x00, 0x00,
0x03, 0xfc, 0x4a, 0xb5, 0x3c, 0x00, 0x00,
0x03, 0xfc, 0x47, 0xb8, 0x15, 0x01, 0x00,
0x03, 0xfc, 0x45, 0xba, 0x0b, 0x01, 0x00,
0x03, 0xfc, 0x5e, 0xa1, 0x43, 0x00, 0x00,
0x03, 0xfc, 0x5a, 0xa5, 0x42, 0x00, 0x00,
0x03, 0xfc, 0x5b, 0xa4, 0x4b, 0x00, 0x00,
0x03, 0xfc, 0x5f, 0xa0, 0x4e, 0x00, 0x00,
0x03, 0xfc, 0x00, 0xff, 0x1a, 0x01, 0x00, /* KEY_POWER2 */
0x03, 0xfc, 0x56, 0xa9, 0xb4, 0x04, 0x00, /* KEY_TV */
0x03, 0xfc, 0x4b, 0xb4, 0xb3, 0x04, 0x00, /* KEY_RED */
0x03, 0xfc, 0x4c, 0xb3, 0xb2, 0x04, 0x00, /* KEY_GREEN */
0x03, 0xfc, 0x4d, 0xb2, 0xb1, 0x04, 0x00, /* KEY_YELLOW */
0x03, 0xfc, 0x4e, 0xb1, 0xb0, 0x04, 0x00, /* KEY_BLUE */
0x03, 0xfc, 0x1f, 0xe0, 0x3d, 0x00, 0x00, /* KEY_TEXT */
0x03, 0xfc, 0x40, 0xbf, 0x13, 0x01, 0x00, /* KEY_SLEEP */
0x03, 0xfc, 0x14, 0xeb, 0x10, 0x00, 0x00, /* KEY_MUTE */
0x03, 0xfc, 0x49, 0xb6, 0x05, 0x01, 0x00, /* KEY_ESC */
0x03, 0xfc, 0x50, 0xaf, 0x29, 0x00, 0x00, /* KEY_STOP (1)*/
0x03, 0xfc, 0x0c, 0xf3, 0x52, 0x00, 0x00, /* KEY_UP */
0x03, 0xfc, 0x03, 0xfc, 0x09, 0x00, 0x00, /* KEY_SCREEN */
0x03, 0xfc, 0x08, 0xf7, 0x50, 0x00, 0x00, /* KEY_LEFT */
0x03, 0xfc, 0x13, 0xec, 0x28, 0x00, 0x00, /* KEY_OK (1) */
0x03, 0xfc, 0x04, 0xfb, 0x4f, 0x00, 0x00, /* KEY_RIGHT */
0x03, 0xfc, 0x4f, 0xb0, 0x0f, 0x01, 0x00, /* KEY_MENU */
0x03, 0xfc, 0x10, 0xef, 0x51, 0x00, 0x00, /* KEY_DOWN */
0x03, 0xfc, 0x51, 0xae, 0x3f, 0x00, 0x00, /* KEY_CHANNEL */
0x03, 0xfc, 0x42, 0xbd, 0x13, 0x00, 0x00, /* KEY_REWIND */
0x03, 0xfc, 0x43, 0xbc, 0x12, 0x00, 0x00, /* KEY_PLAY */
0x03, 0xfc, 0x44, 0xbb, 0x11, 0x00, 0x00, /* KEY_FASTFORWARD */
0x03, 0xfc, 0x52, 0xad, 0x19, 0x00, 0x00, /* KEY_VIDEO (1) */
0x03, 0xfc, 0x54, 0xab, 0x05, 0x00, 0x00, /* KEY_PREVIOUS */
0x03, 0xfc, 0x46, 0xb9, 0x29, 0x00, 0x00, /* KEY_STOP (2) */
0x03, 0xfc, 0x55, 0xaa, 0x2b, 0x00, 0x00, /* KEY_NEXT */
0x03, 0xfc, 0x53, 0xac, 0x41, 0x00, 0x00, /* KEY_EPG */
0x03, 0xfc, 0x05, 0xfa, 0x1e, 0x00, 0x00, /* KEY_1 */
0x03, 0xfc, 0x06, 0xf9, 0x1f, 0x00, 0x00, /* KEY_2 */
0x03, 0xfc, 0x07, 0xf8, 0x20, 0x00, 0x00, /* KEY_3 */
0x03, 0xfc, 0x1e, 0xe1, 0x19, 0x00, 0x00, /* KEY_VIDEO (2) */
0x03, 0xfc, 0x09, 0xf6, 0x21, 0x00, 0x00, /* KEY_4 */
0x03, 0xfc, 0x0a, 0xf5, 0x22, 0x00, 0x00, /* KEY_5 */
0x03, 0xfc, 0x0b, 0xf4, 0x23, 0x00, 0x00, /* KEY_6 */
0x03, 0xfc, 0x1b, 0xe4, 0x16, 0x00, 0x00, /* KEY_AUDIO */
0x03, 0xfc, 0x0d, 0xf2, 0x24, 0x00, 0x00, /* KEY_7 */
0x03, 0xfc, 0x0e, 0xf1, 0x25, 0x00, 0x00, /* KEY_8 */
0x03, 0xfc, 0x0f, 0xf0, 0x26, 0x00, 0x00, /* KEY_9 */
0x03, 0xfc, 0x16, 0xe9, 0x28, 0x00, 0x00, /* KEY_OK (2) */
0x03, 0xfc, 0x41, 0xbe, 0x37, 0x00, 0x00, /* KEY_DOT */
0x03, 0xfc, 0x12, 0xed, 0x27, 0x00, 0x00, /* KEY_0 */
0x03, 0xfc, 0x11, 0xee, 0x2a, 0x00, 0x00, /* KEY_AGAIN */
0x03, 0xfc, 0x48, 0xb7, 0x2c, 0x00, 0x00, /* KEY_CAMERA */
0x03, 0xfc, 0x4a, 0xb5, 0x3c, 0x00, 0x00, /* KEY_NEW */
0x03, 0xfc, 0x47, 0xb8, 0x15, 0x01, 0x00, /* KEY_RECORD */
0x03, 0xfc, 0x45, 0xba, 0x0b, 0x01, 0x00, /* KEY_TIME */
0x03, 0xfc, 0x5e, 0xa1, 0x43, 0x00, 0x00, /* KEY_VOLUMEUP */
0x03, 0xfc, 0x5a, 0xa5, 0x42, 0x00, 0x00, /* KEY_VOLUMEDOWN */
0x03, 0xfc, 0x5b, 0xa4, 0x4b, 0x00, 0x00, /* KEY_CHANNELUP */
0x03, 0xfc, 0x5f, 0xa0, 0x4e, 0x00, 0x00, /* KEY_CHANNELDOWN */
};
/* TwinHan AzureWave AD-TU700(704J) */
......@@ -746,4 +780,75 @@ static u8 af9015_ir_table_trekstor[] = {
0x00, 0xff, 0x84, 0x7b, 0x27, 0x07, 0x00,
};
/* MSI DIGIVOX mini III */
static struct dvb_usb_rc_key af9015_rc_keys_msi_digivox_iii[] = {
{ 0x0713, KEY_POWER }, /* [red power button] */
{ 0x073b, KEY_VIDEO }, /* Source */
{ 0x073e, KEY_ZOOM }, /* Zoom */
{ 0x070b, KEY_POWER2 }, /* ShutDown */
{ 0x071e, KEY_1 },
{ 0x071f, KEY_2 },
{ 0x0720, KEY_3 },
{ 0x0721, KEY_4 },
{ 0x0722, KEY_5 },
{ 0x0723, KEY_6 },
{ 0x0724, KEY_7 },
{ 0x0725, KEY_8 },
{ 0x0726, KEY_9 },
{ 0x0727, KEY_0 },
{ 0x0752, KEY_CHANNELUP }, /* CH+ */
{ 0x0751, KEY_CHANNELDOWN }, /* CH- */
{ 0x0750, KEY_VOLUMEUP }, /* Vol+ */
{ 0x074f, KEY_VOLUMEDOWN }, /* Vol- */
{ 0x0705, KEY_ESC }, /* [back up arrow] */
{ 0x0708, KEY_OK }, /* [enter arrow] */
{ 0x073f, KEY_RECORD }, /* Rec */
{ 0x0716, KEY_STOP }, /* Stop */
{ 0x072a, KEY_PLAY }, /* Play */
{ 0x073c, KEY_MUTE }, /* Mute */
{ 0x0718, KEY_UP },
{ 0x0707, KEY_DOWN },
{ 0x070f, KEY_LEFT },
{ 0x0715, KEY_RIGHT },
{ 0x0736, KEY_RED },
{ 0x0737, KEY_GREEN },
{ 0x072d, KEY_YELLOW },
{ 0x072e, KEY_BLUE },
};
static u8 af9015_ir_table_msi_digivox_iii[] = {
0x61, 0xd6, 0x43, 0xbc, 0x13, 0x07, 0x00, /* KEY_POWER */
0x61, 0xd6, 0x01, 0xfe, 0x3b, 0x07, 0x00, /* KEY_VIDEO */
0x61, 0xd6, 0x0b, 0xf4, 0x3e, 0x07, 0x00, /* KEY_ZOOM */
0x61, 0xd6, 0x03, 0xfc, 0x0b, 0x07, 0x00, /* KEY_POWER2 */
0x61, 0xd6, 0x04, 0xfb, 0x1e, 0x07, 0x00, /* KEY_1 */
0x61, 0xd6, 0x08, 0xf7, 0x1f, 0x07, 0x00, /* KEY_2 */
0x61, 0xd6, 0x02, 0xfd, 0x20, 0x07, 0x00, /* KEY_3 */
0x61, 0xd6, 0x0f, 0xf0, 0x21, 0x07, 0x00, /* KEY_4 */
0x61, 0xd6, 0x05, 0xfa, 0x22, 0x07, 0x00, /* KEY_5 */
0x61, 0xd6, 0x06, 0xf9, 0x23, 0x07, 0x00, /* KEY_6 */
0x61, 0xd6, 0x0c, 0xf3, 0x24, 0x07, 0x00, /* KEY_7 */
0x61, 0xd6, 0x0d, 0xf2, 0x25, 0x07, 0x00, /* KEY_8 */
0x61, 0xd6, 0x0a, 0xf5, 0x26, 0x07, 0x00, /* KEY_9 */
0x61, 0xd6, 0x11, 0xee, 0x27, 0x07, 0x00, /* KEY_0 */
0x61, 0xd6, 0x09, 0xf6, 0x52, 0x07, 0x00, /* KEY_CHANNELUP */
0x61, 0xd6, 0x07, 0xf8, 0x51, 0x07, 0x00, /* KEY_CHANNELDOWN */
0x61, 0xd6, 0x0e, 0xf1, 0x50, 0x07, 0x00, /* KEY_VOLUMEUP */
0x61, 0xd6, 0x13, 0xec, 0x4f, 0x07, 0x00, /* KEY_VOLUMEDOWN */
0x61, 0xd6, 0x10, 0xef, 0x05, 0x07, 0x00, /* KEY_ESC */
0x61, 0xd6, 0x12, 0xed, 0x08, 0x07, 0x00, /* KEY_OK */
0x61, 0xd6, 0x14, 0xeb, 0x3f, 0x07, 0x00, /* KEY_RECORD */
0x61, 0xd6, 0x15, 0xea, 0x16, 0x07, 0x00, /* KEY_STOP */
0x61, 0xd6, 0x16, 0xe9, 0x2a, 0x07, 0x00, /* KEY_PLAY */
0x61, 0xd6, 0x17, 0xe8, 0x3c, 0x07, 0x00, /* KEY_MUTE */
0x61, 0xd6, 0x18, 0xe7, 0x18, 0x07, 0x00, /* KEY_UP */
0x61, 0xd6, 0x19, 0xe6, 0x07, 0x07, 0x00, /* KEY_DOWN */
0x61, 0xd6, 0x1a, 0xe5, 0x0f, 0x07, 0x00, /* KEY_LEFT */
0x61, 0xd6, 0x1b, 0xe4, 0x15, 0x07, 0x00, /* KEY_RIGHT */
0x61, 0xd6, 0x1c, 0xe3, 0x36, 0x07, 0x00, /* KEY_RED */
0x61, 0xd6, 0x1d, 0xe2, 0x37, 0x07, 0x00, /* KEY_GREEN */
0x61, 0xd6, 0x1e, 0xe1, 0x2d, 0x07, 0x00, /* KEY_YELLOW */
0x61, 0xd6, 0x1f, 0xe0, 0x2e, 0x07, 0x00, /* KEY_BLUE */
};
#endif
drivers/media/dvb/dvb-usb/cxusb.c
View file @ 3e746831
......@@ -36,9 +36,11 @@
#include "tuner-xc2028.h"
#include "tuner-simple.h"
#include "mxl5005s.h"
#include "max2165.h"
#include "dib7000p.h"
#include "dib0070.h"
#include "lgs8gxx.h"
#include "atbm8830.h"
/* debug */
static int dvb_usb_cxusb_debug;
......@@ -714,6 +716,11 @@ static struct mxl5005s_config d680_dmb_tuner = {
.AgcMasterByte = 0x00,
};
static struct max2165_config mygica_d689_max2165_cfg = {
.i2c_address = 0x60,
.osc_clk = 20
};
/* Callbacks for DVB USB */
static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
{
......@@ -813,6 +820,14 @@ static int cxusb_d680_dmb_tuner_attach(struct dvb_usb_adapter *adap)
return (fe == NULL) ? -EIO : 0;
}
static int cxusb_mygica_d689_tuner_attach(struct dvb_usb_adapter *adap)
{
struct dvb_frontend *fe;
fe = dvb_attach(max2165_attach, adap->fe,
&adap->dev->i2c_adap, &mygica_d689_max2165_cfg);
return (fe == NULL) ? -EIO : 0;
}
static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)
{
u8 b;
......@@ -1160,6 +1175,55 @@ static int cxusb_d680_dmb_frontend_attach(struct dvb_usb_adapter *adap)
return 0;
}
static struct atbm8830_config mygica_d689_atbm8830_cfg = {
.prod = ATBM8830_PROD_8830,
.demod_address = 0x40,
.serial_ts = 0,
.ts_sampling_edge = 1,
.ts_clk_gated = 0,
.osc_clk_freq = 30400, /* in kHz */
.if_freq = 0, /* zero IF */
.zif_swap_iq = 1,
};
static int cxusb_mygica_d689_frontend_attach(struct dvb_usb_adapter *adap)
{
struct dvb_usb_device *d = adap->dev;
/* Select required USB configuration */
if (usb_set_interface(d->udev, 0, 0) < 0)
err("set interface failed");
/* Unblock all USB pipes */
usb_clear_halt(d->udev,
usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
usb_clear_halt(d->udev,
usb_rcvbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
usb_clear_halt(d->udev,
usb_rcvbulkpipe(d->udev, d->props.adapter[0].stream.endpoint));
/* Reset the tuner */
if (cxusb_d680_dmb_gpio_tuner(d, 0x07, 0) < 0) {
err("clear tuner gpio failed");
return -EIO;
}
msleep(100);
if (cxusb_d680_dmb_gpio_tuner(d, 0x07, 1) < 0) {
err("set tuner gpio failed");
return -EIO;
}
msleep(100);
/* Attach frontend */
adap->fe = dvb_attach(atbm8830_attach, &mygica_d689_atbm8830_cfg,
&d->i2c_adap);
if (adap->fe == NULL)
return -EIO;
return 0;
}
/*
* DViCO has shipped two devices with the same USB ID, but only one of them
* needs a firmware download. Check the device class details to see if they
......@@ -1240,6 +1304,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties;
static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_properties;
static struct dvb_usb_device_properties cxusb_aver_a868r_properties;
static struct dvb_usb_device_properties cxusb_d680_dmb_properties;
static struct dvb_usb_device_properties cxusb_mygica_d689_properties;
static int cxusb_probe(struct usb_interface *intf,
const struct usb_device_id *id)
......@@ -1268,6 +1333,8 @@ static int cxusb_probe(struct usb_interface *intf,
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_d680_dmb_properties,
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_mygica_d689_properties,
THIS_MODULE, NULL, adapter_nr) ||
0)
return 0;
......@@ -1294,6 +1361,7 @@ static struct usb_device_id cxusb_table [] = {
{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_A868R) },
{ USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2) },
{ USB_DEVICE(USB_VID_CONEXANT, USB_PID_CONEXANT_D680_DMB) },
{ USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_D689) },
{} /* Terminating entry */
};
MODULE_DEVICE_TABLE (usb, cxusb_table);
......@@ -1837,6 +1905,55 @@ static struct dvb_usb_device_properties cxusb_d680_dmb_properties = {
}
};
static struct dvb_usb_device_properties cxusb_mygica_d689_properties = {
.caps = DVB_USB_IS_AN_I2C_ADAPTER,
.usb_ctrl = CYPRESS_FX2,
.size_of_priv = sizeof(struct cxusb_state),
.num_adapters = 1,
.adapter = {
{
.streaming_ctrl = cxusb_d680_dmb_streaming_ctrl,
.frontend_attach = cxusb_mygica_d689_frontend_attach,
.tuner_attach = cxusb_mygica_d689_tuner_attach,
/* parameter for the MPEG2-data transfer */
.stream = {
.type = USB_BULK,
.count = 5,
.endpoint = 0x02,
.u = {
.bulk = {
.buffersize = 8192,
}
}
},
},
},
.power_ctrl = cxusb_d680_dmb_power_ctrl,
.i2c_algo = &cxusb_i2c_algo,
.generic_bulk_ctrl_endpoint = 0x01,
.rc_interval = 100,
.rc_key_map = d680_dmb_rc_keys,
.rc_key_map_size = ARRAY_SIZE(d680_dmb_rc_keys),
.rc_query = cxusb_d680_dmb_rc_query,
.num_device_descs = 1,
.devices = {
{
"Mygica D689 DMB-TH",
{ NULL },
{ &cxusb_table[19], NULL },
},
}
};
static struct usb_driver cxusb_driver = {
.name = "dvb_usb_cxusb",
.probe = cxusb_probe,
......
drivers/media/dvb/dvb-usb/dib0700_devices.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
View file @ 3e746831
......@@ -88,6 +88,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
goto err;
}
adap->dvb_adap.priv = adap;
adap->dvb_adap.fe_ioctl_override = adap->props.fe_ioctl_override;
if (adap->dev->props.read_mac_address) {
if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)
......
drivers/media/dvb/dvb-usb/dvb-usb-ids.h
View file @ 3e746831
......@@ -27,6 +27,7 @@
#define USB_VID_DIBCOM 0x10b8
#define USB_VID_DPOSH 0x1498
#define USB_VID_DVICO 0x0fe9
#define USB_VID_E3C 0x18b4
#define USB_VID_ELGATO 0x0fd9
#define USB_VID_EMPIA 0xeb1a
#define USB_VID_GENPIX 0x09c0
......@@ -61,6 +62,7 @@
#define USB_VID_XTENSIONS 0x1ae7
#define USB_VID_HUMAX_COEX 0x10b9
#define USB_VID_774 0x7a69
#define USB_VID_EVOLUTEPC 0x1e59
/* Product IDs */
#define USB_PID_ADSTECH_USB2_COLD 0xa333
......@@ -103,6 +105,11 @@
#define USB_PID_DIBCOM_STK7770P 0x1e80
#define USB_PID_DPOSH_M9206_COLD 0x9206
#define USB_PID_DPOSH_M9206_WARM 0xa090
#define USB_PID_E3C_EC168 0x1689
#define USB_PID_E3C_EC168_2 0xfffa
#define USB_PID_E3C_EC168_3 0xfffb
#define USB_PID_E3C_EC168_4 0x1001
#define USB_PID_E3C_EC168_5 0x1002
#define USB_PID_UNIWILL_STK7700P 0x6003
#define USB_PID_GENIUS_TVGO_DVB_T03 0x4012
#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0
......@@ -115,6 +122,7 @@
#define USB_PID_KWORLD_395U_3 0xe395
#define USB_PID_KWORLD_MC810 0xc810
#define USB_PID_KWORLD_PC160_2T 0xc160
#define USB_PID_KWORLD_PC160_T 0xc161
#define USB_PID_KWORLD_VSTREAM_COLD 0x17de
#define USB_PID_KWORLD_VSTREAM_WARM 0x17df
#define USB_PID_TERRATEC_CINERGY_T_USB_XE 0x0055
......@@ -271,10 +279,13 @@
#define USB_PID_TELESTAR_STARSTICK_2 0x8000
#define USB_PID_MSI_DIGI_VOX_MINI_III 0x8807
#define USB_PID_SONY_PLAYTV 0x0003
#define USB_PID_MYGICA_D689 0xd811
#define USB_PID_ELGATO_EYETV_DTT 0x0021
#define USB_PID_ELGATO_EYETV_DTT_Dlx 0x0020
#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD 0x5000
#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM 0x5001
#define USB_PID_FRIIO_WHITE 0x0001
#define USB_PID_TVWAY_PLUS 0x0002
#define USB_PID_SVEON_STV20 0xe39d
#endif
drivers/media/dvb/dvb-usb/dvb-usb.h
View file @ 3e746831
......@@ -162,6 +162,9 @@ struct dvb_usb_adapter_properties {
struct usb_data_stream_properties stream;
int size_of_priv;
int (*fe_ioctl_override) (struct dvb_frontend *,
unsigned int, void *, unsigned int);
};
/**
......
drivers/media/dvb/dvb-usb/ec168.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/dvb-usb/ec168.h 0 → 100644
View file @ 3e746831
/*
* E3C EC168 DVB USB driver
*
* Copyright (C) 2009 Antti Palosaari <crope@iki.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
#ifndef EC168_H
#define EC168_H
#define DVB_USB_LOG_PREFIX "ec168"
#include "dvb-usb.h"
#define deb_info(args...) dprintk(dvb_usb_ec168_debug, 0x01, args)
#define deb_rc(args...) dprintk(dvb_usb_ec168_debug, 0x02, args)
#define deb_xfer(args...) dprintk(dvb_usb_ec168_debug, 0x04, args)
#define deb_reg(args...) dprintk(dvb_usb_ec168_debug, 0x08, args)
#define deb_i2c(args...) dprintk(dvb_usb_ec168_debug, 0x10, args)
#define deb_fw(args...) dprintk(dvb_usb_ec168_debug, 0x20, args)
#define ec168_debug_dump(r, t, v, i, b, l, func) { \
int loop_; \
func("%02x %02x %02x %02x %02x %02x %02x %02x", \
t, r, v & 0xff, v >> 8, i & 0xff, i >> 8, l & 0xff, l >> 8); \
if (t == (USB_TYPE_VENDOR | USB_DIR_OUT)) \
func(" >>> "); \
else \
func(" <<< "); \
for (loop_ = 0; loop_ < l; loop_++) \
func("%02x ", b[loop_]); \
func("\n");\
}
#define EC168_USB_TIMEOUT 1000
struct ec168_req {
u8 cmd; /* [1] */
u16 value; /* [2|3] */
u16 index; /* [4|5] */
u16 size; /* [6|7] */
u8 *data;
};
enum ec168_cmd {
DOWNLOAD_FIRMWARE = 0x00,
CONFIG = 0x01,
DEMOD_RW = 0x03,
GPIO = 0x04,
STREAMING_CTRL = 0x10,
READ_I2C = 0x20,
WRITE_I2C = 0x21,
HID_DOWNLOAD = 0x30,
GET_CONFIG,
SET_CONFIG,
READ_DEMOD,
WRITE_DEMOD,
};
#endif
drivers/media/dvb/dvb-usb/friio-fe.c
View file @ 3e746831
......@@ -232,12 +232,6 @@ static int jdvbt90502_read_status(struct dvb_frontend *fe, fe_status_t *state)
return 0;
}
static int jdvbt90502_read_ber(struct dvb_frontend *fe, u32 *ber)
{
*ber = 0;
return 0;
}
static int jdvbt90502_read_signal_strength(struct dvb_frontend *fe,
u16 *strength)
{
......@@ -264,26 +258,26 @@ static int jdvbt90502_read_signal_strength(struct dvb_frontend *fe,
return 0;
}
static int jdvbt90502_read_snr(struct dvb_frontend *fe, u16 *snr)
{
*snr = 0x0101;
return 0;
}
static int jdvbt90502_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{
*ucblocks = 0;
return 0;
}
static int jdvbt90502_get_tune_settings(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *fs)
/* filter out un-supported properties to notify users */
static int jdvbt90502_set_property(struct dvb_frontend *fe,
struct dtv_property *tvp)
{
fs->min_delay_ms = 500;
fs->step_size = 0;
fs->max_drift = 0;
return 0;
int r = 0;
switch (tvp->cmd) {
case DTV_DELIVERY_SYSTEM:
if (tvp->u.data != SYS_ISDBT)
r = -EINVAL;
break;
case DTV_CLEAR:
case DTV_TUNE:
case DTV_FREQUENCY:
break;
default:
r = -EINVAL;
}
return r;
}
static int jdvbt90502_get_frontend(struct dvb_frontend *fe,
......@@ -314,6 +308,9 @@ static int jdvbt90502_set_frontend(struct dvb_frontend *fe,
deb_fe("%s: Freq:%d\n", __func__, p->frequency);
/* for recovery from DTV_CLEAN */
fe->dtv_property_cache.delivery_system = SYS_ISDBT;
ret = jdvbt90502_pll_set_freq(state, p->frequency);
if (ret) {
deb_fe("%s:ret == %d\n", __func__, ret);
......@@ -323,12 +320,6 @@ static int jdvbt90502_set_frontend(struct dvb_frontend *fe,
return 0;
}
static int jdvbt90502_sleep(struct dvb_frontend *fe)
{
deb_fe("%s called.\n", __func__);
return 0;
}
/**
* (reg, val) commad list to initialize this module.
......@@ -394,6 +385,7 @@ static int jdvbt90502_init(struct dvb_frontend *fe)
if (ret != 1)
goto error;
}
fe->dtv_property_cache.delivery_system = SYS_ISDBT;
msleep(100);
return 0;
......@@ -468,16 +460,13 @@ static struct dvb_frontend_ops jdvbt90502_ops = {
.release = jdvbt90502_release,
.init = jdvbt90502_init,
.sleep = jdvbt90502_sleep,
.write = _jdvbt90502_write,
.set_property = jdvbt90502_set_property,
.set_frontend = jdvbt90502_set_frontend,
.get_frontend = jdvbt90502_get_frontend,
.get_tune_settings = jdvbt90502_get_tune_settings,
.read_status = jdvbt90502_read_status,
.read_ber = jdvbt90502_read_ber,
.read_signal_strength = jdvbt90502_read_signal_strength,
.read_snr = jdvbt90502_read_snr,
.read_ucblocks = jdvbt90502_read_ucblocks,
};
drivers/media/dvb/firewire/Kconfig
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/firewire/Makefile
View file @ 3e746831
obj-$(CONFIG_DVB_FIREDTV) += firedtv.o
firedtv-y := firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o
firedtv-$(CONFIG_DVB_FIREDTV_FIREWIRE) += firedtv-fw.o
firedtv-$(CONFIG_DVB_FIREDTV_IEEE1394) += firedtv-1394.o
firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o
......
drivers/media/dvb/firewire/firedtv-1394.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/firewire/firedtv-avc.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/firewire/firedtv-dvb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/firewire/firedtv-fw.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/firewire/firedtv-rc.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/firewire/firedtv.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/Kconfig
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/Makefile
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/atbm8830.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/atbm8830.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/atbm8830_priv.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/au8522_priv.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/dib7000p.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/dib7000p.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/dib8000.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/dib8000.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/ds3000.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/ds3000.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/ec100.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/ec100.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/ec100_priv.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/s5h1409.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/s5h1409.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stb6100_proc.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv0900.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv0900_core.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv0900_init.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv0900_priv.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv0900_reg.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv0900_sw.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv090x.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv090x_priv.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv090x_reg.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv6110.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv6110.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/frontends/stv6110x.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/pt1/pt1.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/pt1/va1j5jf8007s.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/pt1/va1j5jf8007t.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/siano/sms-cards.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/siano/sms-cards.h
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/siano/smscoreapi.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/siano/smssdio.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/ttpci/budget-av.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/ttpci/budget-ci.c
View file @ 3e746831
This diff is collapsed.
drivers/media/dvb/ttusb-dec/ttusb_dec.c
View file @ 3e746831
This diff is collapsed.
drivers/media/radio/Kconfig
View file @ 3e746831
This diff is collapsed.
drivers/media/radio/Makefile
View file @ 3e746831
This diff is collapsed.
drivers/media/radio/radio-mr800.c
View file @ 3e746831
This diff is collapsed.
drivers/media/radio/tef6862.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/Kconfig
View file @ 3e746831
This diff is collapsed.
drivers/media/video/Makefile
View file @ 3e746831
This diff is collapsed.
drivers/media/video/adv7180.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/au0828/au0828-video.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/bt819.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/bt8xx/bttv-input.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-av-core.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-cards.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-driver.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-driver.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-dvb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-fileops.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-i2c.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-ioctl.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-mailbox.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-mailbox.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-queue.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-queue.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-scb.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-streams.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-streams.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-vbi.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-vbi.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx18-version.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx18/cx23418.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx231xx/cx231xx-input.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx231xx/cx231xx-video.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/Kconfig
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/Makefile
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-417.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-cards.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-core.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-dvb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-f300.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-f300.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-input.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-input.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-ioctl.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-ioctl.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-ir.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-ir.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-reg.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885-video.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23885.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23888-ir.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx23885/cx23888-ir.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx25840/cx25840-audio.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx25840/cx25840-core.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx25840/cx25840-core.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx88/Kconfig
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx88/cx88-cards.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx88/cx88-dvb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx88/cx88-input.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx88/cx88-video.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/cx88/cx88.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/davinci/vpfe_capture.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/em28xx/em28xx-audio.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/em28xx/em28xx-cards.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/em28xx/em28xx-core.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/em28xx/em28xx-dvb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/em28xx/em28xx-input.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/em28xx/em28xx-reg.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/em28xx/em28xx-video.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/em28xx/em28xx.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/Kconfig
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/Makefile
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/conex.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/etoms.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/finepix.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/gl860/gl860.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/gl860/gl860.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/gspca.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/gspca.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/jeilinj.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/mars.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/mr97310a.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/ov519.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/ov534.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/pac207.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/pac7302.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/pac7311.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/pac_common.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/sn9c20x.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/sonixb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/sonixj.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/spca500.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/spca501.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/spca505.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/spca506.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/spca508.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/spca561.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/sq905.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/sq905c.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/stk014.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/stv0680.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/stv06xx/stv06xx.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/sunplus.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/t613.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/tv8532.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/vc032x.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/w996Xcf.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/gspca/zc3xx.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/hdpvr/hdpvr-video.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/hexium_gemini.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/hexium_orion.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ir-kbd-i2c.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ivtv/ivtv-cards.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ivtv/ivtv-cards.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ivtv/ivtv-driver.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ivtv/ivtv-driver.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ivtv/ivtv-i2c.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ivtv/ivtv-i2c.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/mxb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ov9640.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/ov9640.h 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/pms.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/pvrusb2/pvrusb2-hdw.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/pvrusb2/pvrusb2-hdw.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/pvrusb2/pvrusb2-v4l2.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/pwc/pwc-if.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/rj54n1cb0c.c 0 → 100644
View file @ 3e746831
This diff is collapsed.
drivers/media/video/s2255drv.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa7110.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa7134/saa7134-cards.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa7134/saa7134-core.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa7134/saa7134-dvb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa7134/saa7134-input.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa7134/saa7134-video.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa7134/saa7134.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa7164/saa7164-dvb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/saa717x.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/sh_mobile_ceu_camera.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/tuner-core.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/tvaudio.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/tvp514x.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/usbvideo/konicawc.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/uvc/uvc_ctrl.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/uvc/uvc_driver.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/uvc/uvc_v4l2.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/uvc/uvc_video.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/uvc/uvcvideo.h
View file @ 3e746831
This diff is collapsed.
drivers/media/video/v4l2-common.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/videobuf-core.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/videobuf-dma-contig.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/videobuf-dma-sg.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/videobuf-dvb.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/videobuf-vmalloc.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/vpx3220.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/zoran/zoran_driver.c
View file @ 3e746831
This diff is collapsed.
drivers/media/video/zr364xx.c
View file @ 3e746831
This diff is collapsed.
drivers/staging/go7007/Makefile
View file @ 3e746831
This diff is collapsed.
drivers/staging/go7007/go7007-driver.c
View file @ 3e746831
This diff is collapsed.
drivers/staging/go7007/go7007-priv.h
View file @ 3e746831
This diff is collapsed.
drivers/staging/go7007/go7007-usb.c
View file @ 3e746831
This diff is collapsed.
drivers/staging/go7007/go7007-v4l2.c
View file @ 3e746831
This diff is collapsed.
drivers/staging/go7007/s2250-board.c
View file @ 3e746831
This diff is collapsed.
drivers/staging/go7007/s2250-loader.c
View file @ 3e746831
This diff is collapsed.
include/linux/videodev2.h
View file @ 3e746831
This diff is collapsed.
include/media/cx25840.h
View file @ 3e746831
This diff is collapsed.
include/media/davinci/vpfe_capture.h
View file @ 3e746831
This diff is collapsed.
include/media/ir-common.h
View file @ 3e746831
This diff is collapsed.
include/media/v4l2-chip-ident.h
View file @ 3e746831
This diff is collapsed.
include/media/v4l2-subdev.h
View file @ 3e746831
This diff is collapsed.
include/media/videobuf-core.h
View file @ 3e746831
This diff is collapsed.
include/media/videobuf-dma-contig.h
View file @ 3e746831
This diff is collapsed.
include/media/videobuf-dma-sg.h
View file @ 3e746831
This diff is collapsed.
include/media/videobuf-dvb.h
View file @ 3e746831
This diff is collapsed.
include/media/videobuf-vmalloc.h
View file @ 3e746831
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7