]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] siano: Fix bandwidth report
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 10 Mar 2013 22:21:13 +0000 (19:21 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Mar 2013 10:51:47 +0000 (07:51 -0300)
It was expected that the bandwidth would be following the defines
at smscoreapi.h. However, this doesn't work. Instead, this field
brings just the bandwidth in MHz. Convert it to Hertz.
It should be noticed that, on ISDB, using the _EX request, the
field TuneBW seems to show the value that matches the bandwidth
code.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/siano/smsdvb-main.c

index 632a250a42cf87a29c4b478bef4a5cb4c6da20ed..d83896bb98fdff3e653d07e1a93da04fbdb5ddec 100644 (file)
@@ -43,18 +43,6 @@ module_param_named(debug, sms_dbg, int, 0644);
 MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
 
 
-u32 sms_to_bw_table[] = {
-       [BW_8_MHZ]              = 8000000,
-       [BW_7_MHZ]              = 7000000,
-       [BW_6_MHZ]              = 6000000,
-       [BW_5_MHZ]              = 5000000,
-       [BW_2_MHZ]              = 2000000,
-       [BW_1_5_MHZ]            = 1500000,
-       [BW_ISDBT_1SEG]         = 6000000,
-       [BW_ISDBT_3SEG]         = 6000000,
-       [BW_ISDBT_13SEG]        = 6000000,
-};
-
 u32 sms_to_guard_interval_table[] = {
        [0] = GUARD_INTERVAL_1_32,
        [1] = GUARD_INTERVAL_1_16,
@@ -204,6 +192,10 @@ static inline int sms_to_status(u32 is_demod_locked, u32 is_rf_locked)
        return 0;
 }
 
+static inline u32 sms_to_bw(u32 value)
+{
+       return value * 1000000;
+}
 
 #define convert_from_table(value, table, defval) ({                    \
        u32 __ret;                                                      \
@@ -214,9 +206,6 @@ static inline int sms_to_status(u32 is_demod_locked, u32 is_rf_locked)
        __ret;                                                          \
 })
 
-#define sms_to_bw(value)                                               \
-       convert_from_table(value, sms_to_bw_table, 0);
-
 #define sms_to_guard_interval(value)                                   \
        convert_from_table(value, sms_to_guard_interval_table,          \
                           GUARD_INTERVAL_AUTO);