Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] xc4000: simplified seek_firmware()

Browse source 
This patch simplifies the code in seek_firmware().

Signed-off-by: Istvan Varga <istvan_v@mailbox.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Istvan Varga 2011-06-04 11:52:34 -03:00 committed by Mauro Carvalho Chehab
parent fa285bc1bf
commit 3db9570482
1 changed files with 25 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/media/common/tuners/xc4000.c
View file

@ -605,8 +605,8 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
v4l2_std_id *id) v4l2_std_id *id)
{ {
struct xc4000_priv *priv = fe->tuner_priv; struct xc4000_priv *priv = fe->tuner_priv;
int i, best_i = -1, best_nr_matches = 0; int i, best_i = -1;
unsigned int type_mask = 0; unsigned int best_nr_diffs = 255U;
if (!priv->firm) { if (!priv->firm) {
printk("Error! firmware not loaded\n"); printk("Error! firmware not loaded\n");
@ -616,62 +616,41 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
if (((type & ~SCODE) == 0) && (*id == 0)) if (((type & ~SCODE) == 0) && (*id == 0))
*id = V4L2_STD_PAL; *id = V4L2_STD_PAL;
if (type & BASE)
type_mask = BASE_TYPES;
else if (type & SCODE) {
type &= SCODE_TYPES;
type_mask = SCODE_TYPES & ~HAS_IF;
} else if (type & DTV_TYPES)
type_mask = DTV_TYPES;
else if (type & STD_SPECIFIC_TYPES)
type_mask = STD_SPECIFIC_TYPES;
type &= type_mask;
if (!(type & SCODE))
type_mask = ~0;
/* Seek for exact match */
for (i = 0; i < priv->firm_size; i++) {
if ((type == (priv->firm[i].type & type_mask)) &&
(*id == priv->firm[i].id))
goto found;
}
/* Seek for generic video standard match */ /* Seek for generic video standard match */
for (i = 0; i < priv->firm_size; i++) { for (i = 0; i < priv->firm_size; i++) {
v4l2_std_id match_mask; v4l2_std_id id_diff_mask =
int nr_matches; (priv->firm[i].id ^ (*id)) & (*id);
unsigned int type_diff_mask =
(priv->firm[i].type ^ type)
& (BASE_TYPES | DTV_TYPES | LCD | NOGD | MONO | SCODE);
unsigned int nr_diffs;
if (type != (priv->firm[i].type & type_mask)) if (type_diff_mask
& (BASE | INIT1 | FM | DTV6 | DTV7 | DTV78 | DTV8 | SCODE))
continue; continue;
match_mask = *id & priv->firm[i].id; nr_diffs = hweight64(id_diff_mask) + hweight32(type_diff_mask);
if (!match_mask) if (!nr_diffs) /* Supports all the requested standards */
continue; goto found;
if ((*id & match_mask) == *id) if (nr_diffs < best_nr_diffs) {
goto found; /* Supports all the requested standards */ best_nr_diffs = nr_diffs;
nr_matches = hweight64(match_mask);
if (nr_matches > best_nr_matches) {
best_nr_matches = nr_matches;
best_i = i; best_i = i;
} }
} }
if (best_nr_matches > 0) { /* FIXME: Would make sense to seek for type "hint" match ? */
printk("Selecting best matching firmware (%d bits) for " if (best_i < 0) {
"type=", best_nr_matches); i = -ENOENT;
printk("(%x), id %016llx:\n", type, (unsigned long long)*id); goto ret;
i = best_i;
goto found;
} }
/*FIXME: Would make sense to seek for type "hint" match ? */ if (best_nr_diffs > 0U) {
printk("Selecting best matching firmware (%u bits differ) for "
i = -ENOENT; "type=", best_nr_diffs);
goto ret; printk("(%x), id %016llx:\n", type, (unsigned long long)*id);
i = best_i;
}
found: found:
*id = priv->firm[i].id; *id = priv->firm[i].id;