V4L/DVB (6676): Improve s-code support

s-code tables are related to IF frequency used for video demodulation.

The s-codes for analog are automatically loaded, according with video standard.
However, for digital, they will depend on the IF of the demoduler chip. IF of
the demoduler.

Before this patch, only a few IF's where possible to use. This patch allows
selecting any IF defined at firmware file.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 12 insertions, 14 deletions

diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h
index 9b4224e2fe53..1fe8b195960c 100644
--- a/drivers/media/video/tuner-xc2028.h
+++ b/drivers/media/video/tuner-xc2028.h
@@ -11,19 +11,17 @@
 
 #define XC2028_DEFAULT_FIRMWARE "xc3028-v27.fw"
 
-enum xc2028_demod_types
-{
-        XC3028_FE_DEFAULT = 0,
-        XC3028_FE_LG60,         /* IF = 6.00 MHz */
-        XC3028_FE_ATI638,       /* IF = 6.38 MHz */
-        XC3028_FE_OREN538,      /* IF = 5.38 MHz */
-        XC3028_FE_OREN36,       /* IF = 3.60 MHz */
-        XC3028_FE_TOYOTA388,    /* IF = 3.88 MHz */
-        XC3028_FE_TOYOTA794,    /* IF = 7.94 MHz */
-        XC3028_FE_DIBCOM52,     /* IF = 5.20 MHz */
-        XC3028_FE_ZARLINK456,   /* IF = 4.56 MHz */
-        XC3028_FE_CHINA,        /* IF = 5.20 MHz */
-};
+/*      Dmoduler                IF (kHz) */
+#define XC3028_FE_DEFAULT       0
+#define XC3028_FE_LG60          6000
+#define XC3028_FE_ATI638        6380
+#define XC3028_FE_OREN538       5380
+#define XC3028_FE_OREN36        3600
+#define XC3028_FE_TOYOTA388     3880
+#define XC3028_FE_TOYOTA794     7940
+#define XC3028_FE_DIBCOM52      5200
+#define XC3028_FE_ZARLINK456    4560
+#define XC3028_FE_CHINA         5200
 
 struct xc2028_ctrl {
         char                    *fname;
@@ -32,7 +30,7 @@ struct xc2028_ctrl {
         unsigned int            mts   :1;
         unsigned int            d2633 :1;
         unsigned int            input1:1;
-        enum xc2028_demod_types demod;
+        unsigned int            demod;
 };
 
 struct xc2028_config {