| 1 | *** ./mythtv/libs/libmythtv/firewiredevice.cpp 2010-01-02 11:25:42.000000000 -0500 |
|---|
| 2 | --- ./mythtv/libs/libmythtv/firewiredevice.cpp.trunk 2010-01-02 11:01:55.000000000 -0500 |
|---|
| 3 | *************** |
|---|
| 4 | *** 422,429 **** |
|---|
| 5 | { |
|---|
| 6 | /* DCH-3200, DCX-3200 */ |
|---|
| 7 | 0x1c11, 0x1cfb, 0x1fc4, 0x23a3, 0x23ee, |
|---|
| 8 | - /* DCX-3432 */ |
|---|
| 9 | - 0x24a0, |
|---|
| 10 | /* DCH-3416 */ |
|---|
| 11 | 0x1e46, |
|---|
| 12 | /* DCT-3416 */ |
|---|
| 13 | --- 422,427 ---- |
|---|
| 14 | *************** |
|---|
| 15 | *** 456,462 **** |
|---|
| 16 | { |
|---|
| 17 | id_to_model[motorola_vendor_ids[i] << 32 | 0xf740] = "DCX-3200"; |
|---|
| 18 | id_to_model[motorola_vendor_ids[i] << 32 | 0xfa07] = "DCX-3200"; |
|---|
| 19 | - id_to_model[motorola_vendor_ids[i] << 32 | 0xea05] = "DCX-3432"; |
|---|
| 20 | id_to_model[motorola_vendor_ids[i] << 32 | 0xd330] = "DCH-3200"; |
|---|
| 21 | id_to_model[motorola_vendor_ids[i] << 32 | 0xb630] = "DCH-3416"; |
|---|
| 22 | id_to_model[motorola_vendor_ids[i] << 32 | 0x34cb] = "DCT-3412"; |
|---|
| 23 | --- 454,459 ---- |
|---|
| 24 | *** ./mythtv/contrib/channel_changers/6200ch/6200ch.c 2010-01-02 11:43:01.000000000 -0500 |
|---|
| 25 | --- ./mythtv/contrib/channel_changers/6200ch/6200ch.c.trunk 2010-01-02 11:32:09.000000000 -0500 |
|---|
| 26 | *************** |
|---|
| 27 | *** 41,49 **** |
|---|
| 28 | #define DCX3200_MODEL_ID1 0x0000f740 |
|---|
| 29 | #define DCX3200_MODEL_ID2 0x0000fa07 |
|---|
| 30 | |
|---|
| 31 | - #define DCX3432_VENDOR_ID1 0x000024a0 |
|---|
| 32 | - #define DCX3432_MODEL_ID1 0x0000ea05 |
|---|
| 33 | - |
|---|
| 34 | #define DCH3416_VENDOR_ID1 0x00001e46 |
|---|
| 35 | #define DCH3416_MODEL_ID1 0x0000b630 |
|---|
| 36 | |
|---|
| 37 | --- 41,46 ---- |
|---|
| 38 | *************** |
|---|
| 39 | *** 319,330 **** |
|---|
| 40 | (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID21) || |
|---|
| 41 | (dir.vendor_id == MOT_UNKNOWN_VENDOR_ID22) || |
|---|
| 42 | (dir.vendor_id == PACE_VENDOR_ID1) || |
|---|
| 43 | - (dir.vendor_id == DCX3432_VENDOR_ID1) || |
|---|
| 44 | (dir.vendor_id == PACE_VENDOR_ID2)) && |
|---|
| 45 | ((dir.model_id == DCH3200_MODEL_ID1) || |
|---|
| 46 | (dir.model_id == DCX3200_MODEL_ID1) || |
|---|
| 47 | (dir.model_id == DCX3200_MODEL_ID2) || |
|---|
| 48 | - (dir.model_id == DCX3432_MODEL_ID1) || |
|---|
| 49 | (dir.model_id == DCH3416_MODEL_ID1) || |
|---|
| 50 | (dir.model_id == DCT3412_MODEL_ID1) || |
|---|
| 51 | (dir.model_id == DCT3416_MODEL_ID1) || |
|---|
| 52 | --- 316,325 ---- |
|---|
