diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-06-15 18:27:35 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:22:07 -0400 |
| commit | fbd05c8213e7cddca3041c280e5fca5eff0956f9 (patch) | |
| tree | ddb5a954f62f942c6954b3a10da48999fb0b53f1 /drivers/media/dvb/siano | |
| parent | e080842c6c31249010adb184f9efbbc5cb40bd2b (diff) | |
V4L/DVB (8288): sms1xxx: more cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/siano')
| -rw-r--r-- | drivers/media/dvb/siano/smscoreapi.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c index 423ca5744952..89fb5a73fc6f 100644 --- a/drivers/media/dvb/siano/smscoreapi.c +++ b/drivers/media/dvb/siano/smscoreapi.c | |||
| @@ -734,15 +734,23 @@ int smscore_detect_mode(struct smscore_device_t *coredev) | |||
| 734 | } | 734 | } |
| 735 | 735 | ||
| 736 | char *smscore_fw_lkup[][SMS_NUM_OF_DEVICE_TYPES] = { | 736 | char *smscore_fw_lkup[][SMS_NUM_OF_DEVICE_TYPES] = { |
| 737 | /*Stellar NOVA A0 Nova B0 VEGA*/ | 737 | /*Stellar NOVA A0 Nova B0 VEGA*/ |
| 738 | /*DVBT*/ {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"}, | 738 | /*DVBT*/ |
| 739 | /*DVBH*/ {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"}, | 739 | {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"}, |
| 740 | /*TDMB*/ {"none", "tdmb_nova_12mhz.inp", "none", "none"}, | 740 | /*DVBH*/ |
| 741 | /*DABIP*/ {"none", "none", "none", "none"}, | 741 | {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"}, |
| 742 | /*BDA*/ {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"}, | 742 | /*TDMB*/ |
| 743 | /*ISDBT*/ {"none", "isdbt_nova_12mhz.inp", "dvb_nova_12mhz.inp", "none"}, | 743 | {"none", "tdmb_nova_12mhz.inp", "none", "none"}, |
| 744 | /*ISDBTBDA*/{"none", "isdbt_nova_12mhz.inp", "isdbt_nova_12mhz_b0.inp", "none"}, | 744 | /*DABIP*/ |
| 745 | /*CMMB*/ {"none", "none", "none", "cmmb_vega_12mhz.inp"} | 745 | {"none", "none", "none", "none"}, |
| 746 | /*BDA*/ | ||
| 747 | {"none", "dvb_nova_12mhz.inp", "dvb_nova_12mhz_b0.inp", "none"}, | ||
| 748 | /*ISDBT*/ | ||
| 749 | {"none", "isdbt_nova_12mhz.inp", "dvb_nova_12mhz.inp", "none"}, | ||
| 750 | /*ISDBTBDA*/ | ||
| 751 | {"none", "isdbt_nova_12mhz.inp", "isdbt_nova_12mhz_b0.inp", "none"}, | ||
| 752 | /*CMMB*/ | ||
| 753 | {"none", "none", "none", "cmmb_vega_12mhz.inp"} | ||
| 746 | }; | 754 | }; |
| 747 | 755 | ||
| 748 | 756 | ||
| @@ -919,8 +927,8 @@ void smscore_onresponse(struct smscore_device_t *coredev, | |||
| 919 | smscore_find_client(coredev, phdr->msgType, phdr->msgDstId); | 927 | smscore_find_client(coredev, phdr->msgType, phdr->msgDstId); |
| 920 | int rc = -EBUSY; | 928 | int rc = -EBUSY; |
| 921 | 929 | ||
| 922 | static unsigned long last_sample_time = 0; | 930 | static unsigned long last_sample_time; /* = 0; */ |
| 923 | static int data_total = 0; | 931 | static int data_total; /* = 0; */ |
| 924 | unsigned long time_now = jiffies_to_msecs(jiffies); | 932 | unsigned long time_now = jiffies_to_msecs(jiffies); |
| 925 | 933 | ||
| 926 | if (!last_sample_time) | 934 | if (!last_sample_time) |