DCH-3416 support broken/missing

[infowolfe@…]

This patch adds support.

diff -Nur mythtv-0.21_p19961/contrib/channel_changers/6200ch.c mythtv-0.21_p19961-DCH-3416/contrib/channel_changers/6200ch.c
--- mythtv-0.21_p19961/contrib/channel_changers/6200ch.c        2009-03-02 12:15:55.000000000 -0800
+++ mythtv-0.21_p19961-DCH-3416/contrib/channel_changers/6200ch.c       2009-03-19 06:13:37.000000000 -0700
@@ -35,6 +35,8 @@
 
 #define DCH3200_VENDOR_ID1 0x00001c11
 #define DCH3200_MODEL_ID1  0x0000d330
+#define        DCH3416_VENDOR_ID1 0x00001e46
+#define DCH3416_MODEL_ID1  0x0000b630
 
 #define DCT3412_VENDOR_ID1 0x0000159a
 #define DCT3412_MODEL_ID1  0x000034cb
@@ -219,6 +221,7 @@
 
       // WARNING: Please update firewiredevice.cpp when adding to this list.
       if ( ((dir.vendor_id == DCH3200_VENDOR_ID1) ||
+            (dir.vendor_id == DCH3416_VENDOR_ID1) ||
             (dir.vendor_id == DCT3412_VENDOR_ID1) || 
             (dir.vendor_id == DCT3416_VENDOR_ID1) || 
             (dir.vendor_id == DCT3416_VENDOR_ID2) || 
@@ -244,6 +247,7 @@
             (dir.vendor_id == DCT6416_VENDOR_ID2) ||
             (dir.vendor_id == PACE_VENDOR_ID1)) &&
            ((dir.model_id == DCH3200_MODEL_ID1) ||
+            (dir.model_id == DCH3416_MODEL_ID1) ||
             (dir.model_id == DCT3412_MODEL_ID1) ||
             (dir.model_id == DCT3416_MODEL_ID1) ||
             (dir.model_id == DCT3416_MODEL_ID2) ||
diff -Nur mythtv-0.21_p19961/libs/libmythtv/firewiredevice.cpp mythtv-0.21_p19961-DCH-3416/libs/libmythtv/firewiredevice.cpp
--- mythtv-0.21_p19961/libs/libmythtv/firewiredevice.cpp        2009-03-02 12:15:42.000000000 -0800
+++ mythtv-0.21_p19961-DCH-3416/libs/libmythtv/firewiredevice.cpp       2009-03-19 06:09:27.000000000 -0700
@@ -419,6 +419,8 @@
     {
         /* DCH-3200 */
         0x1c11,
+        /* DCH-3416 */
+        0x1e46,
         /* 3416 */
         0x1bdd,
         /* 3412 */
@@ -438,6 +440,7 @@
     for (uint i = 0; i < motorola_vendor_id_cnt; i++)
     {
         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";
         id_to_model[motorola_vendor_ids[i] << 32 | 0x346b] = "DCT-3416";
         id_to_model[motorola_vendor_ids[i] << 32 | 0xb630] = "DCT-3416";
@@ -468,6 +471,7 @@
 {
     QString model = panel_model.upper();
     return ((model == "DCH-3200") ||
+            (model == "DCH-3416") ||
             (model == "DCT-3412") ||
             (model == "DCT-3416") ||
             (model == "DCT-6200") ||

[danielk]

(In [20359]) Fixes #6374. Add DCH-3416 support to trunk.