[PATCH] Add the IT LCN for DVB-T
Hello dear list
I write a patch for scan.c to add the LCN for the IT DVB-T.
This patch add the option -I.This option work like the -u option
My little contribute:)
Valerio 'ftp21'--- scan.c 2010-06-09 13:22:32.560820169 +0200
+++ scan_modificato.c 2010-06-09 13:17:52.600818827 +0200
@@ -59,6 +59,7 @@
static int get_other_nits;
static int vdr_dump_provider;
static int vdr_dump_channum;
+static int country;
static int no_ATSC_PSIP;
static int ATSC_type=1;
static int ca_select = -1;
@@ -344,7 +345,7 @@
info("Network Name '%.*s'\n", len, buf + 2);
}
-static void parse_terrestrial_uk_channel_number (const unsigned char *buf, void *dummy)
+static void parse_terrestrial_uk_channel_number (const unsigned char *buf, void *dummy,int c)
{
(void)dummy;
@@ -361,8 +362,18 @@
// desc id, desc len, (service id, service number)
buf += 2;
for (i = 0; i < n; i++) {
- service_id = (buf[0]<<8)|(buf[1]&0xff);
- channel_num = ((buf[2]&0x03)<<8)|(buf[3]&0xff);
+ switch(c){
+ case 1:
+ //UK LCN
+service_id = (buf[0]<<8)|(buf[1]&0xff);
+channel_num = ((buf[2]&0x03)<<8)|(buf[3]&0xff);
+break;
+ case 2:
+ //IT LCN
+service_id=(buf[0] << 8) | buf[1];
+channel_num=((buf[2] & 0x03) << 8) | buf[3];
+break;
+ }
debug("Service ID 0x%x has channel number %d ", service_id, channel_num);
list_for_each(p1, &scanned_transponders) {
t = list_entry(p1, struct transponder, list);
@@ -695,7 +706,7 @@
* so we parse this only if the user says so to avoid
* problems when 0x83 is something entirely different... */
if (t == NIT && vdr_dump_channum)
-parse_terrestrial_uk_channel_number (buf, data);
+parse_terrestrial_uk_channel_number (buf, data,country);
break;
default:
@@ -2115,6 +2126,7 @@
" -l lnb-type (DVB-S Only) (use -l help to print types) or \n"
" -l low[,high[,switch]] in Mhz\n"
" -u UK DVB-T Freeview channel numbering for VDR\n\n"
+ " -I IT DVB-T channel numbering for VDR\n\n"
" -P do not use ATSC PSIP tables for scanning\n"
" (but only PAT and PMT) (applies for ATSC only)\n"
" -A N check for ATSC 1=Terrestrial [default], 2=Cable or 3=both\n"
@@ -2166,7 +2178,7 @@
/* start with default lnb type */
lnb_type = *lnb_enum(0);
- while ((opt = getopt(argc, argv, "5cnpa:f:d:s:o:x:e:t:i:l:vquPA:U")) != -1) {
+ while ((opt = getopt(argc, argv, "5cnpa:f:d:s:o:x:e:t:i:l:vquIPA:U")) != -1) {
switch (opt) {
case 'a':
adapter = strtoul(optarg, NULL, 0);
@@ -2230,6 +2242,13 @@
verbosity = 0;
break;
case 'u':
+ //uk lcn
+ country=1;
+ vdr_dump_channum = 1;
+ break;
+ case 'I':
+ //it lcn
+ country=2;
vdr_dump_channum = 1;
break;
case 'P':
[GIT FIXES FOR 2.6.36] - fixes for vpfe/vpif drivers
Mauro, Please pull from ... The following changes since commit 41c5f984b67b331064e69acc9fca5e99bf73d400: Mauro Carvalho Chehab (1): Merge tag 'v2.6.35-rc2' into HEAD are available in the git repository at: git://linuxtv.org/mkaricheri/vpfe-vpbe-video.git for_2.6.36 Murali Karicheri (1): vpif: removing VPIF config variables Vaibhav Hiremath (1): vpfe_capture: Create separate Kconfig file for davinci devices drivers/media/video/Kconfig | 94 +-- drivers/media/video/Makefile|2 +- drivers/media/video/davinci/Kconfig | 93 ++ 3 files changed, 95 insertions(+), 94 deletions(-) create mode 100644 drivers/media/video/davinci/Kconfig -- Murali Karicheri mkarich...@gmail.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT FIXES FOR 2.6.35] - fixes for OMAP vout driver
Mauro, Please pull from ... The following changes since commit ed8c030bde28fc675aae7687a535436579298f06: Mauro Carvalho Chehab (1): stv090x: Fix merge conflict caused by changeset f2b3c6d2 are available in the git repository at: git://linuxtv.org/mkaricheri/vpfe-vpbe-video.git for_2.6.35 Vaibhav Hiremath (3): OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes OMAP_VOUT:FIX:Replaced dma-sg with dma-contig OMAP_VOUT:FIX: Module params were not working through bootargs drivers/media/video/omap/Kconfig |4 +- drivers/media/video/omap/Makefile|4 +- drivers/media/video/omap/omap_vout.c | 81 ++--- -- Murali Karicheri mkarich...@gmail.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PATCHES for 2.6.36] ivtv: Firmware debugging and reloading
Mauro, Please pull the following patches contributed by Ian Armstrong. I have stated they are for 2.6.36 because they are either for debugging, or constitute something more than just a bugfix (so I didn't think they were allowed in 2.6.35-rcX). The following changes since commit 41c5f984b67b331064e69acc9fca5e99bf73d400: Mauro Carvalho Chehab (1): Merge tag 'v2.6.35-rc2' into HEAD are available in the git repository at: ssh://linuxtv.org/git/awalls/v4l-dvb.git ivtvfw Andy Walls (1): ivtv: Increment driver version due to firmware loading changes Ian Armstrong (2): ivtv: Add firmare monitoring and debug mode to ignore firmware problems ivtv: Automatic firmware reload drivers/media/video/ivtv/ivtv-driver.c | 14 drivers/media/video/ivtv/ivtv-driver.h |4 + drivers/media/video/ivtv/ivtv-fileops.c | 30 +++- drivers/media/video/ivtv/ivtv-firmware.c | 122 ++ drivers/media/video/ivtv/ivtv-firmware.h |1 + drivers/media/video/ivtv/ivtv-mailbox.c |8 ++ drivers/media/video/ivtv/ivtv-mailbox.h |1 + drivers/media/video/ivtv/ivtv-streams.c | 11 ++- drivers/media/video/ivtv/ivtv-version.h |2 +- drivers/media/video/ivtv/ivtvfb.c| 41 ++- 10 files changed, 228 insertions(+), 6 deletions(-) Regards, Andy -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[cron job] v4l-dvb daily build 2.6.22 and up: ERRORS, 2.6.16-2.6.21: ERRORS
This message is generated daily by a cron job that builds v4l-dvb for the kernels and architectures in the list below. Results of the daily build of v4l-dvb: date:Sat Jun 12 19:00:18 CEST 2010 path:http://www.linuxtv.org/hg/v4l-dvb changeset: 14974:023a0048e6a8 git master: f6760aa024199cfbce564311dc4bc4d47b6fb349 git media-master: 41c5f984b67b331064e69acc9fca5e99bf73d400 gcc version: i686-linux-gcc (GCC) 4.4.3 host hardware:x86_64 host os: 2.6.32.5 linux-2.6.32.6-armv5: OK linux-2.6.33-armv5: OK linux-2.6.34-armv5: WARNINGS linux-2.6.35-rc1-armv5: ERRORS linux-2.6.32.6-armv5-davinci: OK linux-2.6.33-armv5-davinci: OK linux-2.6.34-armv5-davinci: WARNINGS linux-2.6.35-rc1-armv5-davinci: ERRORS linux-2.6.32.6-armv5-ixp: WARNINGS linux-2.6.33-armv5-ixp: WARNINGS linux-2.6.34-armv5-ixp: WARNINGS linux-2.6.35-rc1-armv5-ixp: ERRORS linux-2.6.32.6-armv5-omap2: OK linux-2.6.33-armv5-omap2: OK linux-2.6.34-armv5-omap2: WARNINGS linux-2.6.35-rc1-armv5-omap2: ERRORS linux-2.6.22.19-i686: ERRORS linux-2.6.23.17-i686: ERRORS linux-2.6.24.7-i686: WARNINGS linux-2.6.25.20-i686: WARNINGS linux-2.6.26.8-i686: WARNINGS linux-2.6.27.44-i686: WARNINGS linux-2.6.28.10-i686: WARNINGS linux-2.6.29.1-i686: WARNINGS linux-2.6.30.10-i686: WARNINGS linux-2.6.31.12-i686: OK linux-2.6.32.6-i686: OK linux-2.6.33-i686: OK linux-2.6.34-i686: WARNINGS linux-2.6.35-rc1-i686: ERRORS linux-2.6.32.6-m32r: OK linux-2.6.33-m32r: OK linux-2.6.34-m32r: WARNINGS linux-2.6.35-rc1-m32r: ERRORS linux-2.6.32.6-mips: OK linux-2.6.33-mips: OK linux-2.6.34-mips: WARNINGS linux-2.6.35-rc1-mips: ERRORS linux-2.6.32.6-powerpc64: OK linux-2.6.33-powerpc64: OK linux-2.6.34-powerpc64: WARNINGS linux-2.6.35-rc1-powerpc64: ERRORS linux-2.6.22.19-x86_64: ERRORS linux-2.6.23.17-x86_64: ERRORS linux-2.6.24.7-x86_64: WARNINGS linux-2.6.25.20-x86_64: WARNINGS linux-2.6.26.8-x86_64: WARNINGS linux-2.6.27.44-x86_64: WARNINGS linux-2.6.28.10-x86_64: WARNINGS linux-2.6.29.1-x86_64: WARNINGS linux-2.6.30.10-x86_64: WARNINGS linux-2.6.31.12-x86_64: OK linux-2.6.32.6-x86_64: OK linux-2.6.33-x86_64: OK linux-2.6.34-x86_64: WARNINGS linux-2.6.35-rc1-x86_64: ERRORS linux-git-armv5: WARNINGS linux-git-armv5-davinci: WARNINGS linux-git-armv5-ixp: WARNINGS linux-git-armv5-omap2: WARNINGS linux-git-i686: WARNINGS linux-git-m32r: OK linux-git-mips: OK linux-git-powerpc64: OK linux-git-x86_64: WARNINGS spec: ERRORS spec-git: OK sparse: ERRORS linux-2.6.16.62-i686: ERRORS linux-2.6.17.14-i686: ERRORS linux-2.6.18.8-i686: ERRORS linux-2.6.19.7-i686: ERRORS linux-2.6.20.21-i686: ERRORS linux-2.6.21.7-i686: ERRORS linux-2.6.16.62-x86_64: ERRORS linux-2.6.17.14-x86_64: ERRORS linux-2.6.18.8-x86_64: ERRORS linux-2.6.19.7-x86_64: ERRORS linux-2.6.20.21-x86_64: ERRORS linux-2.6.21.7-x86_64: ERRORS Detailed results are available here: http://www.xs4all.nl/~hverkuil/logs/Saturday.log Full logs are available here: http://www.xs4all.nl/~hverkuil/logs/Saturday.tar.bz2 The V4L-DVB specification from this daily build is here: http://www.xs4all.nl/~hverkuil/spec/media.html -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] saa7134: Add support for Compro VideoMate Vista M1F
Hi all,
(I've just subscribed myself to the list so I can't easily reply to the
original "[PATCH for 2.6.34] saa7134: add support for Compro VideoMate
M1F" thread from May 25 started by Pavel Osnova.)
I've just bought this card. I'm in Argentina so if there are several
models it should be the appropriate one for this market (PAL-NC?).
Find below Pavel's latest patch adapted/updated to v4l-dvb Mercurial
repository status as of today (Hg revision 023a0048e6a8).
For a start, the PCI ID is different from the Pavel's one (185b:c900):
$ lspci |grep -i philips
01:07.0 Multimedia controller: Philips Semiconductors SAA7131/SAA7133/SAA7135
Video Broadcast Decoder (rev d1)
$ lspci -n |grep 01\:07\.0
01:07.0 0480: 1131:7133 (rev d1)
(btw, it's the same PCI ID as card #17: AOPEN VA1000 POWER)
I've decided to maintain Pavel's name, email address and
"Signed-off-by:" header, hopefully he will be able to review the patch
and give his opinion.
Will reply to this message with another one containing a full
description of the card components hermann-pitton had asked for.
Regards,
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134
b/linux/Documentation/video4linux/CARDLIST.saa7134
--- a/linux/Documentation/video4linux/CARDLIST.saa7134
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134
@@ -179,3 +179,4 @@
178 -> Beholder BeholdTV H7 [5ace:7190]
179 -> Beholder BeholdTV A7 [5ace:7090]
180 -> Avermedia PCI M733A [1461:4155,1461:4255]
+181 -> Compro VideoMate Vista M1F [185b:c900,1131:7133]
diff --git a/linux/drivers/media/IR/keymaps/Makefile
b/linux/drivers/media/IR/keymaps/Makefile
--- a/linux/drivers/media/IR/keymaps/Makefile
+++ b/linux/drivers/media/IR/keymaps/Makefile
@@ -62,6 +62,7 @@
rc-terratec-cinergy-xs.o \
rc-tevii-nec.o \
rc-tt-1500.o \
+ rc-videomate-m1f.o \
rc-videomate-s350.o \
rc-videomate-tv-pvr.o \
rc-winfast.o \
diff --git a/linux/drivers/media/IR/keymaps/rc-videomate-m1f.c
b/linux/drivers/media/IR/keymaps/rc-videomate-m1f.c
new file mode 100644
--- /dev/null
+++ b/linux/drivers/media/IR/keymaps/rc-videomate-m1f.c
@@ -0,0 +1,92 @@
+/* videomate-m1f.h - Keytable for videomate_m1f Remote Controller
+ *
+ * keymap imported from ir-keymaps.c
+ *
+ * Copyright (c) 2010 by Pavel Osnova 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.
+ */
+
+#include
+
+static struct ir_scancode videomate_m1f[] = {
+ { 0x01, KEY_POWER },
+ { 0x31, KEY_TUNER },
+ { 0x33, KEY_VIDEO },
+ { 0x2f, KEY_RADIO },
+ { 0x30, KEY_CAMERA },
+ { 0x2d, KEY_NEW }, /* TV record button */
+ { 0x17, KEY_CYCLEWINDOWS },
+ { 0x2c, KEY_ANGLE },
+ { 0x2b, KEY_LANGUAGE },
+ { 0x32, KEY_SEARCH }, /* '...' button */
+ { 0x11, KEY_UP },
+ { 0x13, KEY_LEFT },
+ { 0x15, KEY_OK },
+ { 0x14, KEY_RIGHT },
+ { 0x12, KEY_DOWN },
+ { 0x16, KEY_BACKSPACE },
+ { 0x02, KEY_ZOOM }, /* WIN key */
+ { 0x04, KEY_INFO },
+ { 0x05, KEY_VOLUMEUP },
+ { 0x03, KEY_MUTE },
+ { 0x07, KEY_CHANNELUP },
+ { 0x06, KEY_VOLUMEDOWN },
+ { 0x08, KEY_CHANNELDOWN },
+ { 0x0c, KEY_RECORD },
+ { 0x0e, KEY_STOP },
+ { 0x0a, KEY_BACK },
+ { 0x0b, KEY_PLAY },
+ { 0x09, KEY_FORWARD },
+ { 0x10, KEY_PREVIOUS },
+ { 0x0d, KEY_PAUSE },
+ { 0x0f, KEY_NEXT },
+ { 0x1e, KEY_1 },
+ { 0x1f, KEY_2 },
+ { 0x20, KEY_3 },
+ { 0x21, KEY_4 },
+ { 0x22, KEY_5 },
+ { 0x23, KEY_6 },
+ { 0x24, KEY_7 },
+ { 0x25, KEY_8 },
+ { 0x26, KEY_9 },
+ { 0x2a, KEY_NUMERIC_STAR }, /* * key */
+ { 0x1d, KEY_0 },
+ { 0x29, KEY_SUBTITLE }, /* # key */
+ { 0x27, KEY_CLEAR },
+ { 0x34, KEY_SCREEN },
+ { 0x28, KEY_ENTER },
+ { 0x19, KEY_RED },
+ { 0x1a, KEY_GREEN },
+ { 0x1b, KEY_YELLOW },
+ { 0x1c, KEY_BLUE },
+ { 0x18, KEY_TEXT },
+};
+
+static struct rc_keymap videomate_m1f_map = {
+ .map = {
+ .scan= videomate_m1f,
+ .size= ARRAY_SIZE(videomate_m1f),
+ .ir_type = IR_TYPE_UNKNOWN, /* Legacy IR type */
+ .name= RC_MAP_VIDEOMATE_M1F,
+ }
+};
+
+static int __init init_rc_map_videomate_m1f(void)
+{
+ return ir_register_map(&videomate_m1f_map);
+}
+
+static void __exit exit_rc_map_videomate_m1f(void)
+{
+ ir_unregister_map(&videomate_m1f_map);
+}
+
+module_init(init_rc_map_videomate_m1f)
+module_exit(exit_rc_map_videomate_m1f)
+
+MODULE_LICENS
Re: [PATCH] saa7134: Add support for Compro VideoMate Vista M1F
On Sat, Jun 12, 2010 at 06:57:58PM -0300, Ramiro Morales wrote: > > Will reply to this message with another one containing a full > description of the card components hermann-pitton had asked for. > These are the labels of the different components (see attached PNG diagram): SINT: Tvision TVF85P4-AF-XG-M (smaller sticker behind the big one) IC1: SAA 7135HS/203 IC2: (DIP18) EM78P156LMJ (very hard to read, possibly inaccurate) IC3: (DIP20) TDA 9801T IC4: TEA 5767 XT1: 4.0F8E XT2: NSX 8C 32 110 BLX FLT1: X4.58 So far, I've been unable to get either sound (it appears as an ALSA device but can't unmute) or the RC working but I suspect this is some kind of fault on my side. -- Ramiro Morales <>
