Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39cf1e81 authored by Jan Frey's avatar Jan Frey Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5786): Ir-kbd-i2c: add support for Hauppauge HVR1300 remote 



- add support for the I2C based IR transceiver of the Hauppauge HVR-1300
- remove bad code from cx88-input.c

Signed-off-by: default avatarJan Frey <jfrey@gmx.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 434b2526

drivers/media/video/cx88/cx88-input.c

+0 −2
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) 
	case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:

	case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:

	case CX88_BOARD_HAUPPAUGE_HVR1100:

	case CX88_BOARD_HAUPPAUGE_HVR1300:

	case CX88_BOARD_HAUPPAUGE_HVR3000:

		ir_codes = ir_codes_hauppauge_new;

		ir_type = IR_TYPE_RC5;
@@ -438,7 +437,6 @@ void cx88_ir_irq(struct cx88_core *core) 
	case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:

	case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:

	case CX88_BOARD_HAUPPAUGE_HVR1100:

	case CX88_BOARD_HAUPPAUGE_HVR1300:

	case CX88_BOARD_HAUPPAUGE_HVR3000:

		ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);

		ir_dprintk("biphase decoded: %x\n", ircode);

drivers/media/video/ir-kbd-i2c.c

+39 −11
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/errno.h>

#include <linux/slab.h>

#include <linux/i2c.h>

#include <linux/i2c-id.h>

#include <linux/workqueue.h>

#include <asm/semaphore.h>
@@ -60,21 +61,22 @@ MODULE_PARM_DESC(hauppauge, "Specify Hauppauge remote: 0=black, 1=grey (defaults 


/* ----------------------------------------------------------------------- */



static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)

static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw,

			       int size, int offset)

{

	unsigned char buf[3];

	unsigned char buf[6];

	int start, range, toggle, dev, code;



	/* poll IR chip */

	if (3 != i2c_master_recv(&ir->c,buf,3))

	if (size != i2c_master_recv(&ir->c,buf,size))

		return -EIO;



	/* split rc5 data block ... */

	start  = (buf[0] >> 7) &    1;

	range  = (buf[0] >> 6) &    1;

	toggle = (buf[0] >> 5) &    1;

	dev    =  buf[0]       & 0x1f;

	code   = (buf[1] >> 2) & 0x3f;

	start  = (buf[offset] >> 7) &    1;

	range  = (buf[offset] >> 6) &    1;

	toggle = (buf[offset] >> 5) &    1;

	dev    =  buf[offset]       & 0x1f;

	code   = (buf[offset+1] >> 2) & 0x3f;



	/* rc5 has two start bits

	 * the first bit must be one
@@ -96,6 +98,16 @@ static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) 
	return 1;

}



static inline int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)

{

	return get_key_haup_common (ir, ir_key, ir_raw, 3, 0);

}



static inline int get_key_haup_xvr(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)

{

	return get_key_haup_common (ir, ir_key, ir_raw, 6, 3);

}



static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)

{

	unsigned char b;
@@ -355,9 +367,21 @@ static int ir_attach(struct i2c_adapter *adap, int addr, 
	case 0x7a:

	case 0x47:

	case 0x71:

		if (adap->id == I2C_HW_B_CX2388x) {

			/* Handled by cx88-input */

			name        = "CX2388x remote";

			ir_type     = IR_TYPE_RC5;

			ir->get_key = get_key_haup_xvr;

			if (hauppauge == 1) {

				ir_codes    = ir_codes_hauppauge_new;

			} else {

				ir_codes    = ir_codes_rc5_tv;

			}

		} else {

			/* Handled by saa7134-input */

			name        = "SAA713x remote";

			ir_type     = IR_TYPE_OTHER;

		}

		break;

	default:

		/* shouldn't happen */
@@ -451,6 +475,7 @@ static int ir_probe(struct i2c_adapter *adap) 
	static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};

	static const int probe_saa7134[] = { 0x7a, 0x47, 0x71, -1 };

	static const int probe_em28XX[] = { 0x30, 0x47, -1 };

	static const int probe_cx88[] = { 0x18, 0x71, -1 };

	const int *probe = NULL;

	struct i2c_client c;

	unsigned char buf;
@@ -469,6 +494,9 @@ static int ir_probe(struct i2c_adapter *adap) 
	case I2C_HW_B_EM28XX:

		probe = probe_em28XX;

		break;

	case I2C_HW_B_CX2388x:

		probe = probe_cx88;

		break;

	}

	if (NULL == probe)

		return 0;