summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dvb-usb
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@kernellabs.com>2011-10-20 15:42:34 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 07:42:43 -0200
commit7e8d8f6df3e8f26547b3b986c3946b1f8a6bd6c1 (patch)
treedf4e0591f0f8fcb760636c3fefc116ba5afd0e50 /drivers/media/dvb/dvb-usb
parent4f98480f32fb11af40de3947cc5d500ec9691726 (diff)
downloadlinux-3.10-7e8d8f6df3e8f26547b3b986c3946b1f8a6bd6c1.tar.gz
linux-3.10-7e8d8f6df3e8f26547b3b986c3946b1f8a6bd6c1.tar.bz2
linux-3.10-7e8d8f6df3e8f26547b3b986c3946b1f8a6bd6c1.zip
[media] mxl111sf: disable snr / ber calculations for DVB-T
Leaving this code enabled breaks the build on some architectures, and we shouldn't have any floating point math in the kernel, anyway. These macros need to be re-written, but it's harmless to simply return zero for now. Signed-off-by: Michael Krufky <mkrufky@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb')
-rw-r--r--drivers/media/dvb/dvb-usb/mxl111sf-demod.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
index 330774e346a..25e75c1ae36 100644
--- a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
@@ -370,10 +370,20 @@ fail:
return ret;
}
+#ifdef MXL111SF_DEMOD_ENABLE_CALCULATIONS
+/* FIXME: leaving this enabled breaks the build on some architectures,
+ * and we shouldn't have any floating point math in the kernel, anyway.
+ *
+ * These macros need to be re-written, but it's harmless to simply
+ * return zero for now. */
#define CALCULATE_BER(avg_errors, count) \
((u32)(avg_errors * 4)/(count*64*188*8))
#define CALCULATE_SNR(data) \
((u32)((10 * (u32)data / 64) - 2.5))
+#else
+#define CALCULATE_BER(avg_errors, count) 0
+#define CALCULATE_SNR(data) 0
+#endif
static int mxl111sf_demod_read_ber(struct dvb_frontend *fe, u32 *ber)
{