Skip to contentSkip to conversation

ddbridge: Add IDs for several newer Digital Devices cards

PATCH In review Christopher Reimer 2 participants 2 messages Jun 30, 2014 – Jul 18, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ddbridge: Add IDs for several newer Digital Devices cards

Hello,

it's the first time I try to contribute here. So please be gracious.

This patch adds the necessary IDs for the following dvb cards:

Digital Devices Octopus Mini
Digital Devices Cine S2 V6.5
Digital Devices DVBCT V6.1
Digital Devices Octopus V3
Mystique SaTiX-S2 V3

All these changes are taken from the official driver package by Digital Devices.
http://download.digital-devices.de/download/linux/

---

drivers/media/pci/ddbridge/ddbridge-core.c +34 -1
index fb52bda..da8f848 100644
@@ -1663,11 +1663,40 @@ static struct ddb_info ddb_octopus_le = {
     .port_num = 2,
 };
 
+static struct ddb_info ddb_octopus_mini = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Digital Devices Octopus Mini",
+    .port_num = 4,
+};
+
 static struct ddb_info ddb_v6 = {
     .type     = DDB_OCTOPUS,
     .name     = "Digital Devices Cine S2 V6 DVB adapter",
     .port_num = 3,
 };
+static struct ddb_info ddb_v6_5 = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Digital Devices Cine S2 V6.5 DVB adapter",
+    .port_num = 4,
+};
+
+static struct ddb_info ddb_dvbct = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Digital Devices DVBCT V6.1 DVB adapter",
+    .port_num = 3,
+};
+
+static struct ddb_info ddb_satixS2v3 = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Mystique SaTiX-S2 V3 DVB adapter",
+    .port_num = 3,
+};
+
+static struct ddb_info ddb_octopusv3 = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Digital Devices Octopus V3 DVB adapter",
+    .port_num = 4,
+};
 
 #define DDVID 0xdd01 /* Digital Devices Vendor ID */
 
@@ -1680,8 +1709,12 @@ static const struct pci_device_id ddb_id_tbl[] = {
     DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
     DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
     DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
-    DDB_ID(DDVID, 0x0003, DDVID, 0x0010, ddb_octopus),
+    DDB_ID(DDVID, 0x0003, DDVID, 0x0010, ddb_octopus_mini),
     DDB_ID(DDVID, 0x0003, DDVID, 0x0020, ddb_v6),
+    DDB_ID(DDVID, 0x0003, DDVID, 0x0021, ddb_v6_5),
+    DDB_ID(DDVID, 0x0003, DDVID, 0x0030, ddb_dvbct),
+    DDB_ID(DDVID, 0x0003, DDVID, 0xdb03, ddb_satixS2v3),
+    DDB_ID(DDVID, 0x0005, DDVID, 0x0004, ddb_octopusv3),
     /* in case sub-ids got deleted in flash */
     DDB_ID(DDVID, 0x0003, PCI_ANY_ID, PCI_ANY_ID, ddb_none),
     {0}
#1 lore raw

ACK, tested ok with CineS2 6.5 and Octopus V3.

D.Herrendoerfer

Quoted 83 lines · Christopher Reimer

Hello,

it's the first time I try to contribute here. So please be gracious.

This patch adds the necessary IDs for the following dvb cards:

Digital Devices Octopus Mini
Digital Devices Cine S2 V6.5
Digital Devices DVBCT V6.1
Digital Devices Octopus V3
Mystique SaTiX-S2 V3

All these changes are taken from the official driver package by Digital Devices.
http://download.digital-devices.de/download/linux/

---

drivers/media/pci/ddbridge/ddbridge-core.c +34 -2
index fb52bda..da8f848 100644
@@ -1663,11 +1663,40 @@ static struct ddb_info ddb_octopus_le = {
    .port_num = 2,
 };
 
+static struct ddb_info ddb_octopus_mini = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Digital Devices Octopus Mini",
+    .port_num = 4,
+};
+
 static struct ddb_info ddb_v6 = {
    .type     = DDB_OCTOPUS,
    .name     = "Digital Devices Cine S2 V6 DVB adapter",
    .port_num = 3,
 };
+static struct ddb_info ddb_v6_5 = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Digital Devices Cine S2 V6.5 DVB adapter",
+    .port_num = 4,
+};
+
+static struct ddb_info ddb_dvbct = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Digital Devices DVBCT V6.1 DVB adapter",
+    .port_num = 3,
+};
+
+static struct ddb_info ddb_satixS2v3 = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Mystique SaTiX-S2 V3 DVB adapter",
+    .port_num = 3,
+};
+
+static struct ddb_info ddb_octopusv3 = {
+    .type     = DDB_OCTOPUS,
+    .name     = "Digital Devices Octopus V3 DVB adapter",
+    .port_num = 4,
+};
 
 #define DDVID 0xdd01 /* Digital Devices Vendor ID */
 
@@ -1680,8 +1709,12 @@ static const struct pci_device_id ddb_id_tbl[] = {
    DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
    DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
    DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
-    DDB_ID(DDVID, 0x0003, DDVID, 0x0010, ddb_octopus),
+    DDB_ID(DDVID, 0x0003, DDVID, 0x0010, ddb_octopus_mini),
    DDB_ID(DDVID, 0x0003, DDVID, 0x0020, ddb_v6),
+    DDB_ID(DDVID, 0x0003, DDVID, 0x0021, ddb_v6_5),
+    DDB_ID(DDVID, 0x0003, DDVID, 0x0030, ddb_dvbct),
+    DDB_ID(DDVID, 0x0003, DDVID, 0xdb03, ddb_satixS2v3),
+    DDB_ID(DDVID, 0x0005, DDVID, 0x0004, ddb_octopusv3),
    /* in case sub-ids got deleted in flash */
    DDB_ID(DDVID, 0x0003, PCI_ANY_ID, PCI_ANY_ID, ddb_none),
    {0}
 
--

To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html