rpms/kernel/devel kernel.spec, 1.1442, 1.1443 linux-2.6-v4l-dvb-experimental.patch, 1.3, 1.4 linux-2.6-v4l-dvb-update.patch, 1.9, 1.10 linux-2.6-hdpvr.patch, 1.6, NONE

Mauro Carvalho Chehab mchehab at fedoraproject.org
Thu Mar 19 01:56:08 UTC 2009 

Author: mchehab

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27563

Modified Files:
	kernel.spec linux-2.6-v4l-dvb-experimental.patch 
	linux-2.6-v4l-dvb-update.patch 
Removed Files:
	linux-2.6-hdpvr.patch 
Log Message:
More 59 patches for drivers/media. This series include:
        - analog support for Austek au8522/au0828 based cards;
        - gspca changes for controlling jpeg quality;
        - some internal V4L2 API changes on existing drivers;
        - some bug fixes;
        - hdpvr merge into V4L/DVB tree.

The upstream patches added at the v4l-dvb patch are:

V4L/DVB (10789): m5602-s5k4aa: Split up the initial sensor probe in chunks.
V4L/DVB (10832): tvaudio: Avoid breakage with tda9874a
V4L/DVB (10834): zoran: auto-select bt866 for AverMedia 6 Eyes
V4L/DVB (10972): zl10353: i2c_gate_ctrl bug fix
V4L/DVB (10974): Use Diseqc 3/3 mode to send data
V4L/DVB (10975): Bug: Use signed types, Offsets and range can be negative
V4L/DVB (10976): Bug fix: For legacy applications stv0899 performs search only first time after insmod.
V4L/DVB (10977): STB6100 init fix, the call to stb6100_set_bandwidth needs an argument
V4L/DVB (10978): Report tuning algorith correctly
V4L/DVB (11039): gspca - most jpeg subdrivers: Change the JPEG header creation.
V4L/DVB (11040): gspca - most jpeg subdrivers: Have the JPEG quality settable.
V4L/DVB (11042): v4l2-api: Add definitions for V4L2_MPEG_STREAM_VBI_FMT_IVTV payloads
V4L/DVB (11044): v4l2-device: add v4l2_device_disconnect
V4L/DVB (11045): v4l2: call v4l2_device_disconnect in USB drivers.
V4L/DVB (11046): bttv: convert to v4l2_device.
V4L/DVB (11047): cx88: convert to v4l2_device.
V4L/DVB (11048): zoran: fix incorrect return type of notify function.
V4L/DVB (11051): v4l-dvb: replace remaining references to the old mailinglist.
V4L/DVB (11052): bt819: remove an unused header
V4L/DVB (11053): saa7134: set v4l2_dev field of video_device
V4L/DVB (11054): Shorten some lines in stv0900 to less then 81 characters
V4L/DVB (11055): Fix typo in stv0900
V4L/DVB (11056): Bug fix in NetUP: restore high address lines in CI
V4L/DVB (11057): Fix CiMax stability in Netup Dual DVB-S2 CI
V4L/DVB (11059): xc5000: fix bug for hybrid xc5000 devices with IF other than 5380
V4L/DVB (11060): au8522: rename the au8522.c source file
V4L/DVB (11061): au8522: move shared state and common functions into a separate header files
V4L/DVB (11062): au8522: fix register read/write high bits
V4L/DVB (11063): au8522: power down the digital demod when not in use
V4L/DVB (11064): au8522: make use of hybrid framework so analog/digital demod can share state
V4L/DVB (11065): au8522: add support for analog side of demodulator
V4L/DVB (11066): au0828: add support for analog functionality in bridge
V4L/DVB (11067): au0828: workaround a bug in the au0828 i2c handling
V4L/DVB (11068): au0828: add analog profile for the HVR-850
V4L/DVB (11069): au8522: add mutex protecting use of hybrid state
V4L/DVB (11070): au0828: Rework the way the analog video binding occurs
V4L/DVB (11071): tveeprom: add the xc5000 tuner to the tveeprom definition
V4L/DVB (11072): au0828: advertise only NTSC-M (as opposed to all NTSC standards)
V4L/DVB (11073): au0828: disable VBI code since it doesn't yet work
V4L/DVB (11074): au0828: fix i2c enumeration bug
V4L/DVB (11075): au0828: make register debug lines easier to read
V4L/DVB (11076): au0828: make g_chip_ident call work properly
V4L/DVB (11077): au0828: properly handle missing analog USB endpoint
V4L/DVB (11078): au0828: properly handle non-existent analog inputs
V4L/DVB (11079): au0828: fix panic on disconnect if analog initialization failed
V4L/DVB (11080): au0828: Convert to use v4l2_device/subdev framework
V4L/DVB (11081): au0828: make sure v4l2_device name is unique
V4L/DVB (11082): au0828: remove memset calls in v4l2 routines.
V4L/DVB (11083): au0828: remove some unneeded braces
V4L/DVB (11084): au0828: add entry for undefined input type
V4L/DVB (11085): au0828/au8522: Codingstyle fixes
V4L/DVB (11086): au0828: rename macro for currently non-function VBI support
V4L/DVB (11088): au0828: finish videodev/subdev conversion
V4L/DVB (11089): au8522: finish conversion to v4l2_device/subdev
V4L/DVB (11091): cx18, ivtv: Ensure endianess for linemasks in VBI embedded in MPEG stream
V4L/DVB (11092): cx18: Optimize processing of VBI buffers from the capture unit
V4L/DVB (11095): adds V4L2_CID_SHARPNESS to v4l2_ctrl_query_fill()
V4L/DVB (11096): V4L2 Driver for the Hauppauge HD PVR usb capture device
V4L/DVB (11097): use video_ioctl2 as ioctl handler directly




Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1442
retrieving revision 1.1443
diff -u -r1.1442 -r1.1443
--- kernel.spec	18 Mar 2009 12:36:26 -0000	1.1442
+++ kernel.spec	19 Mar 2009 01:55:32 -0000	1.1443
@@ -680,7 +680,6 @@
 Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
-Patch2902: linux-2.6-hdpvr.patch
 
 # fs fixes
 Patch2910: linux-2.6-ext4-extent-header-check-fix.patch
@@ -1230,8 +1229,6 @@
 ApplyPatch linux-2.6-v4l-dvb-fixes.patch
 ApplyPatch linux-2.6-v4l-dvb-update.patch
 ApplyPatch linux-2.6-v4l-dvb-experimental.patch
-# http://hg.jannau.net/hdpvr/
-ApplyPatch linux-2.6-hdpvr.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
@@ -1821,6 +1818,10 @@
 # and build.
 
 %changelog
+* Wed Mar 18 2009 Mauro Carvalho Chehab <mchehab at redhat.com>
+- merge hdpvr patch into v4l-dvb updates
+- update v4l-dvb to reflect changes at linux-next
+
 * Wed Mar 18 2009 Jarod Wilson <jarod at redhat.com>
 - Update hdpvr patch to version targeted for v4l-dvb merge
 - Re-sort patches to add hdpvr after v4l-dvb updates

linux-2.6-v4l-dvb-experimental.patch:

Index: linux-2.6-v4l-dvb-experimental.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-experimental.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-v4l-dvb-experimental.patch	18 Mar 2009 12:36:26 -0000	1.3
+++ linux-2.6-v4l-dvb-experimental.patch	19 Mar 2009 01:55:33 -0000	1.4
@@ -26,7 +26,7 @@
  
  source "drivers/media/video/usbvideo/Kconfig"
 diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index 02379f5..9e40396 100644
+index b904674..08765d8 100644
 --- a/drivers/media/video/Makefile
 +++ b/drivers/media/video/Makefile
 @@ -67,6 +67,7 @@ obj-$(CONFIG_VIDEO_MEYE) += meye.o
@@ -14614,14 +14614,14 @@
  		memcpy(buffer + 2, ptr, len);
  
 diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index e77f81b..3e107d5 100644
+index f27604a..f9d48c9 100644
 --- a/include/linux/i2c-id.h
 +++ b/include/linux/i2c-id.h
-@@ -87,7 +87,8 @@
+@@ -88,6 +88,7 @@
  #define I2C_HW_B_CX2341X	0x010020 /* Conexant CX2341X MPEG encoder cards */
  #define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
  #define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
 +#define I2C_HW_B_CX231XX	0x010024 /* Conexant CX231XX USB based cards */
+ #define I2C_HW_B_HDPVR		0x010025 /* Hauppauge HD PVR */
  
  /* --- SGI adapters							*/
- #define I2C_HW_SGI_VINO		0x160000

linux-2.6-v4l-dvb-update.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.9 -r 1.10 linux-2.6-v4l-dvb-update.patch
Index: linux-2.6-v4l-dvb-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- linux-2.6-v4l-dvb-update.patch	18 Mar 2009 12:36:27 -0000	1.9
+++ linux-2.6-v4l-dvb-update.patch	19 Mar 2009 01:55:34 -0000	1.10
@@ -1,7 +1,9 @@
-Abylay Ospan (3):
+Abylay Ospan (5):
       V4L/DVB (10796): Add init code for NetUP Dual DVB-S2 CI card
       V4L/DVB (10797): Add EEPROM code for NetUP Dual DVB-S2 CI card.
       V4L/DVB (10798): Add CIMax(R) SP2 Common Interface code for NetUP Dual DVB-S2 CI card
+      V4L/DVB (11056): Bug fix in NetUP: restore high address lines in CI
+      V4L/DVB (11057): Fix CiMax stability in Netup Dual DVB-S2 CI
 
 Adam Baker (2):
       V4L/DVB (10639): gspca - sq905: New subdriver.
@@ -27,7 +29,7 @@
       V4L/DVB (10946): radio-rtrack2: fix double mutex_unlock
       V4L/DVB (10961): radio-terratec: remove linux/delay.h which hadn't been used.
 
-Andy Walls (40):
+Andy Walls (43):
       V4L/DVB (10274): cx18: Fix a PLL divisor update for the I2S master clock
       V4L/DVB (10275): cx18: Additional debug to display outgoing mailbox parameters
       V4L/DVB (10276): cx18, cx2341x, ivtv: Add AC-3 audio encoding control to cx18
@@ -68,6 +70,9 @@
       V4L/DVB (10854): cx18: Correct comments about vertical and horizontal blanking timings
       V4L/DVB (10855): cx18: Fix VPS service register codes
       V4L/DVB (10856): cx18: Add interlock so sliced VBI insertion only happens for an MPEG PS
+      V4L/DVB (11042): v4l2-api: Add definitions for V4L2_MPEG_STREAM_VBI_FMT_IVTV payloads
+      V4L/DVB (11091): cx18, ivtv: Ensure endianess for linemasks in VBI embedded in MPEG stream
+      V4L/DVB (11092): cx18: Optimize processing of VBI buffers from the capture unit
 
 Antoine Jacquet (1):
       V4L/DVB (10263): zr364xx: add support for Aiptek DV T300
@@ -86,9 +91,39 @@
 Bruno Christo (1):
       V4L/DVB (10827): Add support for GeoVision GV-800(S)
 
-Devin Heitmueller (2):
+Devin Heitmueller (32):
       V4L/DVB (10320): dib0700: fix i2c error message to make data type clear
       V4L/DVB (10321): dib0700: Report dib0700_i2c_enumeration failures
+      V4L/DVB (11059): xc5000: fix bug for hybrid xc5000 devices with IF other than 5380
+      V4L/DVB (11060): au8522: rename the au8522.c source file
+      V4L/DVB (11061): au8522: move shared state and common functions into a separate header files
+      V4L/DVB (11062): au8522: fix register read/write high bits
+      V4L/DVB (11063): au8522: power down the digital demod when not in use
+      V4L/DVB (11064): au8522: make use of hybrid framework so analog/digital demod can share state
+      V4L/DVB (11065): au8522: add support for analog side of demodulator
+      V4L/DVB (11066): au0828: add support for analog functionality in bridge
+      V4L/DVB (11067): au0828: workaround a bug in the au0828 i2c handling
+      V4L/DVB (11068): au0828: add analog profile for the HVR-850
+      V4L/DVB (11069): au8522: add mutex protecting use of hybrid state
+      V4L/DVB (11070): au0828: Rework the way the analog video binding occurs
+      V4L/DVB (11071): tveeprom: add the xc5000 tuner to the tveeprom definition
+      V4L/DVB (11072): au0828: advertise only NTSC-M (as opposed to all NTSC standards)
+      V4L/DVB (11073): au0828: disable VBI code since it doesn't yet work
+      V4L/DVB (11074): au0828: fix i2c enumeration bug
+      V4L/DVB (11075): au0828: make register debug lines easier to read
+      V4L/DVB (11076): au0828: make g_chip_ident call work properly
+      V4L/DVB (11077): au0828: properly handle missing analog USB endpoint
+      V4L/DVB (11078): au0828: properly handle non-existent analog inputs
+      V4L/DVB (11079): au0828: fix panic on disconnect if analog initialization failed
+      V4L/DVB (11080): au0828: Convert to use v4l2_device/subdev framework
+      V4L/DVB (11081): au0828: make sure v4l2_device name is unique
+      V4L/DVB (11082): au0828: remove memset calls in v4l2 routines.
+      V4L/DVB (11083): au0828: remove some unneeded braces
+      V4L/DVB (11084): au0828: add entry for undefined input type
+      V4L/DVB (11085): au0828/au8522: Codingstyle fixes
+      V4L/DVB (11086): au0828: rename macro for currently non-function VBI support
+      V4L/DVB (11088): au0828: finish videodev/subdev conversion
+      V4L/DVB (11089): au8522: finish conversion to v4l2_device/subdev
 
 Douglas Kosovic (1):
       V4L/DVB (10299): bttv: Add support for IVCE-8784 support for V4L2 bttv driver
@@ -126,7 +161,7 @@
       V4L/DVB (11026): sh-mobile-ceu-camera: set field to the value, configured at open()
       V4L/DVB (11027): soc-camera: configure drivers with a default format at probe time
 
-Hans Verkuil (124):
+Hans Verkuil (132):
       V4L/DVB (10231): v4l2-subdev: add v4l2_ext_controls support
       V4L/DVB (10244): v4l2: replace a few snprintfs with strlcpy
       V4L/DVB (10246): saa6752hs: convert to v4l2_subdev.
@@ -251,11 +286,19 @@
       V4L/DVB (10988): v4l2-dev: use parent field if the v4l2_device has no parent set.
       V4L/DVB (11021): v4l2-device: add a notify callback.
       V4L/DVB (11022): zoran/bt819: use new notify functionality.
+      V4L/DVB (11044): v4l2-device: add v4l2_device_disconnect
+      V4L/DVB (11045): v4l2: call v4l2_device_disconnect in USB drivers.
+      V4L/DVB (11046): bttv: convert to v4l2_device.
+      V4L/DVB (11047): cx88: convert to v4l2_device.
+      V4L/DVB (11048): zoran: fix incorrect return type of notify function.
+      V4L/DVB (11051): v4l-dvb: replace remaining references to the old mailinglist.
+      V4L/DVB (11052): bt819: remove an unused header
+      V4L/DVB (11053): saa7134: set v4l2_dev field of video_device
 
 Hans Werner (1):
       V4L/DVB (10392): lnbp21: documentation about the system register
 
-Igor M. Liplianin (16):
+Igor M. Liplianin (18):
       V4L/DVB (10266): Add support for TurboSight TBS6920 DVB-S2 PCI-e card.
       V4L/DVB (10267): Add support for TeVii S470 DVB-S2 PCI-e card.
       V4L/DVB (10268): Proper implement set_voltage in cx24116.
@@ -272,6 +315,8 @@
       V4L/DVB (10805): Add support for NetUP Dual DVB-S2 CI card
       V4L/DVB (10808): Fix typo in lnbp21.c
       V4L/DVB (10871): stv0900: delete debug messages not related to stv0900 tuning algorythm
+      V4L/DVB (11054): Shorten some lines in stv0900 to less then 81 characters
+      V4L/DVB (11055): Fix typo in stv0900
 
 Indika Katugampala (1):
       V4L/DVB (10528): em28xx: support added for IO-DATA GV/MVP SZ - EMPIA-2820 chipset
@@ -279,6 +324,11 @@
 Jan Engelhardt (1):
       V4L/DVB (10391): dvb: constify VFTs
 
+Janne Grunau (3):
+      V4L/DVB (11095): adds V4L2_CID_SHARPNESS to v4l2_ctrl_query_fill()
+      V4L/DVB (11096): V4L2 Driver for the Hauppauge HD PVR usb capture device
+      V4L/DVB (11097): use video_ioctl2 as ioctl handler directly
+
 Jean Delvare (7):
       V4L/DVB (10867): vino: fold i2c-algo-sgi code into vino.
       V4L/DVB (10931): zoran: Drop the lock_norm module parameter
@@ -288,7 +338,7 @@
       V4L/DVB (10940): saa6588: Prevent general protection fault on rmmod
       V4L/DVB (10943): cx88: Prevent general protection fault on rmmod
 
-Jean-Francois Moine (58):
+Jean-Francois Moine (60):
       V4L/DVB (10332): gspca - main: Version change.
       V4L/DVB (10333): gspca - main and many subdrivers: Remove the epaddr variable.
       V4L/DVB (10337): gspca - common: Simplify the debug macros.
@@ -347,6 +397,8 @@
       V4L/DVB (10681): gspca - zc3xx: Bad probe of the ov7630c sensor.
       V4L/DVB (10787): gspca - mars: Bad webcam register values tied to saturation.
       V4L/DVB (10788): gspca - vc032x: Bad matrix for sensor mi1310_soc.
+      V4L/DVB (11039): gspca - most jpeg subdrivers: Change the JPEG header creation.
+      V4L/DVB (11040): gspca - most jpeg subdrivers: Have the JPEG quality settable.
 
 Jochen Friedrich (2):
       V4L/DVB (10452): Add Freescale MC44S803 tuner driver
@@ -762,6 +814,21 @@
  tvaudio.o
  	new, experimental module which is supported to provide a single
  	driver for all simple i2c audio control chips (tda/tea*).
+diff --git a/Documentation/video4linux/bttv/README b/Documentation/video4linux/bttv/README
+index 7ca2154..3a367cd 100644
+--- a/Documentation/video4linux/bttv/README
++++ b/Documentation/video4linux/bttv/README
+@@ -63,8 +63,8 @@ If you have some knowledge and spare time, please try to fix this
+ yourself (patches very welcome of course...)  You know: The linux
+ slogan is "Do it yourself".
+ 
+-There is a mailing list: video4linux-list at redhat.com.
+-https://listman.redhat.com/mailman/listinfo/video4linux-list
++There is a mailing list: linux-media at vger.kernel.org
++http://vger.kernel.org/vger-lists.html#linux-media
+ 
+ If you have trouble with some specific TV card, try to ask there
+ instead of mailing me directly.  The chance that someone with the
 diff --git a/Documentation/video4linux/cx2341x/README.hm12 b/Documentation/video4linux/cx2341x/README.hm12
 index 0e213ed..b36148e 100644
 --- a/Documentation/video4linux/cx2341x/README.hm12
@@ -855,7 +922,7 @@
  Module Parameters
  =================
 diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
-index ff12437..4207590 100644
+index ff12437..a311773 100644
 --- a/Documentation/video4linux/v4l2-framework.txt
 +++ b/Documentation/video4linux/v4l2-framework.txt
 @@ -47,7 +47,9 @@ All drivers have the following structure:
@@ -894,7 +961,25 @@
  
  You unregister with:
  
-@@ -134,7 +144,7 @@ The recommended approach is as follows:
+@@ -95,6 +105,17 @@ You unregister with:
+ 
+ Unregistering will also automatically unregister all subdevs from the device.
+ 
++If you have a hotpluggable device (e.g. a USB device), then when a disconnect
++happens the parent device becomes invalid. Since v4l2_device has a pointer to
++that parent device it has to be cleared as well to mark that the parent is
++gone. To do this call:
++
++	v4l2_device_disconnect(struct v4l2_device *v4l2_dev);
++
++This does *not* unregister the subdevs, so you still need to call the
++v4l2_device_unregister() function for that. If your driver is not hotpluggable,
++then there is no need to call v4l2_device_disconnect().
++
+ Sometimes you need to iterate over all devices registered by a specific
[...13679 lines suppressed...]
+ #define I2C_DRIVERID_VP27SMPX	93	/* Panasonic VP27s tuner internal MPX */
+ #define I2C_DRIVERID_M52790 	95      /* Mitsubishi M52790SP/FP AV switch */
+ #define I2C_DRIVERID_CS5345	96	/* cs5345 audio processor	*/
++#define I2C_DRIVERID_AU8522	97	/* Auvitek au8522       */
+ 
+ #define I2C_DRIVERID_OV7670 1048	/* Omnivision 7670 camera */
+ 
+@@ -87,6 +88,7 @@
+ #define I2C_HW_B_CX2341X	0x010020 /* Conexant CX2341X MPEG encoder cards */
+ #define I2C_HW_B_CX23885	0x010022 /* conexant 23885 based tv cards (bus1) */
+ #define I2C_HW_B_AU0828		0x010023 /* auvitek au0828 usb bridge */
++#define I2C_HW_B_HDPVR		0x010025 /* Hauppauge HD PVR */
+ 
+ /* --- SGI adapters							*/
+ #define I2C_HW_SGI_VINO		0x160000
+diff --git a/include/linux/ivtv.h b/include/linux/ivtv.h
+index f272028..062d20f 100644
+--- a/include/linux/ivtv.h
++++ b/include/linux/ivtv.h
+@@ -60,10 +60,10 @@ struct ivtv_dma_frame {
+ 
+ #define IVTV_IOC_DMA_FRAME  _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtv_dma_frame)
+ 
+-/* These are the VBI types as they appear in the embedded VBI private packets. */
+-#define IVTV_SLICED_TYPE_TELETEXT_B     (1)
+-#define IVTV_SLICED_TYPE_CAPTION_525    (4)
+-#define IVTV_SLICED_TYPE_WSS_625        (5)
+-#define IVTV_SLICED_TYPE_VPS            (7)
++/* Deprecated defines: applications should use the defines from videodev2.h */
++#define IVTV_SLICED_TYPE_TELETEXT_B     V4L2_MPEG_VBI_IVTV_TELETEXT_B
++#define IVTV_SLICED_TYPE_CAPTION_525    V4L2_MPEG_VBI_IVTV_CAPTION_525
++#define IVTV_SLICED_TYPE_WSS_625        V4L2_MPEG_VBI_IVTV_WSS_625
++#define IVTV_SLICED_TYPE_VPS            V4L2_MPEG_VBI_IVTV_VPS
+ 
+ #endif /* _LINUX_IVTV_H */
 diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h
 deleted file mode 100644
 index e26c0c8..0000000
@@ -86490,7 +93860,7 @@
  #endif /* __LINUX_VIDEODEV_H */
  
 diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
-index 5571dbe..78ba075 100644
+index 5571dbe..61f1a49 100644
 --- a/include/linux/videodev2.h
 +++ b/include/linux/videodev2.h
 @@ -344,6 +344,7 @@ struct v4l2_pix_format {
@@ -86526,7 +93896,61 @@
  
  /*  MPEG-class control IDs defined by V4L2 */
  #define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)
-@@ -1403,14 +1412,6 @@ struct v4l2_dbg_chip_ident {
+@@ -1339,6 +1348,53 @@ struct v4l2_sliced_vbi_data {
+ };
+ 
+ /*
++ * Sliced VBI data inserted into MPEG Streams
++ */
++
++/*
++ * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
++ *
++ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
++ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
++ * data
++ *
++ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
++ * definitions are not included here.  See the MPEG-2 specifications for details
++ * on these headers.
++ */
++
++/* Line type IDs */
++#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
++#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
++#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
++#define V4L2_MPEG_VBI_IVTV_VPS            (7)
++
++struct v4l2_mpeg_vbi_itv0_line {
++	__u8 id;	/* One of V4L2_MPEG_VBI_IVTV_* above */
++	__u8 data[42];	/* Sliced VBI data for the line */
++} __attribute__ ((packed));
++
++struct v4l2_mpeg_vbi_itv0 {
++	__le32 linemask[2]; /* Bitmasks of VBI service lines present */
++	struct v4l2_mpeg_vbi_itv0_line line[35];
++} __attribute__ ((packed));
++
++struct v4l2_mpeg_vbi_ITV0 {
++	struct v4l2_mpeg_vbi_itv0_line line[36];
++} __attribute__ ((packed));
++
++#define V4L2_MPEG_VBI_IVTV_MAGIC0	"itv0"
++#define V4L2_MPEG_VBI_IVTV_MAGIC1	"ITV0"
++
++struct v4l2_mpeg_vbi_fmt_ivtv {
++	__u8 magic[4];
++	union {
++		struct v4l2_mpeg_vbi_itv0 itv0;
++		struct v4l2_mpeg_vbi_ITV0 ITV0;
++	};
++} __attribute__ ((packed));
++
++/*
+  *	A G G R E G A T E   S T R U C T U R E S
+  */
+ 
+@@ -1403,14 +1459,6 @@ struct v4l2_dbg_chip_ident {
  	__u32 revision;    /* chip revision, chip specific */
  } __attribute__ ((packed));
  
@@ -86541,7 +93965,7 @@
  /*
   *	I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
   *
-@@ -1488,8 +1489,6 @@ struct v4l2_chip_ident_old {
+@@ -1488,8 +1536,6 @@ struct v4l2_chip_ident_old {
  /* Experimental, meant for debugging, testing and internal use.
     Never use this ioctl in applications! */
  #define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
@@ -86867,7 +94291,7 @@
  
  extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
 diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
-index 9aaf652..43684f1 100644
+index 9aaf652..ca2aa6d 100644
 --- a/include/media/v4l2-chip-ident.h
 +++ b/include/media/v4l2-chip-ident.h
 @@ -37,10 +37,8 @@ enum {
@@ -86882,7 +94306,7 @@
  	V4L2_IDENT_SAA7113 = 103,
  	V4L2_IDENT_SAA7114 = 104,
  	V4L2_IDENT_SAA7115 = 105,
-@@ -63,30 +61,88 @@ enum {
+@@ -63,30 +61,91 @@ enum {
  	V4L2_IDENT_OV7720 = 251,
  	V4L2_IDENT_OV7725 = 252,
  
@@ -86896,6 +94320,9 @@
  	V4L2_IDENT_CX23416 = 416,
  	V4L2_IDENT_CX23418 = 418,
  
++	/* module au0828 */
++	V4L2_IDENT_AU0828 = 828,
++
 +	/* module indycam: just ident 2000 */
 +	V4L2_IDENT_INDYCAM = 2000,
 +
@@ -87024,7 +94451,7 @@
 +
  #endif /* V4L2_COMMON_H_ */
 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
-index 55e41af..3d8e96f 100644
+index 55e41af..0dd3e8e 100644
 --- a/include/media/v4l2-device.h
 +++ b/include/media/v4l2-device.h
 @@ -33,7 +33,9 @@
@@ -87038,7 +94465,7 @@
  	struct device *dev;
  	/* used to keep track of the registered subdevs */
  	struct list_head subdevs;
-@@ -42,9 +44,14 @@ struct v4l2_device {
+@@ -42,33 +44,43 @@ struct v4l2_device {
  	spinlock_t lock;
  	/* unique device name, by default the driver name + bus ID */
  	char name[V4L2_DEVICE_NAME_SIZE];
@@ -87052,9 +94479,14 @@
 +   dev may be NULL in rare cases (ISA devices). In that case you
 +   must fill in the v4l2_dev->name field before calling this function. */
  int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev);
- /* Set v4l2_dev->dev->driver_data to NULL and unregister all sub-devices */
+-/* Set v4l2_dev->dev->driver_data to NULL and unregister all sub-devices */
++/* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
++   Since the parent disappears this ensures that v4l2_dev doesn't have an
++   invalid parent pointer. */
++void v4l2_device_disconnect(struct v4l2_device *v4l2_dev);
++/* Unregister all sub-devices and any other resources related to v4l2_dev. */
  void v4l2_device_unregister(struct v4l2_device *v4l2_dev);
-@@ -52,23 +59,24 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev);
+ 
  /* Register a subdev with a v4l2 device. While registered the subdev module
     is marked as in-use. An error is returned if the module is no longer
     loaded when you attempt to register it. */
@@ -87084,7 +94516,7 @@
  			if ((cond) && sd->ops->o && sd->ops->o->f) 	\
  				sd->ops->o->f(sd , ##args); 		\
  	} while (0)
-@@ -77,12 +85,12 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
+@@ -77,12 +89,12 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
     If the callback returns an error other than 0 or -ENOIOCTLCMD, then
     return with that error code. Note that you cannot add or delete a
     subdev while walking the subdevs list. */
@@ -87099,7 +94531,7 @@
  		if ((cond) && sd->ops->o && sd->ops->o->f) 		\
  			err = sd->ops->o->f(sd , ##args); 		\
  		if (err && err != -ENOIOCTLCMD)				\
-@@ -94,16 +102,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
+@@ -94,16 +106,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd);
  /* Call the specified callback for all subdevs matching grp_id (if 0, then
     match them all). Ignore any errors. Note that you cannot add or delete
     a subdev while walking the subdevs list. */


--- linux-2.6-hdpvr.patch DELETED ---

More information about the fedora-extras-commits mailing list