add M8E

ddbridge/ddbridge-core.c

@@ -1860,6 +1860,7 @@ static int dvb_input_attach(struct ddb_input *input)
 	case DDB_TUNER_MCI_M4:
 	case DDB_TUNER_MCI_M8:
 	case DDB_TUNER_MCI_M8A:
+	case DDB_TUNER_MCI_M8E:
 	case DDB_TUNER_MCI_M2:
 		if (ddb_fe_attach_mci(input, port->type) < 0)
 			return -ENODEV;

ddbridge/ddbridge-hw.c

@@ -771,6 +771,18 @@ static const struct ddb_info ddb_m8a = {
 	.lnb_base = 0x400,
 };
 
+static const struct ddb_info ddb_m8e = {
+	.type     = DDB_OCTOPUS_MCI,
+	.name     = "Digital Devices MAX M8E",
+	.regmap   = &octopus_mci_map,
+	.port_num = 4,
+	.tempmon_irq = 24,
+	.mci_ports = 4,
+	.mci_type = DDB_TUNER_MCI_M8E,
+	.temp_num = 1,
+	.lnb_base = 0x400,
+};
+
 static const struct ddb_info ddb_ci_m2 = {
 	.type     = DDB_OCTOPUS_MCI,
 	.name     = "Digital Devices Octopus CI M2",
@@ -785,6 +797,18 @@ static const struct ddb_info ddb_ci_m2 = {
 	.lnb_base = 0x480,
 };
 
+static const struct ddb_info ddb_m2 = {
+	.type     = DDB_OCTOPUS_MCI,
+	.name     = "Digital Devices Octopus M2",
+	.regmap   = &octopus_mci_map,
+	.port_num = 4,
+	.tempmon_irq = 24,
+	.mci_ports = 1,
+	.mci_type = DDB_TUNER_MCI_M2,
+	.temp_num = 1,
+	.lnb_base = 0x480,
+};
+
 /****************************************************************************/
 
 static const struct ddb_info ddb_gtl_mini = {
@@ -919,6 +943,8 @@ static const struct ddb_device_id ddb_device_ids[] = {
 	DDB_DEVID(0x0020, 0x0012, ddb_gtl_mini),
 	DDB_DEVID(0x0022, 0x0052, ddb_m8),
 	DDB_DEVID(0x0024, 0x0053, ddb_m8a),
+	DDB_DEVID(0x0025, 0x0054, ddb_m2),
+	DDB_DEVID(0x0026, 0x0055, ddb_m8e),
 
 	/* Modulators */
 	DDB_DEVID(0x0201, 0x0001, ddb_mod),

ddbridge/ddbridge-main.c

@@ -421,6 +421,8 @@ static const struct pci_device_id ddb_id_table[] __devinitconst = {
 	DDB_DEVICE_ANY(0x0020),
 	DDB_DEVICE_ANY(0x0022),
 	DDB_DEVICE_ANY(0x0024),
+	DDB_DEVICE_ANY(0x0025),
+	DDB_DEVICE_ANY(0x0026),
 	DDB_DEVICE_ANY(0x0201),
 	DDB_DEVICE_ANY(0x0203),
 	DDB_DEVICE_ANY(0x0210),

ddbridge/ddbridge-max.c

@@ -558,6 +558,7 @@ int ddb_fe_attach_mci(struct ddb_input *input, u32 type)
 		dvb->input = 0;
 		break;
 	case DDB_TUNER_MCI_M8A:
+	case DDB_TUNER_MCI_M8E:
 		fm = 3;
 		dvb->fe = ddb_mx_attach(input, demod, tuner, 3);
 		dvb->input = 0;

ddbridge/ddbridge.h

@@ -325,6 +325,7 @@ struct ddb_port {
 #define DDB_TUNER_MCI_M8        (DDB_TUNER_MCI + 2)
 #define DDB_TUNER_MCI_M8A       (DDB_TUNER_MCI + 3)
 #define DDB_TUNER_MCI_M2        (DDB_TUNER_MCI + 4)
+#define DDB_TUNER_MCI_M8E       (DDB_TUNER_MCI + 5)
 
 	struct ddb_input      *input[2];
 	struct ddb_output     *output;
@@ -536,7 +537,7 @@ struct DDMOD_FLASH {
 
 int ddbridge_flashread(struct ddb *dev, u32 link, u8 *buf, u32 addr, u32 len);
 
-#define DDBRIDGE_VERSION "0.9.39"
+#define DDBRIDGE_VERSION "0.9.41"
 
 /* linked function prototypes */