summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/stb0899_priv.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 23:13:12 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 23:13:12 -0300
commit1340daf098275689f8220222447a84e4ec4263b6 (patch)
tree66f046b589159961291121b8e9384ff8fb3342da /linux/drivers/media/dvb/frontends/stb0899_priv.h
parent6716df924ee6f2791b1939b04028f01dd37a9e9e (diff)
parent0efc193045eedcc05a28b5502f6dfaed87b434e8 (diff)
downloadmediapointer-dvb-s2-1340daf098275689f8220222447a84e4ec4263b6.tar.gz
mediapointer-dvb-s2-1340daf098275689f8220222447a84e4ec4263b6.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/lgdt3305
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/stb0899_priv.h')
-rw-r--r--linux/drivers/media/dvb/frontends/stb0899_priv.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/frontends/stb0899_priv.h b/linux/drivers/media/dvb/frontends/stb0899_priv.h
index e57ff227b..d2a69d0a3 100644
--- a/linux/drivers/media/dvb/frontends/stb0899_priv.h
+++ b/linux/drivers/media/dvb/frontends/stb0899_priv.h
@@ -59,10 +59,6 @@
#define MAKEWORD32(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
#define MAKEWORD16(a, b) (((a) << 8) | (b))
-#define MIN(x, y) ((x) <= (y) ? (x) : (y))
-#define MAX(x, y) ((x) >= (y) ? (x) : (y))
-#define ABS(x) ((x) >= 0 ? (x) : -(x))
-
#define LSB(x) ((x & 0xff))
#define MSB(y) ((y >> 8) & 0xff)
@@ -168,10 +164,10 @@ struct stb0899_internal {
u32 freq; /* Demod internal Frequency */
u32 srate; /* Demod internal Symbol rate */
enum stb0899_fec fecrate; /* Demod internal FEC rate */
- u32 srch_range; /* Demod internal Search Range */
- u32 sub_range; /* Demod current sub range (Hz) */
- u32 tuner_step; /* Tuner step (Hz) */
- u32 tuner_offst; /* Relative offset to carrier (Hz) */
+ s32 srch_range; /* Demod internal Search Range */
+ s32 sub_range; /* Demod current sub range (Hz) */
+ s32 tuner_step; /* Tuner step (Hz) */
+ s32 tuner_offst; /* Relative offset to carrier (Hz) */
u32 tuner_bw; /* Current bandwidth of the tuner (Hz) */
s32 mclk; /* Masterclock Divider factor (binary) */