diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-11-17 13:44:43 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-11-17 13:44:43 +0000 |
| commit | 7cb31631dc0db1b8a3381cb4e3a6544f32396aff (patch) | |
| tree | f480280c8a75731266daee5c1b2112375f55d9fa /linux/drivers/media/dvb/ttusb-dec | |
| parent | 688a80606f162b07f7806e0b065da6bea044520e (diff) | |
| download | mediapointer-dvb-s2-7cb31631dc0db1b8a3381cb4e3a6544f32396aff.tar.gz mediapointer-dvb-s2-7cb31631dc0db1b8a3381cb4e3a6544f32396aff.tar.bz2 | |
patch by Adrian Bunk:
DVB_TTUSB_DEC selects CRC32, do the #ifdefs can be removed.
Diffstat (limited to 'linux/drivers/media/dvb/ttusb-dec')
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 737ecbc16..c3e403007 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -30,11 +30,7 @@ #include <linux/version.h> #include <linux/interrupt.h> #include <linux/firmware.h> -#if defined(CONFIG_CRC32) || defined(CONFIG_CRC32_MODULE) #include <linux/crc32.h> -#else -#warning "CRC checking of firmware not available" -#endif #include <linux/init.h> #include "dmxdev.h" @@ -1138,9 +1134,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) u16 firmware_csum = 0; u16 firmware_csum_ns; u32 firmware_size_nl; -#if defined(CONFIG_CRC32) || defined(CONFIG_CRC32_MODULE) u32 crc32_csum, crc32_check, tmp; -#endif const struct firmware *fw_entry = NULL; dprintk("%s\n", __FUNCTION__); @@ -1163,7 +1157,6 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) /* a 32 bit checksum over the first 56 bytes of the DSP Code is stored at offset 56 of file, so use it to check if the firmware file is valid. */ -#if defined(CONFIG_CRC32) || defined(CONFIG_CRC32_MODULE) crc32_csum = crc32(~0L, firmware, 56) ^ ~0L; memcpy(&tmp, &firmware[56], 4); crc32_check = htonl(tmp); @@ -1173,7 +1166,6 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) __FUNCTION__, crc32_csum, crc32_check); return -1; } -#endif memcpy(idstring, &firmware[36], 20); idstring[20] = '\0'; printk(KERN_INFO "ttusb_dec: found DSP code \"%s\".\n", idstring); |