mantis infrared remote patch (Cinergy C)

diff -r cd1fc4c7f1d8 linux/drivers/media/dvb/mantis/mantis_common.h
@@ -26,6 +26,8 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/mutex.h>
+#include <linux/input.h>
+#include <media/ir-common.h>
 
 #include "dvbdev.h"
 #include "dvb_demux.h"

@@ -74,6 +76,21 @@ struct mantis_hwconfig {
 	char			*model_name;
 	char			*dev_type;
 	u32			ts_size;
+	IR_KEYTAB_TYPE		*ir_codes;
+};
+
+struct mantis_ir {
+	struct input_dev	*rc_dev;
+	char			rc_name[80];
+	char			rc_phys[80];
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+	struct work_struct	rc_query_work;
+#else
+	struct delayed_work	rc_query_work;
+#endif
+	u32			ir_last_code;
+	u32			ir_last_irq;
+	struct ir_input_state	ir;
 };
 
 struct mantis_pci {

@@ -139,6 +156,9 @@ struct mantis_pci {
 	 /*	A12 A13 A14		*/
 	int			gpio_status;
 
+        /*       RC                     */
+	struct mantis_ir	ir;
+
 	struct mantis_ca	*mantis_ca;
 };
 

diff -r cd1fc4c7f1d8 linux/drivers/media/dvb/mantis/mantis_core.c
@@ -164,6 +164,10 @@ int mantis_core_init(struct mantis_pci *
 		dprintk(verbose, MANTIS_DEBUG, 1, "Mantis DVB init failed");
 		return err;
 	}
+	if ((err = mantis_rc_init(mantis)) < 0) {
+		dprintk(verbose, MANTIS_DEBUG, 1, "mantis RC init failed");
+		return err;
+	}
 
 	return 0;
 }

diff -r cd1fc4c7f1d8 linux/drivers/media/dvb/mantis/mantis_core.h
@@ -53,6 +53,8 @@ extern int mantis_i2c_exit(struct mantis
 extern int mantis_i2c_exit(struct mantis_pci *mantis);
 extern int mantis_core_init(struct mantis_pci *mantis);
 extern int mantis_core_exit(struct mantis_pci *mantis);
+extern int mantis_rc_init(struct mantis_pci *mantis);
+extern int mantis_rc_exit(struct mantis_pci *mantis);
 //extern void mantis_fe_powerup(struct mantis_pci *mantis);
 //extern void mantis_fe_powerdown(struct mantis_pci *mantis);
 //extern void mantis_fe_reset(struct dvb_frontend *fe);

diff -r cd1fc4c7f1d8 linux/drivers/media/dvb/mantis/mantis_pci.c
@@ -65,6 +65,7 @@ static irqreturn_t mantis_pci_irq(int ir
 
 	stat = mmread(MANTIS_INT_STAT);
 	mask = mmread(MANTIS_INT_MASK);
+
 	mstat = lstat = stat & ~MANTIS_INT_RISCSTAT;
 	if (!(stat & mask))
 		return IRQ_NONE;

@@ -72,6 +73,7 @@ static irqreturn_t mantis_pci_irq(int ir
 	mantis->mantis_int_stat = stat;
 	mantis->mantis_int_mask = mask;
 	dprintk(verbose, MANTIS_DEBUG, 0, "=== Interrupts[%04x/%04x]= [", stat, mask);
+
 	if (stat & MANTIS_INT_RISCEN) {
 		dprintk(verbose, MANTIS_DEBUG, 0, "* DMA enabl *");
 	}

@@ -81,6 +83,11 @@ static irqreturn_t mantis_pci_irq(int ir
 	}
 	if (stat & MANTIS_INT_IRQ1) {
 		dprintk(verbose, MANTIS_DEBUG, 0, "* INT IRQ-1 *");
+		dprintk(verbose, MANTIS_DEBUG, 0, "ir repeat msec %u", jiffies_to_msecs(jiffies - mantis->ir.ir_last_irq));
+		mantis->ir.ir_last_irq = jiffies;
+		/* note value must be read here or we'll get irq storm */
+		mantis->ir.ir_last_code = mmread(0xe8);
+		schedule_delayed_work(&mantis->ir.rc_query_work, 0);
 	}
 	if (stat & MANTIS_INT_OCERR) {
 		dprintk(verbose, MANTIS_DEBUG, 0, "* INT OCERR *");

@@ -243,6 +250,7 @@ static void __devexit mantis_pci_remove(
 		dprintk(verbose, MANTIS_ERROR, 1, "Aeio, Mantis NULL ptr");
 		return;
 	}
+	mantis_rc_exit(mantis);
 	mantis_core_exit(mantis);
 	dprintk(verbose, MANTIS_ERROR, 1, "Removing -->Mantis irq: %d, latency: %d\n memory: 0x%lx, mmio: 0x%p",
 		pdev->irq, mantis->latency, mantis->mantis_addr,

diff -r cd1fc4c7f1d8 linux/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -20,6 +20,7 @@
 
 #include "mantis_common.h"
 #include "mantis_vp2033.h"
+#include "mantis_rc.h"
 
 #define MANTIS_MODEL_NAME	"VP-2033"
 #define MANTIS_DEV_TYPE		"DVB-C"

@@ -28,6 +29,7 @@ struct mantis_hwconfig vp2033_mantis_con
 	.model_name	= MANTIS_MODEL_NAME,
 	.dev_type	= MANTIS_DEV_TYPE,
 	.ts_size	= MANTIS_TS_204,
+	.ir_codes       = ir_codes_mantis_vp2033,
 };
 
 struct tda1002x_config philips_cu1216_config = {

diff -r cd1fc4c7f1d8 linux/drivers/media/dvb/mantis/mantis_vp2040.c
@@ -20,6 +20,7 @@
 
 #include "mantis_common.h"
 #include "mantis_vp2040.h"
+#include "mantis_rc.h"
 
 #define MANTIS_MODEL_NAME	"VP-2040"
 #define MANTIS_DEV_TYPE		"DVB-C"

@@ -28,6 +29,7 @@ struct mantis_hwconfig vp2040_mantis_con
 	.model_name	= MANTIS_MODEL_NAME,
 	.dev_type	= MANTIS_DEV_TYPE,
 	.ts_size	= MANTIS_TS_204,
+	.ir_codes	= ir_codes_mantis_vp2040,
 };
 
 struct tda1002x_config tda10023_cu1216_config = {

204 lines not on this page · raw message

diff -r cd1fc4c7f1d8 linux/drivers/media/dvb/mantis/mantis_rc.h
@@ -0,0 +1,2 @@
+extern IR_KEYTAB_TYPE ir_codes_mantis_vp2033[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_mantis_vp2040[IR_KEYTAB_SIZE];