As noticed at:
http://comments.gmane.org/gmane.linux.drivers.video-input-infrastructure/48034
Both drivers are identical, except for the name. So, there's no
sense on keeping both. Instead of forking the entire code, just
fork the vp3033_config struct, saving some space, and cleaning
up the Kernel.
Reported-by: Igor M. Liplianin <liplia...@me.by>
Cc: Manu Abraham <abraham.m...@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
drivers/media/dvb/mantis/Makefile | 1 -
drivers/media/dvb/mantis/mantis_cards.c | 1 -
drivers/media/dvb/mantis/mantis_core.c | 1 -
drivers/media/dvb/mantis/mantis_vp2033.c | 23 +++-
drivers/media/dvb/mantis/mantis_vp2033.h | 9 +-
drivers/media/dvb/mantis/mantis_vp2040.c | 187 -------------------------------
drivers/media/dvb/mantis/mantis_vp2040.h | 32 ------
7 files changed, 27 insertions(+), 227 deletions(-)
delete mode 100644 drivers/media/dvb/mantis/mantis_vp2040.c
delete mode 100644 drivers/media/dvb/mantis/mantis_vp2040.h
diff --git a/drivers/media/dvb/mantis/Makefile
b/drivers/media/dvb/mantis/Makefile
index ec8116d..376fd74 100644
--- a/drivers/media/dvb/mantis/Makefile
+++ b/drivers/media/dvb/mantis/Makefile
@@ -15,7 +15,6 @@ mantis-objs := mantis_cards.o \
mantis_vp1034.o \
mantis_vp1041.o \
mantis_vp2033.o \
- mantis_vp2040.o \
mantis_vp3030.o
hopper-objs := hopper_cards.o \
diff --git a/drivers/media/dvb/mantis/mantis_cards.c
b/drivers/media/dvb/mantis/mantis_cards.c
index 0207d1f..81ba977 100644
--- a/drivers/media/dvb/mantis/mantis_cards.c
+++ b/drivers/media/dvb/mantis/mantis_cards.c
@@ -38,7 +38,6 @@
#include "mantis_vp1034.h"
#include "mantis_vp1041.h"
#include "mantis_vp2033.h"
-#include "mantis_vp2040.h"
#include "mantis_vp3030.h"
#include "mantis_dma.h"
diff --git a/drivers/media/dvb/mantis/mantis_core.c
b/drivers/media/dvb/mantis/mantis_core.c
index 684d906..8e40ea3 100644
--- a/drivers/media/dvb/mantis/mantis_core.c
+++ b/drivers/media/dvb/mantis/mantis_core.c
@@ -24,7 +24,6 @@
#include "mantis_vp1034.h"
#include "mantis_vp1041.h"
#include "mantis_vp2033.h"
-#include "mantis_vp2040.h"
#include "mantis_vp3030.h"
static int read_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c
b/drivers/media/dvb/mantis/mantis_vp2033.c
index 1ca6837..5213a9b 100644
--- a/drivers/media/dvb/mantis/mantis_vp2033.c
+++ b/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -1,5 +1,5 @@
/*
- Mantis VP-2033 driver
+ Mantis VP-2033/VP-2040 driver
Copyright (C) Manu Abraham (abraham.m...@gmail.com)
@@ -34,8 +34,9 @@
#include "mantis_dvb.h"
#include "mantis_vp2033.h"
-#define MANTIS_MODEL_NAME "VP-2033"
-#define MANTIS_DEV_TYPE "DVB-C"
+#define MANTIS_MODEL_NAME_VP2033 "VP-2033"
+#define MANTIS_MODEL_NAME_VP2040 "VP-2040"
+#define MANTIS_DEV_TYPE "DVB-C"
struct tda1002x_config vp2033_tda1002x_cu1216_config = {
.demod_address = 0x18 >> 1,
@@ -174,7 +175,21 @@ static int vp2033_frontend_init(struct mantis_pci *mantis,
struct dvb_frontend *
}
struct mantis_hwconfig vp2033_config = {
- .model_name = MANTIS_MODEL_NAME,
+ .model_name = MANTIS_MODEL_NAME_VP2033,
+ .dev_type = MANTIS_DEV_TYPE,
+ .ts_size = MANTIS_TS_204,
+
+ .baud_rate = MANTIS_BAUD_9600,
+ .parity = MANTIS_PARITY_NONE,
+ .bytes = 0,
+
+ .frontend_init = vp2033_frontend_init,
+ .power = GPIF_A12,
+ .reset = GPIF_A13,
+};
+
+struct mantis_hwconfig vp2040_config = {
+ .model_name = MANTIS_MODEL_NAME_VP2040,
.dev_type = MANTIS_DEV_TYPE,
.ts_size = MANTIS_TS_204,
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.h
b/drivers/media/dvb/mantis/mantis_vp2033.h
index c55242b..c64bdce 100644
--- a/drivers/media/dvb/mantis/mantis_vp2033.h
+++ b/drivers/media/dvb/mantis/mantis_vp2033.h
@@ -1,5 +1,5 @@
/*
- Mantis VP-2033 driver
+ Mantis VP-2033/VP-2040 driver
Copyright (C) Manu Abraham (abraham.m...@gmail.com)
@@ -23,8 +23,15 @@
#include "mantis_common.h"
+/* Mantis VP-2033 */
#define MANTIS_VP_2033_DVB_C 0x0008
+/* Mantis VP-2040 */
+#define MANTIS_VP_2040_DVB_C 0x0043
+#define CINERGY_C 0x1178
+#define CABLESTAR_HD2 0x0002
+
extern struct mantis_hwconfig vp2033_config;
+extern struct mantis_hwconfig vp2040_config;
#endif /* __MANTIS_VP2033_H */
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.c
b/drivers/media/dvb/mantis/mantis_vp2040.c
deleted file mode 100644
index d480741..0000000
--- a/drivers/media/dvb/mantis/mantis_vp2040.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- Mantis VP-2040 driver
-
- Copyright (C) Manu Abraham (abraham.m...@gmail.com)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-
-#include "dmxdev.h"
-#include "dvbdev.h"
-#include "dvb_demux.h"
-#include "dvb_frontend.h"
-#include "dvb_net.h"
-
-#include "tda1002x.h"
-#include "mantis_common.h"
-#include "mantis_ioc.h"
-#include "mantis_dvb.h"
-#include "mantis_vp2040.h"
-
-#define MANTIS_MODEL_NAME "VP-2040"
-#define MANTIS_DEV_TYPE "DVB-C"
-
-struct tda1002x_config vp2040_tda1002x_cu1216_config = {
- .demod_address = 0x18 >> 1,
- .invert = 1,
-};
-
-struct tda10023_config vp2040_tda10023_cu1216_config = {
- .demod_address = 0x18 >> 1,
- .invert = 1,
-};
-
-static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe)
-{
- struct dtv_frontend_properties *p = &fe->dtv_property_cache;
- struct mantis_pci *mantis = fe->dvb->priv;
- struct i2c_adapter *adapter = &mantis->adapter;
-
- u8 buf[6];
- struct i2c_msg msg = {.addr = 0x60, .flags = 0, .buf = buf, .len =
sizeof(buf)};
- int i;
-
-#define CU1216_IF 36125000
-#define TUNER_MUL 62500
-
- u32 div = (p->frequency + CU1216_IF + TUNER_MUL / 2) / TUNER_MUL;
-
- buf[0] = (div >> 8) & 0x7f;
- buf[1] = div & 0xff;
- buf[2] = 0xce;
- buf[3] = (p->frequency < 150000000 ? 0x01 :
- p->frequency < 445000000 ? 0x02 : 0x04);
- buf[4] = 0xde;
- buf[5] = 0x20;
-
- if (fe->ops.i2c_gate_ctrl)
- fe->ops.i2c_gate_ctrl(fe, 1);
-
- if (i2c_transfer(adapter, &msg, 1) != 1)
- return -EIO;
-
- /* wait for the pll lock */
- msg.flags = I2C_M_RD;
- msg.len = 1;
- for (i = 0; i < 20; i++) {
- if (fe->ops.i2c_gate_ctrl)
- fe->ops.i2c_gate_ctrl(fe, 1);
-
- if (i2c_transfer(adapter, &msg, 1) == 1 && (buf[0] & 0x40))
- break;
-
- msleep(10);
- }
-
- /* switch the charge pump to the lower current */
- msg.flags = 0;
- msg.len = 2;
- msg.buf = &buf[2];
- buf[2] &= ~0x40;
- if (fe->ops.i2c_gate_ctrl)
- fe->ops.i2c_gate_ctrl(fe, 1);
-
- if (i2c_transfer(adapter, &msg, 1) != 1)
- return -EIO;
-
- return 0;
-}
-
-static u8 read_pwm(struct mantis_pci *mantis)
-{
- struct i2c_adapter *adapter = &mantis->adapter;
-
- u8 b = 0xff;
- u8 pwm;
- struct i2c_msg msg[] = {
- {.addr = 0x50, .flags = 0, .buf = &b, .len = 1},
- {.addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1}
- };
-
- if ((i2c_transfer(adapter, msg, 2) != 2)
- || (pwm == 0xff))
- pwm = 0x48;
-
- return pwm;
-}
-
-static int vp2040_frontend_init(struct mantis_pci *mantis, struct dvb_frontend
*fe)
-{
- struct i2c_adapter *adapter = &mantis->adapter;
-
- int err = 0;
-
- err = mantis_frontend_power(mantis, POWER_ON);
- if (err == 0) {
- mantis_frontend_soft_reset(mantis);
- msleep(250);
-
- dprintk(MANTIS_ERROR, 1, "Probing for CU1216 (DVB-C)");
- fe = dvb_attach(tda10021_attach, &vp2040_tda1002x_cu1216_config,
- adapter,
- read_pwm(mantis));
-
- if (fe) {
- dprintk(MANTIS_ERROR, 1,
- "found Philips CU1216 DVB-C frontend (TDA10021)
@ 0x%02x",
- vp2040_tda1002x_cu1216_config.demod_address);
- } else {
- fe = dvb_attach(tda10023_attach,
&vp2040_tda10023_cu1216_config,
- adapter,
- read_pwm(mantis));
-
- if (fe) {
- dprintk(MANTIS_ERROR, 1,
- "found Philips CU1216 DVB-C frontend
(TDA10023) @ 0x%02x",
-
vp2040_tda1002x_cu1216_config.demod_address);
- }
- }
-
- if (fe) {
- fe->ops.tuner_ops.set_params =
tda1002x_cu1216_tuner_set;
- dprintk(MANTIS_ERROR, 1, "Mantis DVB-C Philips CU1216
frontend attach success");
- } else {
- return -1;
- }
- } else {
- dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed!
<%d>",
- adapter->name,
- err);
-
- return -EIO;
- }
- mantis->fe = fe;
- dprintk(MANTIS_DEBUG, 1, "Done!");
-
- return 0;
-}
-
-struct mantis_hwconfig vp2040_config = {
- .model_name = MANTIS_MODEL_NAME,
- .dev_type = MANTIS_DEV_TYPE,
- .ts_size = MANTIS_TS_204,
-
- .baud_rate = MANTIS_BAUD_9600,
- .parity = MANTIS_PARITY_NONE,
- .bytes = 0,
-
- .frontend_init = vp2040_frontend_init,
- .power = GPIF_A12,
- .reset = GPIF_A13,
-};
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.h
b/drivers/media/dvb/mantis/mantis_vp2040.h
deleted file mode 100644
index d125e21..0000000
--- a/drivers/media/dvb/mantis/mantis_vp2040.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Mantis VP-2040 driver
-
- Copyright (C) Manu Abraham (abraham.m...@gmail.com)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __MANTIS_VP2040_H
-#define __MANTIS_VP2040_H
-
-#include "mantis_common.h"
-
-#define MANTIS_VP_2040_DVB_C 0x0043
-#define CINERGY_C 0x1178
-#define CABLESTAR_HD2 0x0002
-
-extern struct mantis_hwconfig vp2040_config;
-
-#endif /* __MANTIS_VP2040_H */
--
1.7.11.2
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
