Skip to contentSkip to conversation

em28xx: Add entry for GADMEI UTV330+ and related IR keymap

PATCH In review Shine Liu 2 participants 3 messages Aug 30, 2009 – Aug 31, 2009

Subsystems (2)
lore
Share & tools
lore

Shine Liu

author
#0 lore raw

PATCH 1/1 em28xx: Add entry for GADMEI UTV330+ and related IR keymap

Several days ago, I posted a patch named "em28xx: Add entry for GADMEI UTV330+ and related IR codec" and this patch has been merged into
http://linuxtv.org/hg/~dougsland/v4l-dvb/rev/93337af98bcb but not included in Mauro's tree yet.

The patch added a section in ir-keymap which can be used by GADMEI 3xx series cards. But it includes some KEY_[A-Z] keys known by Tvtime. I updated this patch to use the standard media key definition recommanded by Mauro.

Sorry for the defect patch posted last week.

Regards,

Shine

drivers/media/video/em28xx/em28xx-cards.c +22 -0
@@ -558,6 +558,27 @@
 			.amux     = EM28XX_AMUX_LINE_IN,
 		} },
 	},
+	[EM2861_BOARD_GADMEI_UTV330PLUS] = {
+		.name         = "Gadmei UTV330+",
+		.tuner_type   = TUNER_TNF_5335MF,
+		.tda9887_conf = TDA9887_PRESENT,
+		.ir_codes     = ir_codes_gadmei_rm008z,
+		.decoder      = EM28XX_SAA711X,
+		.xclk         = EM28XX_XCLK_FREQUENCY_12MHZ,
+		.input        = { {
+			.type     = EM28XX_VMUX_TELEVISION,
+			.vmux     = SAA7115_COMPOSITE2,
+			.amux     = EM28XX_AMUX_VIDEO,
+		}, {
+			.type     = EM28XX_VMUX_COMPOSITE1,
+			.vmux     = SAA7115_COMPOSITE0,
+			.amux     = EM28XX_AMUX_LINE_IN,
+		}, {
+			.type     = EM28XX_VMUX_SVIDEO,
+			.vmux     = SAA7115_SVIDEO3,
+			.amux     = EM28XX_AMUX_LINE_IN,
+		} },
+	},
 	[EM2860_BOARD_TERRATEC_HYBRID_XS] = {
 		.name         = "Terratec Cinergy A Hybrid XS",
 		.valid        = EM28XX_BOARD_NOT_VALIDATED,
@@ -1665,6 +1686,7 @@
 	{0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC},
 	{0x1ba50080, EM2860_BOARD_SAA711X_REFERENCE_DESIGN, TUNER_ABSENT},
 	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
+	{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
 };
 
 /* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */
drivers/media/video/em28xx/em28xx.h +1 -0
@@ -108,6 +108,7 @@
 #define EM2882_BOARD_KWORLD_ATSC_315U		  69
 #define EM2882_BOARD_EVGA_INDTUBE		  70
 #define EM2820_BOARD_SILVERCREST_WEBCAM           71
+#define EM2861_BOARD_GADMEI_UTV330PLUS           72
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
drivers/media/common/ir-keymaps.c +43 -0

46 lines not on this page · raw message

include/media/ir-common.h +1 -0
@@ -163,6 +163,7 @@
 extern IR_KEYTAB_TYPE ir_codes_kaiomy[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_dm1105_nec[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_evga_indtube[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_gadmei_rm008z[IR_KEYTAB_SIZE];
 
 #endif
 
Documentation/video4linux/CARDLIST.em28xx +1 -0
@@ -67,3 +67,4 @@
  69 -> KWorld ATSC 315U HDTV TV Box             (em2882)        [eb1a:a313]
  70 -> Evga inDtube                             (em2882)
  71 -> Silvercrest Webcam 1.3mpix               (em2820/em2840)
+ 72 -> Gadmei UTV330+                           (em2861)
author
#1 lore raw
Quoted 10 lines · Shine Liu

Several days ago, I posted a patch named "em28xx: Add entry for GADMEI UTV330+ and related IR codec" and this patch has been merged into
http://linuxtv.org/hg/~dougsland/v4l-dvb/rev/93337af98bcb but not included in Mauro's tree yet.

The patch added a section in ir-keymap which can be used by GADMEI 3xx series cards. But it includes some KEY_[A-Z] keys known by Tvtime. I updated this patch to use the standard media key definition recommanded by Mauro.

Quoted 6 lines

Sorry for the defect patch posted last week.

Regards,

Shine

Updated IR keymap coding sytle.

drivers/media/video/em28xx/em28xx-cards.c +22 -0
@@ -558,6 +558,27 @@
 			.amux     = EM28XX_AMUX_LINE_IN,
 		} },
 	},
+	[EM2861_BOARD_GADMEI_UTV330PLUS] = {
+		.name         = "Gadmei UTV330+",
+		.tuner_type   = TUNER_TNF_5335MF,
+		.tda9887_conf = TDA9887_PRESENT,
+		.ir_codes     = ir_codes_gadmei_rm008z,
+		.decoder      = EM28XX_SAA711X,
+		.xclk         = EM28XX_XCLK_FREQUENCY_12MHZ,
+		.input        = { {
+			.type     = EM28XX_VMUX_TELEVISION,
+			.vmux     = SAA7115_COMPOSITE2,
+			.amux     = EM28XX_AMUX_VIDEO,
+		}, {
+			.type     = EM28XX_VMUX_COMPOSITE1,
+			.vmux     = SAA7115_COMPOSITE0,
+			.amux     = EM28XX_AMUX_LINE_IN,
+		}, {
+			.type     = EM28XX_VMUX_SVIDEO,
+			.vmux     = SAA7115_SVIDEO3,
+			.amux     = EM28XX_AMUX_LINE_IN,
+		} },
+	},
 	[EM2860_BOARD_TERRATEC_HYBRID_XS] = {
 		.name         = "Terratec Cinergy A Hybrid XS",
 		.valid        = EM28XX_BOARD_NOT_VALIDATED,
@@ -1665,6 +1686,7 @@
 	{0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC},
 	{0x1ba50080, EM2860_BOARD_SAA711X_REFERENCE_DESIGN, TUNER_ABSENT},
 	{0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
+	{0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
 };
 
 /* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */
drivers/media/video/em28xx/em28xx.h +1 -0
@@ -108,6 +108,7 @@
 #define EM2882_BOARD_KWORLD_ATSC_315U		  69
 #define EM2882_BOARD_EVGA_INDTUBE		  70
 #define EM2820_BOARD_SILVERCREST_WEBCAM           71
+#define EM2861_BOARD_GADMEI_UTV330PLUS           72
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
drivers/media/common/ir-keymaps.c +43 -0

46 lines not on this page · raw message

include/media/ir-common.h +1 -0
@@ -163,6 +163,7 @@
 extern IR_KEYTAB_TYPE ir_codes_kaiomy[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_dm1105_nec[IR_KEYTAB_SIZE];
 extern IR_KEYTAB_TYPE ir_codes_evga_indtube[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_gadmei_rm008z[IR_KEYTAB_SIZE];
 
 #endif
 
Documentation/video4linux/CARDLIST.em28xx +1 -0
@@ -67,3 +67,4 @@
  69 -> KWorld ATSC 315U HDTV TV Box             (em2882)        [eb1a:a313]
  70 -> Evga inDtube                             (em2882)
  71 -> Silvercrest Webcam 1.3mpix               (em2820/em2840)
+ 72 -> Gadmei UTV330+                           (em2861)
#2 lore raw

Em Mon, 31 Aug 2009 00:05:56 +0800
Shine Liu <[email protected]> escreveu:

Quoted 10 lines · Shine Liu
Quoted 9 lines

Several days ago, I posted a patch named "em28xx: Add entry for GADMEI UTV330+ and related IR codec" and this patch has been merged into
http://linuxtv.org/hg/~dougsland/v4l-dvb/rev/93337af98bcb but not included in Mauro's tree yet.

The patch added a section in ir-keymap which can be used by GADMEI 3xx series cards. But it includes some KEY_[A-Z] keys known by Tvtime. I updated this patch to use the standard media key definition recommanded by Mauro.

It were still using a few wrong key bindings. I fixed it and applied the patch.

That's said, maybe we need a patch to tvtime and other applications that don't accept some keys, like channel up/down and key_power2.

Cheers,
Mauro