aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-12 17:50:21 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-21 16:25:30 -0400
commitc098c219b0c2da64250dd0542c5c54ca7245d1a5 (patch)
tree2e78b76eb122673be2f81b7964e3c82d53c093a8
parent1d6207fd2c262deb7006c9269eec33e64c5e514f (diff)
[media] as102: get rid of as10x_fe_copy_tps_parameters()
This function just converts from the as10x internal data into the DVBv5 cache. Get rid of it. No functional changes. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat
-rw-r--r--drivers/media/usb/as102/as102_fe.c201
1 files changed, 98 insertions, 103 deletions
diff --git a/drivers/media/usb/as102/as102_fe.c b/drivers/media/usb/as102/as102_fe.c
index 975ad638ee41..0cd19f23eca9 100644
--- a/drivers/media/usb/as102/as102_fe.c
+++ b/drivers/media/usb/as102/as102_fe.c
@@ -30,104 +30,6 @@ struct as102_state {
30 uint32_t ber; 30 uint32_t ber;
31}; 31};
32 32
33static void as10x_fe_copy_tps_parameters(struct dtv_frontend_properties *fe_tps,
34 struct as10x_tps *as10x_tps)
35{
36
37 /* extract constellation */
38 switch (as10x_tps->modulation) {
39 case CONST_QPSK:
40 fe_tps->modulation = QPSK;
41 break;
42 case CONST_QAM16:
43 fe_tps->modulation = QAM_16;
44 break;
45 case CONST_QAM64:
46 fe_tps->modulation = QAM_64;
47 break;
48 }
49
50 /* extract hierarchy */
51 switch (as10x_tps->hierarchy) {
52 case HIER_NONE:
53 fe_tps->hierarchy = HIERARCHY_NONE;
54 break;
55 case HIER_ALPHA_1:
56 fe_tps->hierarchy = HIERARCHY_1;
57 break;
58 case HIER_ALPHA_2:
59 fe_tps->hierarchy = HIERARCHY_2;
60 break;
61 case HIER_ALPHA_4:
62 fe_tps->hierarchy = HIERARCHY_4;
63 break;
64 }
65
66 /* extract code rate HP */
67 switch (as10x_tps->code_rate_HP) {
68 case CODE_RATE_1_2:
69 fe_tps->code_rate_HP = FEC_1_2;
70 break;
71 case CODE_RATE_2_3:
72 fe_tps->code_rate_HP = FEC_2_3;
73 break;
74 case CODE_RATE_3_4:
75 fe_tps->code_rate_HP = FEC_3_4;
76 break;
77 case CODE_RATE_5_6:
78 fe_tps->code_rate_HP = FEC_5_6;
79 break;
80 case CODE_RATE_7_8:
81 fe_tps->code_rate_HP = FEC_7_8;
82 break;
83 }
84
85 /* extract code rate LP */
86 switch (as10x_tps->code_rate_LP) {
87 case CODE_RATE_1_2:
88 fe_tps->code_rate_LP = FEC_1_2;
89 break;
90 case CODE_RATE_2_3:
91 fe_tps->code_rate_LP = FEC_2_3;
92 break;
93 case CODE_RATE_3_4:
94 fe_tps->code_rate_LP = FEC_3_4;
95 break;
96 case CODE_RATE_5_6:
97 fe_tps->code_rate_LP = FEC_5_6;
98 break;
99 case CODE_RATE_7_8:
100 fe_tps->code_rate_LP = FEC_7_8;
101 break;
102 }
103
104 /* extract guard interval */
105 switch (as10x_tps->guard_interval) {
106 case GUARD_INT_1_32:
107 fe_tps->guard_interval = GUARD_INTERVAL_1_32;
108 break;
109 case GUARD_INT_1_16:
110 fe_tps->guard_interval = GUARD_INTERVAL_1_16;
111 break;
112 case GUARD_INT_1_8:
113 fe_tps->guard_interval = GUARD_INTERVAL_1_8;
114 break;
115 case GUARD_INT_1_4:
116 fe_tps->guard_interval = GUARD_INTERVAL_1_4;
117 break;
118 }
119
120 /* extract transmission mode */
121 switch (as10x_tps->transmission_mode) {
122 case TRANS_MODE_2K:
123 fe_tps->transmission_mode = TRANSMISSION_MODE_2K;
124 break;
125 case TRANS_MODE_8K:
126 fe_tps->transmission_mode = TRANSMISSION_MODE_8K;
127 break;
128 }
129}
130
131static uint8_t as102_fe_get_code_rate(fe_code_rate_t arg) 33static uint8_t as102_fe_get_code_rate(fe_code_rate_t arg)
132{ 34{
133 uint8_t c; 35 uint8_t c;
@@ -300,7 +202,7 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe)
300static int as102_fe_get_frontend(struct dvb_frontend *fe) 202static int as102_fe_get_frontend(struct dvb_frontend *fe)
301{ 203{
302 struct as102_state *state = fe->demodulator_priv; 204 struct as102_state *state = fe->demodulator_priv;
303 struct dtv_frontend_properties *p = &fe->dtv_property_cache; 205 struct dtv_frontend_properties *c = &fe->dtv_property_cache;
304 int ret = 0; 206 int ret = 0;
305 struct as10x_tps tps = { 0 }; 207 struct as10x_tps tps = { 0 };
306 208
@@ -310,12 +212,105 @@ static int as102_fe_get_frontend(struct dvb_frontend *fe)
310 /* send abilis command: GET_TPS */ 212 /* send abilis command: GET_TPS */
311 ret = as10x_cmd_get_tps(state->bus_adap, &tps); 213 ret = as10x_cmd_get_tps(state->bus_adap, &tps);
312 214
313 if (ret == 0)
314 as10x_fe_copy_tps_parameters(p, &tps);
315
316 mutex_unlock(&state->bus_adap->lock); 215 mutex_unlock(&state->bus_adap->lock);
317 216
318 return (ret < 0) ? -EINVAL : 0; 217 if (ret < 0)
218 return ret;
219
220 /* extract constellation */
221 switch (tps.modulation) {
222 case CONST_QPSK:
223 c->modulation = QPSK;
224 break;
225 case CONST_QAM16:
226 c->modulation = QAM_16;
227 break;
228 case CONST_QAM64:
229 c->modulation = QAM_64;
230 break;
231 }
232
233 /* extract hierarchy */
234 switch (tps.hierarchy) {
235 case HIER_NONE:
236 c->hierarchy = HIERARCHY_NONE;
237 break;
238 case HIER_ALPHA_1:
239 c->hierarchy = HIERARCHY_1;
240 break;
241 case HIER_ALPHA_2:
242 c->hierarchy = HIERARCHY_2;
243 break;
244 case HIER_ALPHA_4:
245 c->hierarchy = HIERARCHY_4;
246 break;
247 }
248
249 /* extract code rate HP */
250 switch (tps.code_rate_HP) {
251 case CODE_RATE_1_2:
252 c->code_rate_HP = FEC_1_2;
253 break;
254 case CODE_RATE_2_3:
255 c->code_rate_HP = FEC_2_3;
256 break;
257 case CODE_RATE_3_4:
258 c->code_rate_HP = FEC_3_4;
259 break;
260 case CODE_RATE_5_6:
261 c->code_rate_HP = FEC_5_6;
262 break;
263 case CODE_RATE_7_8:
264 c->code_rate_HP = FEC_7_8;
265 break;
266 }
267
268 /* extract code rate LP */
269 switch (tps.code_rate_LP) {
270 case CODE_RATE_1_2:
271 c->code_rate_LP = FEC_1_2;
272 break;
273 case CODE_RATE_2_3:
274 c->code_rate_LP = FEC_2_3;
275 break;
276 case CODE_RATE_3_4:
277 c->code_rate_LP = FEC_3_4;
278 break;
279 case CODE_RATE_5_6:
280 c->code_rate_LP = FEC_5_6;
281 break;
282 case CODE_RATE_7_8:
283 c->code_rate_LP = FEC_7_8;
284 break;
285 }
286
287 /* extract guard interval */
288 switch (tps.guard_interval) {
289 case GUARD_INT_1_32:
290 c->guard_interval = GUARD_INTERVAL_1_32;
291 break;
292 case GUARD_INT_1_16:
293 c->guard_interval = GUARD_INTERVAL_1_16;
294 break;
295 case GUARD_INT_1_8:
296 c->guard_interval = GUARD_INTERVAL_1_8;
297 break;
298 case GUARD_INT_1_4:
299 c->guard_interval = GUARD_INTERVAL_1_4;
300 break;
301 }
302
303 /* extract transmission mode */
304 switch (tps.transmission_mode) {
305 case TRANS_MODE_2K:
306 c->transmission_mode = TRANSMISSION_MODE_2K;
307 break;
308 case TRANS_MODE_8K:
309 c->transmission_mode = TRANSMISSION_MODE_8K;
310 break;
311 }
312
313 return 0;
319} 314}
320 315
321static int as102_fe_get_tune_settings(struct dvb_frontend *fe, 316static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-22 20:40:53 -0400