[kernel] r16109 - in dists/sid/linux-2.6/debian: . patches/features/all patches/series

Ben Hutchings benh at alioth.debian.org
Sun Aug 8 23:16:52 UTC 2010 

Author: benh
Date: Sun Aug  8 23:16:48 2010
New Revision: 16109

Log:
V4L/DVB: Add Elgato EyeTV Diversity to dibcom driver (Closes: #591710)

Added:
   dists/sid/linux-2.6/debian/patches/features/all/V4L-DVB-Add-Elgato-EyeTV-Diversity-to-dibcom-driver.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/20

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Aug  8 21:57:08 2010	(r16108)
+++ dists/sid/linux-2.6/debian/changelog	Sun Aug  8 23:16:48 2010	(r16109)
@@ -14,6 +14,7 @@
     - German (Holger Wansing) (Closes: #592226)
   * [i386/openvz-686] Remove AMD Geode LX and VIA C3 "Nehemiah" from the
     list of supported processors; they do not implement PAE
+  * V4L/DVB: Add Elgato EyeTV Diversity to dibcom driver (Closes: #591710)
 	
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 06 Aug 2010 01:39:38 +0100
 

Added: dists/sid/linux-2.6/debian/patches/features/all/V4L-DVB-Add-Elgato-EyeTV-Diversity-to-dibcom-driver.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/V4L-DVB-Add-Elgato-EyeTV-Diversity-to-dibcom-driver.patch	Sun Aug  8 23:16:48 2010	(r16109)
@@ -0,0 +1,120 @@
+From 2626318ea81efe7e48a044bc9bf8fb589451b223 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <mueller michael at alice-dsl.net>
+Date: Mon, 26 Apr 2010 22:18:57 -0300
+Subject: [PATCH] V4L/DVB: Add Elgato EyeTV Diversity to dibcom driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 84e2f037ce9672d0fb118e3e82cecfe6122ace3f upstream.
+
+This patch introduces support for DVB-T for the following dibcom
+based card: Elgato EyeTV Diversity (USB-ID: 0fd9:0011)
+
+Support for the Elgato silver IR remote is added too (set parameter
+dvb_usb_dib0700_ir_proto=0)
+
+[w.sang at pengutronix.de: rebased to current linuxtv-master]
+Signed-off-by: Michael Müller <mueller_michael at alice-dsl.net>
+Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
+Signed-off-by: Patrick Boettcher <pboettcher at kernellabs.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+[bwh: Adjust context and numbering for 2.6.32]
+---
+ drivers/media/dvb/dvb-usb/dib0700_devices.c |   46 +++++++++++++++++++++++++-
+ drivers/media/dvb/dvb-usb/dvb-usb-ids.h     |    1 +
+ 2 files changed, 45 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
+index 6bd8951..524acf5 100644
+--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
++++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
+@@ -874,6 +874,43 @@ static struct dvb_usb_rc_key dib0700_rc_keys[] = {
+ 	{ 0x1d37, KEY_RECORD },
+ 	{ 0x1d3b, KEY_GOTO },
+ 	{ 0x1d3d, KEY_POWER },
++
++	/* Key codes for the Elgato EyeTV Diversity silver remote,
++	   set dvb_usb_dib0700_ir_proto=0 */
++	{ 0x4501, KEY_POWER },
++	{ 0x4502, KEY_MUTE },
++	{ 0x4503, KEY_1 },
++	{ 0x4504, KEY_2 },
++	{ 0x4505, KEY_3 },
++	{ 0x4506, KEY_4 },
++	{ 0x4507, KEY_5 },
++	{ 0x4508, KEY_6 },
++	{ 0x4509, KEY_7 },
++	{ 0x450a, KEY_8 },
++	{ 0x450b, KEY_9 },
++	{ 0x450c, KEY_LAST },
++	{ 0x450d, KEY_0 },
++	{ 0x450e, KEY_ENTER },
++	{ 0x450f, KEY_RED },
++	{ 0x4510, KEY_CHANNELUP },
++	{ 0x4511, KEY_GREEN },
++	{ 0x4512, KEY_VOLUMEDOWN },
++	{ 0x4513, KEY_OK },
++	{ 0x4514, KEY_VOLUMEUP },
++	{ 0x4515, KEY_YELLOW },
++	{ 0x4516, KEY_CHANNELDOWN },
++	{ 0x4517, KEY_BLUE },
++	{ 0x4518, KEY_LEFT }, /* Skip backwards */
++	{ 0x4519, KEY_PLAYPAUSE },
++	{ 0x451a, KEY_RIGHT }, /* Skip forward */
++	{ 0x451b, KEY_REWIND },
++	{ 0x451c, KEY_L }, /* Live */
++	{ 0x451d, KEY_FASTFORWARD },
++	{ 0x451e, KEY_STOP }, /* 'Reveal' for Teletext */
++	{ 0x451f, KEY_MENU }, /* KEY_TEXT for Teletext */
++	{ 0x4540, KEY_RECORD }, /* Font 'Size' for Teletext */
++	{ 0x4541, KEY_SCREEN }, /*  Full screen toggle, 'Hold' for Teletext */
++	{ 0x4542, KEY_SELECT }, /* Select video input, 'Select' for Teletext */
+ };
+ 
+ /* STK7700P: Hauppauge Nova-T Stick, AVerMedia Volar */
+@@ -1861,6 +1898,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
+ 	{ USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK807XPVR) },
+ 	{ USB_DEVICE(USB_VID_DIBCOM,    USB_PID_DIBCOM_STK807XP) },
+ 	{ USB_DEVICE(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD) },
++	{ USB_DEVICE(USB_VID_ELGATO,    USB_PID_ELGATO_EYETV_DIVERSITY) },
+ 	{ 0 }		/* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
+@@ -2173,7 +2211,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
+ 			}
+ 		},
+ 
+-		.num_device_descs = 6,
++		.num_device_descs = 7,
+ 		.devices = {
+ 			{   "DiBcom STK7070PD reference design",
+ 				{ &dib0700_usb_id_table[17], NULL },
+@@ -2199,7 +2237,11 @@ struct dvb_usb_device_properties dib0700_devices[] = {
+ 			{  "Sony PlayTV",
+ 				{ &dib0700_usb_id_table[44], NULL },
+ 				{ NULL },
+-			}
++			},
++			{   "Elgato EyeTV Diversity",
++				{ &dib0700_usb_id_table[64], NULL },
++				{ NULL },
++			},
+ 		},
+ 		.rc_interval      = DEFAULT_RC_INTERVAL,
+ 		.rc_key_map       = dib0700_rc_keys,
+diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+index a548c14..a7ae7b6 100644
+--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
++++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+@@ -271,6 +271,7 @@
+ #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_ELGATO_EYETV_DIVERSITY			0x0011
+ #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
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/20
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/20	Sun Aug  8 21:57:08 2010	(r16108)
+++ dists/sid/linux-2.6/debian/patches/series/20	Sun Aug  8 23:16:48 2010	(r16109)
@@ -7,3 +7,4 @@
 - bugfix/ia64/fix-crash-when-gcore-reads-gate-area.patch
 + bugfix/all/stable/2.6.32.18-rc1.patch
 + debian/ssb-Avoid-ABI-change-in-2.6.32.17.patch
++ features/all/V4L-DVB-Add-Elgato-EyeTV-Diversity-to-dibcom-driver.patch

More information about the Kernel-svn-changes mailing list