Commit f54a6ec0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (583 commits)
  V4L/DVB (10130): use USB API functions rather than constants
  V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends
  V4L/DVB (10128): modify V4L documentation to be a valid XHTML
  V4L/DVB (10127): stv06xx: Avoid having y unitialized
  V4L/DVB (10125): em28xx: Don't do AC97 vendor detection for i2s audio devices
  V4L/DVB (10124): em28xx: expand output formats available
  V4L/DVB (10123): em28xx: fix reversed definitions of I2S audio modes
  V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices
  V4L/DVB (10121): em28xx: remove worthless Pinnacle PCTV HD Mini 80e device profile
  V4L/DVB (10120): em28xx: remove redundant Pinnacle Dazzle DVC 100 profile
  V4L/DVB (10119): em28xx: fix corrupted XCLK value
  V4L/DVB (10118): zoran: fix warning for a variable not used
  V4L/DVB (10116): af9013: Fix gcc false warnings
  V4L/DVB (10111a): usbvideo.h: remove an useless blank line
  V4L/DVB (10111): quickcam_messenger.c: fix a warning
  V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2
  V4L/DVB (10109): anysee: Fix usage of an unitialized function
  V4L/DVB (10104): uvcvideo: Add support for video output devices
  V4L/DVB (10102): uvcvideo: Ignore interrupt endpoint for built-in iSight webcams.
  V4L/DVB (10101): uvcvideo: Fix bulk URB processing when the header is erroneous
  ...
parents 5ed18368 13417982

Documentation/dvb/technisat.txt

0 → 100644
+69 −0
Original line number Diff line number Diff line 
How to set up the Technisat devices

===================================



1) Find out what device you have

================================



First start your linux box with a shipped kernel:

lspci -vvv for a PCI device (lsusb -vvv for an USB device) will show you for example:

02:0b.0 Network controller: Techsan Electronics Co Ltd B2C2 FlexCopII DVB chip / Technisat SkyStar2 DVB card (rev 02)



dmesg | grep frontend may show you for example:

DVB: registering frontend 0 (Conexant CX24123/CX24109)...



2) Kernel compilation:

======================



If the Technisat is the only TV device in your box get rid of unnecessary modules and check this one:

"Multimedia devices" => "Customise analog and hybrid tuner modules to build"

In this directory uncheck every driver which is activated there.



Then please activate:

2a) Main module part:



a.)"Multimedia devices" => "DVB/ATSC adapters" => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters"

b.)"Multimedia devices" => "DVB/ATSC adapters" => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters" => "Technisat/B2C2 Air/Sky/Cable2PC PCI" in case of a PCI card OR

c.)"Multimedia devices" => "DVB/ATSC adapters" => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters" => "Technisat/B2C2 Air/Sky/Cable2PC USB" in case of an USB 1.1 adapter

d.)"Multimedia devices" => "DVB/ATSC adapters" => "Technisat/B2C2 FlexcopII(b) and FlexCopIII adapters" => "Enable debug for the B2C2 FlexCop drivers"

Notice: d.) is helpful for troubleshooting



2b) Frontend module part:



1.) Revision 2.3:

a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"

b.)"Multimedia devices" => "Customise DVB frontends" => "Zarlink VP310/MT312/ZL10313 based"



2.) Revision 2.6:

a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"

b.)"Multimedia devices" => "Customise DVB frontends" => "ST STV0299 based"



3.) Revision 2.7:

a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"

b.)"Multimedia devices" => "Customise DVB frontends" => "Samsung S5H1420 based"

c.)"Multimedia devices" => "Customise DVB frontends" => "Integrant ITD1000 Zero IF tuner for DVB-S/DSS"

d.)"Multimedia devices" => "Customise DVB frontends" => "ISL6421 SEC controller"



4.) Revision 2.8:

a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"

b.)"Multimedia devices" => "Customise DVB frontends" => "Conexant CX24113/CX24128 tuner for DVB-S/DSS"

c.)"Multimedia devices" => "Customise DVB frontends" => "Conexant CX24123 based"

d.)"Multimedia devices" => "Customise DVB frontends" => "ISL6421 SEC controller"



5.) DVB-T card:

a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"

b.)"Multimedia devices" => "Customise DVB frontends" => "Zarlink MT352 based"



6.) DVB-C card:

a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"

b.)"Multimedia devices" => "Customise DVB frontends" => "ST STV0297 based"



7.) ATSC card 1st generation:

a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"

b.)"Multimedia devices" => "Customise DVB frontends" => "Broadcom BCM3510"



8.) ATSC card 2nd generation:

a.)"Multimedia devices" => "Customise DVB frontends" => "Customise the frontend modules to build"

b.)"Multimedia devices" => "Customise DVB frontends" => "NxtWave Communications NXT2002/NXT2004 based"

c.)"Multimedia devices" => "Customise DVB frontends" => "LG Electronics LGDT3302/LGDT3303 based"



Author: Uwe Bugla <uwe.bugla@gmx.de> December 2008

Documentation/video4linux/API.html

+27 −16
Original line number Diff line number Diff line 
<TITLE>V4L API</TITLE>

<H1>Video For Linux APIs</H1>

<table border=0>

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">

 <head>

  <meta content="text/html;charset=ISO-8859-2" http-equiv="Content-Type" />

  <title>V4L API</title>

 </head>

 <body>

  <h1>Video For Linux APIs</h1>

  <table border="0">

   <tr>

    <td>

<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L1_API.html>

V4L original API</a>

</td><td>

     <a href="http://www.linuxtv.org/downloads/video4linux/API/V4L1_API.html">V4L original API</a>

    </td>

    <td>

     Obsoleted by V4L2 API

</td></tr><tr><td>

<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API>

V4L2 API</a>

</td><td>

Should be used for new projects

</td></tr>

    </td>

   </tr>

   <tr>

    <td>

     <a href="http://www.linuxtv.org/downloads/video4linux/API/V4L2_API">V4L2 API</a>

    </td>

    <td>Should be used for new projects

    </td>

   </tr>

  </table>

 </body>

</html>

Documentation/video4linux/CARDLIST.bttv

+5 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ 
103 -> Grand X-Guard / Trust 814PCI                        [0304:0102]

104 -> Nebula Electronics DigiTV                           [0071:0101]

105 -> ProVideo PV143                                      [aa00:1430,aa00:1431,aa00:1432,aa00:1433,aa03:1433]

106 -> PHYTEC VD-009-X1 MiniDIN (bt878)

107 -> PHYTEC VD-009-X1 Combi (bt878)

106 -> PHYTEC VD-009-X1 VD-011 MiniDIN (bt878)

107 -> PHYTEC VD-009-X1 VD-011 Combi (bt878)

108 -> PHYTEC VD-009 MiniDIN (bt878)

109 -> PHYTEC VD-009 Combi (bt878)

110 -> IVC-100                                             [ff00:a132]
@@ -151,3 +151,6 @@ 
150 -> Geovision GV-600                                    [008a:763c]

151 -> Kozumi KTV-01C

152 -> Encore ENL TV-FM-2                                  [1000:1801]

153 -> PHYTEC VD-012 (bt878)

154 -> PHYTEC VD-012-X1 (bt878)

155 -> PHYTEC VD-012-X2 (bt878)

Documentation/video4linux/CARDLIST.cx23885

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ 
 10 -> DViCO FusionHDTV7 Dual Express                      [18ac:d618]

 11 -> DViCO FusionHDTV DVB-T Dual Express                 [18ac:db78]

 12 -> Leadtek Winfast PxDVR3200 H                         [107d:6681]

 13 -> Compro VideoMate E650F                              [185b:e800]

Documentation/video4linux/CARDLIST.cx88

+4 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  1 -> Hauppauge WinTV 34xxx models                        [0070:3400,0070:3401]

  2 -> GDI Black Gold                                      [14c7:0106,14c7:0107]

  3 -> PixelView                                           [1554:4811]

  4 -> ATI TV Wonder Pro                                   [1002:00f8]

  4 -> ATI TV Wonder Pro                                   [1002:00f8,1002:00f9]

  5 -> Leadtek Winfast 2000XP Expert                       [107d:6611,107d:6613]

  6 -> AverTV Studio 303 (M126)                            [1461:000b]

  7 -> MSI TV-@nywhere Master                              [1462:8606]
@@ -74,3 +74,6 @@ 
 73 -> TeVii S420 DVB-S                                    [d420:9022]

 74 -> Prolink Pixelview Global Extreme                    [1554:4976]

 75 -> PROF 7300 DVB-S/S2                                  [B033:3033]

 76 -> SATTRADE ST4200 DVB-S/S2                            [b200:4200]

 77 -> TBS 8910 DVB-S                                      [8910:8888]

 78 -> Prof 6200 DVB-S                                     [b022:3022]

CRA Git | Maintained and supported by SUSTech CRA and CCSE