From e0dbd2193568ddc86f1c000dc6560fb7c309b0ef Mon Sep 17 00:00:00 2001 From: Andrew de Quincy Date: Fri, 9 Apr 2004 15:27:18 +0000 Subject: Remove FR IRQ - The driver no longer uses it, and my Cryptoworks CAM really objects to it being enabled. --- linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'linux/drivers/media') diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 55f8cf17a..71e6bf817 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c @@ -64,7 +64,7 @@ static int dvb_ca_en50221_debug = 0; #define CMDREG_RS 8 /* Reset interface */ #define CMDREG_FRIE 0x40 /* Enable FR interrupt */ #define CMDREG_DAIE 0x80 /* Enable DA interrupt */ -#define IRQEN (CMDREG_FRIE|CMDREG_DAIE) +#define IRQEN (CMDREG_DAIE) #define STATUSREG_RE 1 /* read error */ #define STATUSREG_WE 2 /* write error */ @@ -101,9 +101,6 @@ struct dvb_ca_slot { /* value to write into Config Control register */ u8 config_option; - /* if 1, the CAM supports FR IRQs */ - u8 fr_irq_supported:1; - /* if 1, the CAM supports DA IRQs */ u8 da_irq_supported:1; @@ -307,7 +304,6 @@ static int dvb_ca_en50221_link_init(struct dvb_ca_private* ca, int slot) dprintk ("%s\n", __FUNCTION__); /* we'll be determining these during this function */ - ca->slot_info[slot].fr_irq_supported = 0; ca->slot_info[slot].da_irq_supported = 0; /* reset the link interface. Note CAM IRQs are disabled */ @@ -474,10 +470,6 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private* ca, int slot) /* get the config option */ ca->slot_info[slot].config_option = tuple[0] & 0x3f; - /* does it contain an interrupt descriptor structure? */ - i = 1; - if (tuple[0] & 0x80) i++; - /* OK, check it contains the correct strings */ if ((findstr(tuple, tupleLength, "DVB_HOST", 8) == NULL) || (findstr(tuple, tupleLength, "DVB_CI_MODULE", 13) == NULL)) break; @@ -826,12 +818,7 @@ void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221* pubca, int slot) if (flags & STATUSREG_DA) { dprintk("CAM supports DA IRQ\n"); ca->slot_info[slot].da_irq_supported = 1; - } else if (flags & STATUSREG_FR) { - // this is an else because some modules leave the FR bit - // set as well as DA during the link init sequence - dprintk("CAM supports FR IRQ\n"); - ca->slot_info[slot].fr_irq_supported = 1; - } + } break; case DVB_CA_SLOTSTATE_RUNNING: @@ -839,10 +826,6 @@ void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221* pubca, int slot) if (flags & STATUSREG_DA) { dvb_ca_en50221_thread_wakeup(ca); } - if (flags & STATUSREG_FR) { - // FIXME: is this right? - wake_up_interruptible(&ca->wait_queue); - } break; } } -- cgit v1.2.3