[linux-dvb] [PATHC] Enable XX_AUTO in tzap and zap

[Mario Rossi]

The following patch enables the use of XXX_AUTO in channels.conf,
mainly to be used by zap and tzap.

diff -r 92cd5208d2cf lib/libdvbcfg/dvbcfg_zapchannel.c
--- a/lib/libdvbcfg/dvbcfg_zapchannel.c	Mon Sep 18 21:27:12 2006 +0100
+++ b/lib/libdvbcfg/dvbcfg_zapchannel.c	Sat Oct 28 12:16:04 2006 +0000
@@ -74,12 +74,13 @@ static const struct dvbcfg_setting dvbcf
 };

 static const struct dvbcfg_setting dvbcfg_constellation_list[] = {
-	{ "QAM_16",  DVBFE_DVBT_CONST_QAM_16  },
-	{ "QAM_32",  DVBFE_DVBT_CONST_QAM_32  },
-	{ "QAM_64",  DVBFE_DVBT_CONST_QAM_64  },
-	{ "QAM_128", DVBFE_DVBT_CONST_QAM_128 },
-	{ "QAM_256", DVBFE_DVBT_CONST_QAM_256 },
-	{ "QPSK",    DVBFE_DVBT_CONST_QPSK    },
+	{ "QAM_16",   DVBFE_DVBT_CONST_QAM_16  },
+	{ "QAM_32",   DVBFE_DVBT_CONST_QAM_32  },
+	{ "QAM_64",   DVBFE_DVBT_CONST_QAM_64  },
+	{ "QAM_128",  DVBFE_DVBT_CONST_QAM_128 },
+	{ "QAM_256",  DVBFE_DVBT_CONST_QAM_256 },
+	{ "QPSK",     DVBFE_DVBT_CONST_QPSK    },
+	{ "QAM_AUTO", DVBFE_DVBT_CONST_AUTO    },
 	{ NULL, 0 }
 };

diff -r 92cd5208d2cf util/szap/tzap.c
--- a/util/szap/tzap.c	Mon Sep 18 21:27:12 2006 +0100
+++ b/util/szap/tzap.c	Wed Oct 25 19:51:39 2006 +0000
@@ -93,14 +93,16 @@ static const Param guard_list [] = {
 	{"GUARD_INTERVAL_1_16", GUARD_INTERVAL_1_16},
 	{"GUARD_INTERVAL_1_32", GUARD_INTERVAL_1_32},
 	{"GUARD_INTERVAL_1_4", GUARD_INTERVAL_1_4},
-	{"GUARD_INTERVAL_1_8", GUARD_INTERVAL_1_8}
+	{"GUARD_INTERVAL_1_8", GUARD_INTERVAL_1_8},
+	{"GUARD_INTERVAL_AUTO", GUARD_INTERVAL_AUTO}
 };

 static const Param hierarchy_list [] = {
 	{ "HIERARCHY_1", HIERARCHY_1 },
 	{ "HIERARCHY_2", HIERARCHY_2 },
 	{ "HIERARCHY_4", HIERARCHY_4 },
-	{ "HIERARCHY_NONE", HIERARCHY_NONE }
+	{ "HIERARCHY_NONE", HIERARCHY_NONE },
+	{ "HIERARCHY_AUTO", HIERARCHY_AUTO }
 };

 static const Param constellation_list [] = {
@@ -109,12 +111,14 @@ static const Param constellation_list []
 	{ "QAM_16", QAM_16 },
 	{ "QAM_256", QAM_256 },
 	{ "QAM_32", QAM_32 },
-	{ "QAM_64", QAM_64 }
+	{ "QAM_64", QAM_64 },
+	{ "QAM_AUTO", QAM_AUTO }
 };

 static const Param transmissionmode_list [] = {
 	{ "TRANSMISSION_MODE_2K", TRANSMISSION_MODE_2K },
 	{ "TRANSMISSION_MODE_8K", TRANSMISSION_MODE_8K },
+	{ "TRANSMISSION_MODE_AUTO", TRANSMISSION_MODE_AUTO }
 };

 #define LIST_SIZE(x) sizeof(x)/sizeof(Param)