Commit d1c615c1 authored by Ilkka Ollakka's avatar Ilkka Ollakka

dvb-c: update frequency table

parent cb9b3dfc
...@@ -358,32 +358,30 @@ static int ScanDvbCNextFast( scan_t *p_scan, scan_configuration_t *p_cfg, double ...@@ -358,32 +358,30 @@ static int ScanDvbCNextFast( scan_t *p_scan, scan_configuration_t *p_cfg, double
msg_Dbg( p_scan->p_obj, "Scan index %"PRId64, p_scan->i_index ); msg_Dbg( p_scan->p_obj, "Scan index %"PRId64, p_scan->i_index );
/* Values taken from dvb-scan utils frequency-files, sorted by how /* Values taken from dvb-scan utils frequency-files, sorted by how
* often they appear. This hopefully speeds up finding services. */ * often they appear. This hopefully speeds up finding services. */
static const unsigned short frequencies[] = { static const unsigned int frequencies[] = { 41000, 39400, 40200,
410, 426, 418, 394, 402, 362, 38600, 41800, 36200, 44200, 43400, 37000, 35400, 42600, 37800,
370, 354, 346, 442, 434, 386, 34600, 45800, 45000, 46600, 32200, 51400, 49000, 33800, 31400,
378, 450, 306, 162, 154, 474, 30600, 47400, 71400, 69000, 68200, 58600, 56200, 54600, 49800,
466, 458, 338, 754, 714, 586, 48200, 33000, 79400, 72200, 69800, 67400, 66600, 65000, 64200,
562, 546, 514, 490, 314, 170, 61000, 55400, 53000, 52200, 50600, 29800, 16200, 15400, 11300,
113, 770, 762, 746, 738, 730, 78600, 77000, 76200, 75400, 74600, 73800, 73000, 70600, 57800,
722, 706, 690, 682, 674, 666, 57000, 53800, 12100, 81000, 77800, 65800, 63400, 61800, 29000,
650, 642, 634, 554, 538, 530, 17000, 85000, 84200, 83400, 81800, 80200, 59400, 36900, 28300,
506, 498, 330, 322, 283, 850, 26600, 25800, 25000, 24200, 23400, 85800, 74800, 73200, 72800,
842, 834, 818, 810, 802, 794, 72400, 72000, 66000, 65600, 60200, 42500, 41700, 40900, 40100,
786, 778, 748, 732, 728, 724, 39300, 38500, 37775, 37700, 37200, 36100, 35600, 35300, 34700,
720, 698, 660, 658, 656, 610, 34500, 33900, 33700, 32900, 32300, 32100, 31500, 31300, 30500,
594, 578, 570, 522, 482, 377, 29900, 29700, 29100, 28950, 28200, 28000, 27500, 27400, 27200,
372, 347, 339, 323, 315, 299, 26700, 25900, 25500, 25100, 24300, 24100, 23500, 23200, 22700,
298, 291, 275, 267, 259, 255, 22600, 21900, 21800, 21100, 20300, 19500, 18700, 17900, 17100,
251, 243, 235, 232, 227, 219, 16300, 15500, 14700, 14600, 14500, 14300, 13900, 13700, 13100,
211, 203, 195, 187, 179, 171, 12900, 12500, 12300
163, 155, 147, 146, 143, 139,
131, 123, 121
}; };
enum { num_frequencies = (sizeof(frequencies)/sizeof(*frequencies)) }; enum { num_frequencies = (sizeof(frequencies)/sizeof(*frequencies)) };
if( p_scan->i_index < num_frequencies ) if( p_scan->i_index < num_frequencies )
{ {
p_cfg->i_frequency = 1000000 * ( frequencies[ p_scan->i_index ] ); p_cfg->i_frequency = 10000 * ( frequencies[ p_scan->i_index ] );
*pf_pos = (double)(p_scan->i_index * 1000 + *pf_pos = (double)(p_scan->i_index * 1000 +
p_scan->parameter.i_symbolrate * 100 + p_scan->parameter.i_symbolrate * 100 +
(p_scan->parameter.i_modulation >> 4) ) (p_scan->parameter.i_modulation >> 4) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment