← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to libs/libmythtv/firewiredevice.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, John Baab
  • Date: 2009-09-29 01:33:23 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20090929013323-6pvn8encm757zbxw
Tags: 0.22.0~trunk22101-0ubuntu1
[ Mario Limonciello ]
* New upstream checkout (r22101)
* Try to guard and make sure that ~mythtv is read from /etc/passwd 
  rather than assuming it's /home/mythtv.

[ John Baab ]
* debian/mythtv-common.postinst:
  - Added symlink for /home/mythtv/.mythtv/config.xml

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythtv/firewiredevice.cpp
412
412
        id_to_model[sa_vendor_ids[i] << 32 | 0x0be0] = "SA3250HD";
413
413
        id_to_model[sa_vendor_ids[i] << 32 | 0x1072] = "SA4200HD";
414
414
        id_to_model[sa_vendor_ids[i] << 32 | 0x10cc] = "SA4250HDC";
 
415
        id_to_model[sa_vendor_ids[i] << 32 | 0x22ce] = "SA8300HD";
415
416
    }
416
417
 
417
418
    const uint64_t motorola_vendor_ids[] =
432
433
        0x0f9f,    0x152f,
433
434
        /* DCT-6216, 2224 */
434
435
        0x17ee,    0x1a66,
 
436
        /* QIP 6200 */
 
437
        0x211e,
435
438
        /* QIP 7100 */
436
439
        0x2374,
437
440
        /* unknown, see http://standards.ieee.org/regauth/oui/oui.txt */
438
441
        0x04db,    0x0406,    0x0ce5,    0x111a,    0x1225,    0x1404,
439
 
        0x1626,    0x18c0,    0x1ade,    0x1cfb,    0x2040,    0x211e,
440
 
        0x2180,    0x2210,    0x230b,    0x2375,    0x2395,    0x23a2,
441
 
        0x23ed,    0x23ee,    0x23a0,    0x23a1,
 
442
        0x1626,    0x18c0,    0x1ade,    0x1cfb,    0x2040,    0x2180,
 
443
        0x2210,    0x230b,    0x2375,    0x2395,    0x23a2,    0x23ed,
 
444
        0x23ee,    0x23a0,    0x23a1,
442
445
 
443
446
    };
444
447
    const uint motorola_vendor_id_cnt =
458
461
        id_to_model[motorola_vendor_ids[i] << 32 | 0x64cb] = "DCT-6212";
459
462
        id_to_model[motorola_vendor_ids[i] << 32 | 0x646b] = "DCT-6216";
460
463
        id_to_model[motorola_vendor_ids[i] << 32 | 0x8100] = "QIP-7100";
 
464
        id_to_model[motorola_vendor_ids[i] << 32 | 0x7100] = "QIP-6200";
461
465
        id_to_model[motorola_vendor_ids[i] << 32 | 0x0001] = "QIP-7100";
462
466
    }
463
467
 
490
494
            (model == "SA3250HD") ||
491
495
            (model == "SA4200HD") ||
492
496
            (model == "SA4250HDC") ||
 
497
            (model == "SA8300HD") ||
493
498
            (model == "PACE-550") ||
494
499
            (model == "PACE-779") ||
 
500
            (model == "QIP-6200") ||
495
501
            (model == "QIP-7100") ||
496
502
            (model == "GENERIC"));
497
503
}