~ubuntu-branches/ubuntu/hardy/libhdhomerun/hardy

« back to all changes in this revision

Viewing changes to hdhomerun_config.c

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2008-02-01 13:08:21 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080201130821-pbgpgrp7z89jpmzf
Tags: 0.20080104-0ubuntu1
New upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
182
182
                }
183
183
        }
184
184
 
185
 
        int ret = channelscan_execute_all(hd, HDHOMERUN_CHANNELSCAN_MODE_SCAN, cmd_scan_callback, fp);
 
185
        int ret = channelscan_execute_all(hd, CHANNEL_MAP_US_ALL, cmd_scan_callback, fp);
186
186
 
187
187
        if (fp) {
188
188
                fclose(fp);
370
370
                return -1;
371
371
        }
372
372
 
 
373
        /* Device ID check. */
 
374
        uint32_t device_id_requested = hdhomerun_device_get_device_id_requested(hd);
 
375
        if (!hdhomerun_discover_validate_device_id(device_id_requested)) {
 
376
                fprintf(stderr, "invalid device id: %08lX\n", device_id_requested);
 
377
        }
 
378
 
373
379
        /* Connect to device and check firmware version. */
374
380
        int ret = hdhomerun_device_firmware_version_check(hd, 0);
375
381
        if (ret < 0) {