aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2011-10-31 11:24:44 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 05:43:09 -0400
commit87ad567e257523ea8857507eaaed866ba5d20d5d (patch)
tree5db610818f8f9cb0c6471a02f74c2563d0a7f7c8
parent79848e9afbdb47a230d55d29af1a6fada718427c (diff)
[media] staging: as102: Fix CodingStyle errors in file as102_fe.c
Fix Linux kernel coding style (whitespace and indentation) errors in file as102_fe.c. No functional changes. Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Piotr Chmura <chmooreck@poczta.onet.pl> Signed-off-by: Sylwester Nawrocki <snjw23@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/media/as102/as102_fe.c476
1 files changed, 252 insertions, 224 deletions
diff --git a/drivers/staging/media/as102/as102_fe.c b/drivers/staging/media/as102/as102_fe.c
index 3e6f497aed5..e9f7188ee44 100644
--- a/drivers/staging/media/as102/as102_fe.c
+++ b/drivers/staging/media/as102/as102_fe.c
@@ -1,6 +1,7 @@
1/* 1/*
2 * Abilis Systems Single DVB-T Receiver 2 * Abilis Systems Single DVB-T Receiver
3 * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com> 3 * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
4 * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.com>
4 * 5 *
5 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
@@ -31,12 +32,14 @@ static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
31static void as102_fe_copy_tune_parameters(struct as10x_tune_args *dst, 32static void as102_fe_copy_tune_parameters(struct as10x_tune_args *dst,
32 struct dvb_frontend_parameters *src); 33 struct dvb_frontend_parameters *src);
33 34
34static void as102_fe_release(struct dvb_frontend *fe) { 35static void as102_fe_release(struct dvb_frontend *fe)
36{
35 struct as102_dev_t *dev; 37 struct as102_dev_t *dev;
36 38
37 ENTER(); 39 ENTER();
38 40
39 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 41 dev = (struct as102_dev_t *) fe->tuner_priv;
42 if (dev == NULL)
40 return; 43 return;
41 44
42#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) 45#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
@@ -64,13 +67,15 @@ static void as102_fe_release(struct dvb_frontend *fe) {
64} 67}
65 68
66#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) 69#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
67static int as102_fe_init(struct dvb_frontend *fe) { 70static int as102_fe_init(struct dvb_frontend *fe)
71{
68 int ret = 0; 72 int ret = 0;
69 struct as102_dev_t *dev; 73 struct as102_dev_t *dev;
70 74
71 ENTER(); 75 ENTER();
72 76
73 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 77 dev = (struct as102_dev_t *) fe->tuner_priv;
78 if (dev == NULL)
74 return -ENODEV; 79 return -ENODEV;
75 80
76 if (mutex_lock_interruptible(&dev->bus_adap.lock)) 81 if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -90,14 +95,16 @@ static int as102_fe_init(struct dvb_frontend *fe) {
90#endif 95#endif
91 96
92static int as102_fe_set_frontend(struct dvb_frontend *fe, 97static int as102_fe_set_frontend(struct dvb_frontend *fe,
93 struct dvb_frontend_parameters *params) { 98 struct dvb_frontend_parameters *params)
99{
94 int ret = 0; 100 int ret = 0;
95 struct as102_dev_t *dev; 101 struct as102_dev_t *dev;
96 struct as10x_tune_args tune_args = { 0 }; 102 struct as10x_tune_args tune_args = { 0 };
97 103
98 ENTER(); 104 ENTER();
99 105
100 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 106 dev = (struct as102_dev_t *) fe->tuner_priv;
107 if (dev == NULL)
101 return -ENODEV; 108 return -ENODEV;
102 109
103 if (mutex_lock_interruptible(&dev->bus_adap.lock)) 110 if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -107,9 +114,8 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe,
107 114
108 /* send abilis command: SET_TUNE */ 115 /* send abilis command: SET_TUNE */
109 ret = as10x_cmd_set_tune(&dev->bus_adap, &tune_args); 116 ret = as10x_cmd_set_tune(&dev->bus_adap, &tune_args);
110 if(ret != 0) { 117 if (ret != 0)
111 dprintk(debug, "as10x_cmd_set_tune failed. (err = %d)\n", ret); 118 dprintk(debug, "as10x_cmd_set_tune failed. (err = %d)\n", ret);
112 }
113 119
114 mutex_unlock(&dev->bus_adap.lock); 120 mutex_unlock(&dev->bus_adap.lock);
115 121
@@ -117,7 +123,7 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe,
117 return (ret < 0) ? -EINVAL : 0; 123 return (ret < 0) ? -EINVAL : 0;
118} 124}
119 125
120static int as102_fe_get_frontend(struct dvb_frontend* fe, 126static int as102_fe_get_frontend(struct dvb_frontend *fe,
121 struct dvb_frontend_parameters *p) { 127 struct dvb_frontend_parameters *p) {
122 int ret = 0; 128 int ret = 0;
123 struct as102_dev_t *dev; 129 struct as102_dev_t *dev;
@@ -125,7 +131,8 @@ static int as102_fe_get_frontend(struct dvb_frontend* fe,
125 131
126 ENTER(); 132 ENTER();
127 133
128 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 134 dev = (struct as102_dev_t *) fe->tuner_priv;
135 if (dev == NULL)
129 return -EINVAL; 136 return -EINVAL;
130 137
131 if (mutex_lock_interruptible(&dev->bus_adap.lock)) 138 if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -150,7 +157,8 @@ static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
150#if 0 157#if 0
151 dprintk(debug, "step_size = %d\n", settings->step_size); 158 dprintk(debug, "step_size = %d\n", settings->step_size);
152 dprintk(debug, "max_drift = %d\n", settings->max_drift); 159 dprintk(debug, "max_drift = %d\n", settings->max_drift);
153 dprintk(debug, "min_delay_ms = %d -> %d\n", settings->min_delay_ms, 1000); 160 dprintk(debug, "min_delay_ms = %d -> %d\n", settings->min_delay_ms,
161 1000);
154#endif 162#endif
155 163
156 settings->min_delay_ms = 1000; 164 settings->min_delay_ms = 1000;
@@ -160,14 +168,16 @@ static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
160} 168}
161 169
162 170
163static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status) { 171static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status)
172{
164 int ret = 0; 173 int ret = 0;
165 struct as102_dev_t *dev; 174 struct as102_dev_t *dev;
166 struct as10x_tune_status tstate = { 0 }; 175 struct as10x_tune_status tstate = { 0 };
167 176
168 ENTER(); 177 ENTER();
169 178
170 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 179 dev = (struct as102_dev_t *) fe->tuner_priv;
180 if (dev == NULL)
171 return -ENODEV; 181 return -ENODEV;
172 182
173 if (mutex_lock_interruptible(&dev->bus_adap.lock)) 183 if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -176,48 +186,47 @@ static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status) {
176 /* send abilis command: GET_TUNE_STATUS */ 186 /* send abilis command: GET_TUNE_STATUS */
177 ret = as10x_cmd_get_tune_status(&dev->bus_adap, &tstate); 187 ret = as10x_cmd_get_tune_status(&dev->bus_adap, &tstate);
178 if (ret < 0) { 188 if (ret < 0) {
179 dprintk(debug, "as10x_cmd_get_tune_status failed (err = %d)\n", ret); 189 dprintk(debug, "as10x_cmd_get_tune_status failed (err = %d)\n",
190 ret);
180 goto out; 191 goto out;
181 } 192 }
182 193
183 dev->signal_strength = tstate.signal_strength; 194 dev->signal_strength = tstate.signal_strength;
184 dev->ber = tstate.BER; 195 dev->ber = tstate.BER;
185 196
186 switch(tstate.tune_state) { 197 switch (tstate.tune_state) {
187 case TUNE_STATUS_SIGNAL_DVB_OK: 198 case TUNE_STATUS_SIGNAL_DVB_OK:
188 *status = FE_HAS_SIGNAL | 199 *status = FE_HAS_SIGNAL | FE_HAS_CARRIER;
189 FE_HAS_CARRIER; 200 break;
190 break; 201 case TUNE_STATUS_STREAM_DETECTED:
191 case TUNE_STATUS_STREAM_DETECTED: 202 *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_SYNC;
192 *status = FE_HAS_SIGNAL | 203 break;
193 FE_HAS_CARRIER | 204 case TUNE_STATUS_STREAM_TUNED:
194 FE_HAS_SYNC; 205 *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_SYNC |
195 break; 206 FE_HAS_LOCK;
196 case TUNE_STATUS_STREAM_TUNED: 207 break;
197 *status = FE_HAS_SIGNAL | 208 default:
198 FE_HAS_CARRIER | 209 *status = TUNE_STATUS_NOT_TUNED;
199 FE_HAS_SYNC |
200 FE_HAS_LOCK;
201 break;
202 default:
203 *status = TUNE_STATUS_NOT_TUNED;
204 } 210 }
205 211
206 dprintk(debug, "tuner status: 0x%02x , strength %d , per: %d , ber: %d\n", 212 dprintk(debug, "tuner status: 0x%02x, strength %d, per: %d, ber: %d\n",
207 tstate.tune_state, tstate.signal_strength, 213 tstate.tune_state, tstate.signal_strength,
208 tstate.PER, tstate.BER); 214 tstate.PER, tstate.BER);
209 215
210 if (*status & FE_HAS_LOCK) { 216 if (*status & FE_HAS_LOCK) {
211 if (as10x_cmd_get_demod_stats(&dev->bus_adap, 217 if (as10x_cmd_get_demod_stats(&dev->bus_adap,
212 (struct as10x_demod_stats *) &dev->demod_stats) < 0) { 218 (struct as10x_demod_stats *) &dev->demod_stats) < 0) {
213 memset(&dev->demod_stats, 0, sizeof(dev->demod_stats)); 219 memset(&dev->demod_stats, 0, sizeof(dev->demod_stats));
214 dprintk(debug, "as10x_cmd_get_demod_stats failed (probably not tuned)\n"); 220 dprintk(debug, "as10x_cmd_get_demod_stats failed "
221 "(probably not tuned)\n");
215 } else { 222 } else {
216 dprintk(debug, "demod status: fc: 0x%08x , bad fc: 0x%08x , bytes corrected: 0x%08x , MER: 0x%04x\n", 223 dprintk(debug,
217 dev->demod_stats.frame_count, 224 "demod status: fc: 0x%08x, bad fc: 0x%08x, "
218 dev->demod_stats.bad_frame_count, 225 "bytes corrected: 0x%08x , MER: 0x%04x\n",
219 dev->demod_stats.bytes_fixed_by_rs, 226 dev->demod_stats.frame_count,
220 dev->demod_stats.mer); 227 dev->demod_stats.bad_frame_count,
228 dev->demod_stats.bytes_fixed_by_rs,
229 dev->demod_stats.mer);
221 } 230 }
222 } else { 231 } else {
223 memset(&dev->demod_stats, 0, sizeof(dev->demod_stats)); 232 memset(&dev->demod_stats, 0, sizeof(dev->demod_stats));
@@ -236,12 +245,14 @@ out:
236 * - the accuracy equals ±2dB for a SNR range from 4dB to 30dB 245 * - the accuracy equals ±2dB for a SNR range from 4dB to 30dB
237 * - the accuracy is >2dB for SNR values outside this range 246 * - the accuracy is >2dB for SNR values outside this range
238 */ 247 */
239static int as102_fe_read_snr(struct dvb_frontend* fe, u16* snr) { 248static int as102_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
249{
240 struct as102_dev_t *dev; 250 struct as102_dev_t *dev;
241 251
242 ENTER(); 252 ENTER();
243 253
244 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 254 dev = (struct as102_dev_t *) fe->tuner_priv;
255 if (dev == NULL)
245 return -ENODEV; 256 return -ENODEV;
246 257
247 *snr = dev->demod_stats.mer; 258 *snr = dev->demod_stats.mer;
@@ -250,12 +261,14 @@ static int as102_fe_read_snr(struct dvb_frontend* fe, u16* snr) {
250 return 0; 261 return 0;
251} 262}
252 263
253static int as102_fe_read_ber(struct dvb_frontend* fe, u32* ber) { 264static int as102_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
265{
254 struct as102_dev_t *dev; 266 struct as102_dev_t *dev;
255 267
256 ENTER(); 268 ENTER();
257 269
258 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 270 dev = (struct as102_dev_t *) fe->tuner_priv;
271 if (dev == NULL)
259 return -ENODEV; 272 return -ENODEV;
260 273
261 *ber = dev->ber; 274 *ber = dev->ber;
@@ -264,12 +277,15 @@ static int as102_fe_read_ber(struct dvb_frontend* fe, u32* ber) {
264 return 0; 277 return 0;
265} 278}
266 279
267static int as102_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength) { 280static int as102_fe_read_signal_strength(struct dvb_frontend *fe,
281 u16 *strength)
282{
268 struct as102_dev_t *dev; 283 struct as102_dev_t *dev;
269 284
270 ENTER(); 285 ENTER();
271 286
272 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 287 dev = (struct as102_dev_t *) fe->tuner_priv;
288 if (dev == NULL)
273 return -ENODEV; 289 return -ENODEV;
274 290
275 *strength = (((0xffff * 400) * dev->signal_strength + 41000) * 2); 291 *strength = (((0xffff * 400) * dev->signal_strength + 41000) * 2);
@@ -278,12 +294,14 @@ static int as102_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength)
278 return 0; 294 return 0;
279} 295}
280 296
281static int as102_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) { 297static int as102_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
298{
282 struct as102_dev_t *dev; 299 struct as102_dev_t *dev;
283 300
284 ENTER(); 301 ENTER();
285 302
286 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 303 dev = (struct as102_dev_t *) fe->tuner_priv;
304 if (dev == NULL)
287 return -ENODEV; 305 return -ENODEV;
288 306
289 if (dev->demod_stats.has_started) 307 if (dev->demod_stats.has_started)
@@ -296,13 +314,15 @@ static int as102_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) {
296} 314}
297 315
298#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)) 316#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
299static int as102_fe_ts_bus_ctrl(struct dvb_frontend* fe, int acquire) { 317static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
318{
300 struct as102_dev_t *dev; 319 struct as102_dev_t *dev;
301 int ret; 320 int ret;
302 321
303 ENTER(); 322 ENTER();
304 323
305 if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL) 324 dev = (struct as102_dev_t *) fe->tuner_priv;
325 if (dev == NULL)
306 return -ENODEV; 326 return -ENODEV;
307 327
308 if (mutex_lock_interruptible(&dev->bus_adap.lock)) 328 if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -362,8 +382,8 @@ static struct dvb_frontend_ops as102_fe_ops = {
362#endif 382#endif
363}; 383};
364 384
365int as102_dvb_unregister_fe(struct dvb_frontend *fe) { 385int as102_dvb_unregister_fe(struct dvb_frontend *fe)
366 386{
367 /* unregister frontend */ 387 /* unregister frontend */
368 dvb_unregister_frontend(fe); 388 dvb_unregister_frontend(fe);
369 389
@@ -374,11 +394,13 @@ int as102_dvb_unregister_fe(struct dvb_frontend *fe) {
374 return 0; 394 return 0;
375} 395}
376 396
377int as102_dvb_register_fe(struct as102_dev_t *as102_dev, struct dvb_frontend *dvb_fe) { 397int as102_dvb_register_fe(struct as102_dev_t *as102_dev,
398 struct dvb_frontend *dvb_fe)
399{
378 int errno; 400 int errno;
379 struct dvb_adapter *dvb_adap; 401 struct dvb_adapter *dvb_adap;
380 402
381 if(as102_dev == NULL) 403 if (as102_dev == NULL)
382 return -EINVAL; 404 return -EINVAL;
383 405
384 /* extract dvb_adapter */ 406 /* extract dvb_adapter */
@@ -389,140 +411,143 @@ int as102_dvb_register_fe(struct as102_dev_t *as102_dev, struct dvb_frontend *dv
389 411
390 /* register dbvb frontend */ 412 /* register dbvb frontend */
391 errno = dvb_register_frontend(dvb_adap, dvb_fe); 413 errno = dvb_register_frontend(dvb_adap, dvb_fe);
392 if(errno == 0) 414 if (errno == 0)
393 dvb_fe->tuner_priv = as102_dev; 415 dvb_fe->tuner_priv = as102_dev;
394 416
395 return errno; 417 return errno;
396} 418}
397 419
398static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst, 420static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
399 struct as10x_tps *as10x_tps) { 421 struct as10x_tps *as10x_tps)
422{
400 423
401 struct dvb_ofdm_parameters *fe_tps = &dst->u.ofdm; 424 struct dvb_ofdm_parameters *fe_tps = &dst->u.ofdm;
402 425
403 /* extract consteallation */ 426 /* extract consteallation */
404 switch(as10x_tps->constellation) { 427 switch (as10x_tps->constellation) {
405 case CONST_QPSK: 428 case CONST_QPSK:
406 fe_tps->constellation = QPSK; 429 fe_tps->constellation = QPSK;
407 break; 430 break;
408 case CONST_QAM16: 431 case CONST_QAM16:
409 fe_tps->constellation = QAM_16; 432 fe_tps->constellation = QAM_16;
410 break; 433 break;
411 case CONST_QAM64: 434 case CONST_QAM64:
412 fe_tps->constellation = QAM_64; 435 fe_tps->constellation = QAM_64;
413 break; 436 break;
414 } 437 }
415 438
416 /* extract hierarchy */ 439 /* extract hierarchy */
417 switch(as10x_tps->hierarchy) { 440 switch (as10x_tps->hierarchy) {
418 case HIER_NONE: 441 case HIER_NONE:
419 fe_tps->hierarchy_information = HIERARCHY_NONE; 442 fe_tps->hierarchy_information = HIERARCHY_NONE;
420 break; 443 break;
421 case HIER_ALPHA_1: 444 case HIER_ALPHA_1:
422 fe_tps->hierarchy_information = HIERARCHY_1; 445 fe_tps->hierarchy_information = HIERARCHY_1;
423 break; 446 break;
424 case HIER_ALPHA_2: 447 case HIER_ALPHA_2:
425 fe_tps->hierarchy_information = HIERARCHY_2; 448 fe_tps->hierarchy_information = HIERARCHY_2;
426 break; 449 break;
427 case HIER_ALPHA_4: 450 case HIER_ALPHA_4:
428 fe_tps->hierarchy_information = HIERARCHY_4; 451 fe_tps->hierarchy_information = HIERARCHY_4;
429 break; 452 break;
430 } 453 }
431 454
432 /* extract code rate HP */ 455 /* extract code rate HP */
433 switch(as10x_tps->code_rate_HP) { 456 switch (as10x_tps->code_rate_HP) {
434 case CODE_RATE_1_2: 457 case CODE_RATE_1_2:
435 fe_tps->code_rate_HP = FEC_1_2; 458 fe_tps->code_rate_HP = FEC_1_2;
436 break; 459 break;
437 case CODE_RATE_2_3: 460 case CODE_RATE_2_3:
438 fe_tps->code_rate_HP = FEC_2_3; 461 fe_tps->code_rate_HP = FEC_2_3;
439 break; 462 break;
440 case CODE_RATE_3_4: 463 case CODE_RATE_3_4:
441 fe_tps->code_rate_HP = FEC_3_4; 464 fe_tps->code_rate_HP = FEC_3_4;
442 break; 465 break;
443 case CODE_RATE_5_6: 466 case CODE_RATE_5_6:
444 fe_tps->code_rate_HP = FEC_5_6; 467 fe_tps->code_rate_HP = FEC_5_6;
445 break; 468 break;
446 case CODE_RATE_7_8: 469 case CODE_RATE_7_8:
447 fe_tps->code_rate_HP = FEC_7_8; 470 fe_tps->code_rate_HP = FEC_7_8;
448 break; 471 break;
449 } 472 }
450 473
451 /* extract code rate LP */ 474 /* extract code rate LP */
452 switch(as10x_tps->code_rate_LP) { 475 switch (as10x_tps->code_rate_LP) {
453 case CODE_RATE_1_2: 476 case CODE_RATE_1_2:
454 fe_tps->code_rate_LP = FEC_1_2; 477 fe_tps->code_rate_LP = FEC_1_2;
455 break; 478 break;
456 case CODE_RATE_2_3: 479 case CODE_RATE_2_3:
457 fe_tps->code_rate_LP = FEC_2_3; 480 fe_tps->code_rate_LP = FEC_2_3;
458 break; 481 break;
459 case CODE_RATE_3_4: 482 case CODE_RATE_3_4:
460 fe_tps->code_rate_LP = FEC_3_4; 483 fe_tps->code_rate_LP = FEC_3_4;
461 break; 484 break;
462 case CODE_RATE_5_6: 485 case CODE_RATE_5_6:
463 fe_tps->code_rate_LP = FEC_5_6; 486 fe_tps->code_rate_LP = FEC_5_6;
464 break; 487 break;
465 case CODE_RATE_7_8: 488 case CODE_RATE_7_8:
466 fe_tps->code_rate_LP = FEC_7_8; 489 fe_tps->code_rate_LP = FEC_7_8;
467 break; 490 break;
468 } 491 }
469 492
470 /* extract guard interval */ 493 /* extract guard interval */
471 switch(as10x_tps->guard_interval) { 494 switch (as10x_tps->guard_interval) {
472 case GUARD_INT_1_32: 495 case GUARD_INT_1_32:
473 fe_tps->guard_interval = GUARD_INTERVAL_1_32; 496 fe_tps->guard_interval = GUARD_INTERVAL_1_32;
474 break; 497 break;
475 case GUARD_INT_1_16: 498 case GUARD_INT_1_16:
476 fe_tps->guard_interval = GUARD_INTERVAL_1_16; 499 fe_tps->guard_interval = GUARD_INTERVAL_1_16;
477 break; 500 break;
478 case GUARD_INT_1_8: 501 case GUARD_INT_1_8:
479 fe_tps->guard_interval = GUARD_INTERVAL_1_8; 502 fe_tps->guard_interval = GUARD_INTERVAL_1_8;
480 break; 503 break;
481 case GUARD_INT_1_4: 504 case GUARD_INT_1_4:
482 fe_tps->guard_interval = GUARD_INTERVAL_1_4; 505 fe_tps->guard_interval = GUARD_INTERVAL_1_4;
483 break; 506 break;
484 } 507 }
485 508
486 /* extract transmission mode */ 509 /* extract transmission mode */
487 switch(as10x_tps->transmission_mode) { 510 switch (as10x_tps->transmission_mode) {
488 case TRANS_MODE_2K: 511 case TRANS_MODE_2K:
489 fe_tps->transmission_mode = TRANSMISSION_MODE_2K; 512 fe_tps->transmission_mode = TRANSMISSION_MODE_2K;
490 break; 513 break;
491 case TRANS_MODE_8K: 514 case TRANS_MODE_8K:
492 fe_tps->transmission_mode = TRANSMISSION_MODE_8K; 515 fe_tps->transmission_mode = TRANSMISSION_MODE_8K;
493 break; 516 break;
494 } 517 }
495} 518}
496 519
497static uint8_t as102_fe_get_code_rate(fe_code_rate_t arg) { 520static uint8_t as102_fe_get_code_rate(fe_code_rate_t arg)
521{
498 uint8_t c; 522 uint8_t c;
499 523
500 switch(arg) { 524 switch (arg) {
501 case FEC_1_2: 525 case FEC_1_2:
502 c = CODE_RATE_1_2; 526 c = CODE_RATE_1_2;
503 break; 527 break;
504 case FEC_2_3: 528 case FEC_2_3:
505 c = CODE_RATE_2_3; 529 c = CODE_RATE_2_3;
506 break; 530 break;
507 case FEC_3_4: 531 case FEC_3_4:
508 c = CODE_RATE_3_4; 532 c = CODE_RATE_3_4;
509 break; 533 break;
510 case FEC_5_6: 534 case FEC_5_6:
511 c = CODE_RATE_5_6; 535 c = CODE_RATE_5_6;
512 break; 536 break;
513 case FEC_7_8: 537 case FEC_7_8:
514 c = CODE_RATE_7_8; 538 c = CODE_RATE_7_8;
515 break; 539 break;
516 default: 540 default:
517 c = CODE_RATE_UNKNOWN; 541 c = CODE_RATE_UNKNOWN;
518 break; 542 break;
519 } 543 }
520 544
521 return c; 545 return c;
522} 546}
523 547
524static void as102_fe_copy_tune_parameters(struct as10x_tune_args *tune_args, 548static void as102_fe_copy_tune_parameters(struct as10x_tune_args *tune_args,
525 struct dvb_frontend_parameters *params) { 549 struct dvb_frontend_parameters *params)
550{
526 551
527 /* set frequency */ 552 /* set frequency */
528 tune_args->freq = params->frequency / 1000; 553 tune_args->freq = params->frequency / 1000;
@@ -530,81 +555,81 @@ static void as102_fe_copy_tune_parameters(struct as10x_tune_args *tune_args,
530 /* fix interleaving_mode */ 555 /* fix interleaving_mode */
531 tune_args->interleaving_mode = INTLV_NATIVE; 556 tune_args->interleaving_mode = INTLV_NATIVE;
532 557
533 switch(params->u.ofdm.bandwidth) { 558 switch (params->u.ofdm.bandwidth) {
534 case BANDWIDTH_8_MHZ: 559 case BANDWIDTH_8_MHZ:
535 tune_args->bandwidth = BW_8_MHZ; 560 tune_args->bandwidth = BW_8_MHZ;
536 break; 561 break;
537 case BANDWIDTH_7_MHZ: 562 case BANDWIDTH_7_MHZ:
538 tune_args->bandwidth = BW_7_MHZ; 563 tune_args->bandwidth = BW_7_MHZ;
539 break; 564 break;
540 case BANDWIDTH_6_MHZ: 565 case BANDWIDTH_6_MHZ:
541 tune_args->bandwidth = BW_6_MHZ; 566 tune_args->bandwidth = BW_6_MHZ;
542 break; 567 break;
543 default: 568 default:
544 tune_args->bandwidth = BW_8_MHZ; 569 tune_args->bandwidth = BW_8_MHZ;
545 } 570 }
546 571
547 switch(params->u.ofdm.guard_interval) { 572 switch (params->u.ofdm.guard_interval) {
548 case GUARD_INTERVAL_1_32: 573 case GUARD_INTERVAL_1_32:
549 tune_args->guard_interval = GUARD_INT_1_32; 574 tune_args->guard_interval = GUARD_INT_1_32;
550 break; 575 break;
551 case GUARD_INTERVAL_1_16: 576 case GUARD_INTERVAL_1_16:
552 tune_args->guard_interval = GUARD_INT_1_16; 577 tune_args->guard_interval = GUARD_INT_1_16;
553 break; 578 break;
554 case GUARD_INTERVAL_1_8: 579 case GUARD_INTERVAL_1_8:
555 tune_args->guard_interval = GUARD_INT_1_8; 580 tune_args->guard_interval = GUARD_INT_1_8;
556 break; 581 break;
557 case GUARD_INTERVAL_1_4: 582 case GUARD_INTERVAL_1_4:
558 tune_args->guard_interval = GUARD_INT_1_4; 583 tune_args->guard_interval = GUARD_INT_1_4;
559 break; 584 break;
560 case GUARD_INTERVAL_AUTO: 585 case GUARD_INTERVAL_AUTO:
561 default: 586 default:
562 tune_args->guard_interval = GUARD_UNKNOWN; 587 tune_args->guard_interval = GUARD_UNKNOWN;
563 break; 588 break;
564 } 589 }
565 590
566 switch(params->u.ofdm.constellation) { 591 switch (params->u.ofdm.constellation) {
567 case QPSK: 592 case QPSK:
568 tune_args->constellation = CONST_QPSK; 593 tune_args->constellation = CONST_QPSK;
569 break; 594 break;
570 case QAM_16: 595 case QAM_16:
571 tune_args->constellation = CONST_QAM16; 596 tune_args->constellation = CONST_QAM16;
572 break; 597 break;
573 case QAM_64: 598 case QAM_64:
574 tune_args->constellation = CONST_QAM64; 599 tune_args->constellation = CONST_QAM64;
575 break; 600 break;
576 default: 601 default:
577 tune_args->constellation = CONST_UNKNOWN; 602 tune_args->constellation = CONST_UNKNOWN;
578 break; 603 break;
579 } 604 }
580 605
581 switch(params->u.ofdm.transmission_mode) { 606 switch (params->u.ofdm.transmission_mode) {
582 case TRANSMISSION_MODE_2K: 607 case TRANSMISSION_MODE_2K:
583 tune_args->transmission_mode = TRANS_MODE_2K; 608 tune_args->transmission_mode = TRANS_MODE_2K;
584 break; 609 break;
585 case TRANSMISSION_MODE_8K: 610 case TRANSMISSION_MODE_8K:
586 tune_args->transmission_mode = TRANS_MODE_8K; 611 tune_args->transmission_mode = TRANS_MODE_8K;
587 break; 612 break;
588 default: 613 default:
589 tune_args->transmission_mode = TRANS_MODE_UNKNOWN; 614 tune_args->transmission_mode = TRANS_MODE_UNKNOWN;
590 } 615 }
591 616
592 switch(params->u.ofdm.hierarchy_information) { 617 switch (params->u.ofdm.hierarchy_information) {
593 case HIERARCHY_NONE: 618 case HIERARCHY_NONE:
594 tune_args->hierarchy = HIER_NONE; 619 tune_args->hierarchy = HIER_NONE;
595 break; 620 break;
596 case HIERARCHY_1: 621 case HIERARCHY_1:
597 tune_args->hierarchy = HIER_ALPHA_1; 622 tune_args->hierarchy = HIER_ALPHA_1;
598 break; 623 break;
599 case HIERARCHY_2: 624 case HIERARCHY_2:
600 tune_args->hierarchy = HIER_ALPHA_2; 625 tune_args->hierarchy = HIER_ALPHA_2;
601 break; 626 break;
602 case HIERARCHY_4: 627 case HIERARCHY_4:
603 tune_args->hierarchy = HIER_ALPHA_4; 628 tune_args->hierarchy = HIER_ALPHA_4;
604 break; 629 break;
605 case HIERARCHY_AUTO: 630 case HIERARCHY_AUTO:
606 tune_args->hierarchy = HIER_UNKNOWN; 631 tune_args->hierarchy = HIER_UNKNOWN;
607 break; 632 break;
608 } 633 }
609 634
610 dprintk(debug, "tuner parameters: freq: %d bw: 0x%02x gi: 0x%02x\n", 635 dprintk(debug, "tuner parameters: freq: %d bw: 0x%02x gi: 0x%02x\n",
@@ -623,23 +648,26 @@ static void as102_fe_copy_tune_parameters(struct as10x_tune_args *tune_args,
623 if (params->u.ofdm.code_rate_LP == FEC_NONE) { 648 if (params->u.ofdm.code_rate_LP == FEC_NONE) {
624 tune_args->hier_select = HIER_HIGH_PRIORITY; 649 tune_args->hier_select = HIER_HIGH_PRIORITY;
625 tune_args->code_rate = 650 tune_args->code_rate =
626 as102_fe_get_code_rate(params->u.ofdm.code_rate_HP); 651 as102_fe_get_code_rate(params->u.ofdm.code_rate_HP);
627 } 652 }
628 653
629 if (params->u.ofdm.code_rate_HP == FEC_NONE) { 654 if (params->u.ofdm.code_rate_HP == FEC_NONE) {
630 tune_args->hier_select = HIER_LOW_PRIORITY; 655 tune_args->hier_select = HIER_LOW_PRIORITY;
631 tune_args->code_rate = 656 tune_args->code_rate =
632 as102_fe_get_code_rate(params->u.ofdm.code_rate_LP); 657 as102_fe_get_code_rate(params->u.ofdm.code_rate_LP);
633 } 658 }
634 659
635 dprintk(debug, "\thierarchy: 0x%02x " 660 dprintk(debug, "\thierarchy: 0x%02x "
636 "selected: %s code_rate_%s: 0x%02x\n", 661 "selected: %s code_rate_%s: 0x%02x\n",
637 tune_args->hierarchy, 662 tune_args->hierarchy,
638 tune_args->hier_select == HIER_HIGH_PRIORITY ? "HP" : "LP", 663 tune_args->hier_select == HIER_HIGH_PRIORITY ?
639 tune_args->hier_select == HIER_HIGH_PRIORITY ? "HP" : "LP", 664 "HP" : "LP",
665 tune_args->hier_select == HIER_HIGH_PRIORITY ?
666 "HP" : "LP",
640 tune_args->code_rate); 667 tune_args->code_rate);
641 } else { 668 } else {
642 tune_args->code_rate = as102_fe_get_code_rate(params->u.ofdm.code_rate_HP); 669 tune_args->code_rate =
670 as102_fe_get_code_rate(params->u.ofdm.code_rate_HP);
643 } 671 }
644} 672}
645#endif 673#endif