Ticket #6842: dcx3200_0.21-fixes.diff

libs/libmythtv/firewiredevice.cpp

@@ -418 +418 @@
 
     const uint64_t motorola_vendor_ids[] =
     {
-        /* DCH-3200 */
+        /* DCH-3200, DCX-3200 */
         0x1c11,    0x1cfb,    0x1fc4,    0x23a3,
         /* DCH-3416 */
         0x1e46,
@@ -448 +448 @@
 
     for (uint i = 0; i < motorola_vendor_id_cnt; i++)
     {
+        id_to_model[motorola_vendor_ids[i] << 32 | 0xf740] = "DCX-3200";
         id_to_model[motorola_vendor_ids[i] << 32 | 0xd330] = "DCH-3200";
         id_to_model[motorola_vendor_ids[i] << 32 | 0xb630] = "DCH-3416";
         id_to_model[motorola_vendor_ids[i] << 32 | 0x34cb] = "DCT-3412";

libs/libmythtv/videosource.cpp

@@ -1120 +1120 @@
     setLabel(QObject::tr("Cable box model"));
     addSelection(QObject::tr("Generic"), "GENERIC");
     addSelection("DCH-3200");
+    addSelection("DCX-3200");
     addSelection("DCT-3412");
     addSelection("DCT-3416");
     addSelection("DCT-6200");

contrib/channel_changers/6200ch.c

@@ -38 +38 @@
 #define DCH3200_VENDOR_ID3 0x00001fc4
 #define DCH3200_VENDOR_ID4 0x000023a3
 #define DCH3200_MODEL_ID1  0x0000d330
+#define DCX3200_MODEL_ID1  0x0000f740
 
 #define DCH3416_VENDOR_ID1 0x00001e46
 #define DCH3416_MODEL_ID1  0x0000b630
@@ -308 +309 @@
             (dir.vendor_id == PACE_VENDOR_ID1) ||
             (dir.vendor_id == PACE_VENDOR_ID2)) &&
            ((dir.model_id == DCH3200_MODEL_ID1) ||
+            (dir.model_id == DCX3200_MODEL_ID1) ||
             (dir.model_id == DCH3416_MODEL_ID1) ||
             (dir.model_id == DCT3412_MODEL_ID1) ||
             (dir.model_id == DCT3416_MODEL_ID1) ||