[linux-dvb] Re: errors in scan

[Lauri Tischler <lauri.tischler@efore.fi>]

Lauri Tischler wrote:
> The command below dont dump provider name,
>
> ./scan -a 1 -s 0 -x 666 -t 1 -p -n -o vdr > astra-vdr
the '-p' is position dependent, if it is before the '-o vdr'
it wont work, the patch fixes that.

Replaced  Hotbird entrys in initial.h with only one entry,
appears to scan all, takes 40 minutes tho ..

Changed the separator between provider name and channel name
from : to -   the : would screw up vdr format.


Index: DVB/apps/scan/dump-vdr.c
===================================================================
RCS file: /cvs/linuxtv/DVB/apps/scan/dump-vdr.c,v
retrieving revision 1.12
diff -u -p -r1.12 dump-vdr.c
--- DVB/apps/scan/dump-vdr.c	1 Jul 2003 17:05:51 -0000	1.12
+++ DVB/apps/scan/dump-vdr.c	21 Jul 2003 07:26:25 -0000
@@ -131,7 +131,7 @@ void vdr_dump_service_parameter_set (FIL
 
 	if ((video_pid || audio_pid[0]) && ((ca_select > 0) || ((ca_select == 0) && (scrambled == 0)))) {
 		if (dump_provider == 1)
-			fprintf (f, "%s:", provider_name);
+			fprintf (f, "%s - ", provider_name);
 		fprintf (f, "%s:", service_name);
 		vdr_dump_dvb_parameters (f, type, p, polarity, orbital_pos, we_flag);
 		if ((pcr_pid != video_pid) && (video_pid > 0))
Index: DVB/apps/scan/initial.h
===================================================================
RCS file: /cvs/linuxtv/DVB/apps/scan/initial.h,v
retrieving revision 1.17
diff -u -p -r1.17 initial.h
--- DVB/apps/scan/initial.h	30 Jun 2003 11:00:00 -0000	1.17
+++ DVB/apps/scan/initial.h	21 Jul 2003 07:26:26 -0000
@@ -24,39 +24,23 @@ struct transponder qpsk_probes [] = {
 		},
 		.polarisation = POLARISATION_VERTICAL
 	},
-	/**
-	 *  Hotbird 13.0E horizontal, Deutsche Telekom (ZDF, NBC, RL, VOX, ...)
-	 */
-	{
-		.type = FE_QPSK,
-		.param = {
-			.frequency = 11055000,
-			.inversion = INVERSION_AUTO,
-			{ qpsk: {
-					.symbol_rate = 27500000,
-					.fec_inner = FEC_5_6
-				}
-			}
-		},
-		.polarisation = POLARISATION_HORIZONTAL
-	},
-	/**
-	 *  Hotbird 13.0E vertical, Deutsche Telekom (arte)
-	 */
-	{
-		.type = FE_QPSK,
-		.param = {
-			.frequency = 11060000,
-			.inversion = INVERSION_AUTO,
-			{ qpsk:
-				{
-					.symbol_rate = 6510000,
-					.fec_inner = FEC_5_6
-				}
-			}
-		},
-		.polarisation = POLARISATION_VERTICAL
-	},
+        /**
+         *  EUTELSAT SkyPlex, Hotbird 13E
+         */
+        {
+                .type = FE_QPSK,
+                .param = {
+                        .frequency = 12539000,
+                        .inversion = INVERSION_AUTO,
+                        { qpsk:
+                                {
+                                        .symbol_rate = 27500000,
+                                        .fec_inner = FEC_3_4
+                                }
+                        }
+                },
+                .polarisation = POLARISATION_HORIZONTAL
+        },
 	/**
 	 *  Sirius Cinema 1
 	 */
Index: DVB/apps/scan/scan.c
===================================================================
RCS file: /cvs/linuxtv/DVB/apps/scan/scan.c,v
retrieving revision 1.44
diff -u -p -r1.44 scan.c
--- DVB/apps/scan/scan.c	19 Jul 2003 23:46:28 -0000	1.44
+++ DVB/apps/scan/scan.c	21 Jul 2003 07:26:26 -0000
@@ -1633,7 +1633,7 @@ int main (int argc, char **argv)
 			frontend = strtoul(optarg, NULL, 0);
 			break;
 		case 'p':
-			if (output_format == OUTPUT_VDR) vdr_dump_provider = 1;
+			vdr_dump_provider = 1;
 			break;
 		case 's':
 			switch_pos = strtoul(optarg, NULL, 0);