aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/dvb/mantis/mantis_common.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_common.h')
-rw-r--r--drivers/media/dvb/mantis/mantis_common.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index e912c5962e3a..6ae3aabe5604 100644
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -32,6 +32,7 @@
#define MANTIS_NOTICE 1
#define MANTIS_INFO 2
#define MANTIS_DEBUG 3
+#define MANTIS_TMG 9
#define dprintk(y, z, format, arg...) do { \
if (z) { \
@@ -43,6 +44,8 @@
printk(KERN_INFO "%s (%d): " format "\n" , __func__ , mantis->num , ##arg); \
else if ((mantis->verbose > MANTIS_DEBUG) && (mantis->verbose > y)) \
printk(KERN_DEBUG "%s (%d): " format "\n" , __func__ , mantis->num , ##arg); \
+ else if ((mantis->verbose > MANTIS_TMG) && (mantis->verbose > y)) \
+ printk(KERN_DEBUG "%s (%d): " format "\n" , __func__ , mantis->num , ##arg); \
} else { \
if (mantis->verbose > y) \
printk(format , ##arg); \
@@ -54,9 +57,6 @@
#define mmwrite(dat, addr) mwrite((dat), (mantis->mmio + (addr)))
#define mmread(addr) mread(mantis->mmio + (addr))
-#define mmand(dat, addr) mmwrite((dat) & mmread(addr), addr)
-#define mmor(dat, addr) mmwrite((dat) | mmread(addr), addr)
-#define mmaor(dat, addr) mmwrite((dat) | ((mask) & mmread(addr)), addr)
#define MANTIS_TS_188 0
#define MANTIS_TS_204 1
@@ -75,6 +75,11 @@
.driver_data = (unsigned long) (__configptr) \
}
+enum mantis_i2c_mode {
+ MANTIS_PAGE_MODE = 0,
+ MANTIS_BYTE_MODE,
+};
+
struct mantis_pci;
struct mantis_hwconfig {
@@ -91,6 +96,8 @@ struct mantis_hwconfig {
u8 power;
u8 reset;
+
+ enum mantis_i2c_mode i2c_mode;
};
struct mantis_pci {