Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 301321 | Differences between
and this patch

Collapse All | Expand All

(-)drivers/lirc_i2c/lirc_i2c.c (-16 / +18 lines)
Lines 399-406 Link Here
399
		.name	= "i2c ir driver",
399
		.name	= "i2c ir driver",
400
	},
400
	},
401
#endif
401
#endif
402
	.id		= I2C_DRIVERID_EXP3, /* FIXME */
403
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
402
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
403
	.id		= I2C_DRIVERID_EXP3, /* FIXME */
404
	.attach_adapter	= ir_probe,
404
	.attach_adapter	= ir_probe,
405
	.detach_client	= ir_remove,
405
	.detach_client	= ir_remove,
406
#else
406
#else
Lines 492-511 Link Here
492
		ir->l.add_to_buf = add_to_buf_pv951;
492
		ir->l.add_to_buf = add_to_buf_pv951;
493
		break;
493
		break;
494
	case 0x71:
494
	case 0x71:
495
#ifdef I2C_HW_B_CX2341X
495
496
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
496
497
		    adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X)) {
497
498
#else
498
#ifdef I2C_HW_B_CX2388x
499
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) {
499
		/* Leadtek Winfast PVR2000 or Hauppauge HVR-1300 */
500
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2388x))
501
			strlcpy(ir->c.name, "Hauppauge HVR1300", I2C_NAME_SIZE);
502
		else
500
#endif
503
#endif
504
		{
501
			/*
505
			/*
502
			 * The PVR150 IR receiver uses the same protocol as
506
			 * The PVR150 IR receiver uses the same protocol as
503
			 * other Hauppauge cards, but the data flow is
507
			 * other Hauppauge cards, but the data flow is
504
			 * different, so we need to deal with it by its own.
508
			 * different, so we need to deal with it by its own.
505
			 */
509
			 */
506
			strlcpy(ir->c.name, "Hauppauge PVR150", I2C_NAME_SIZE);
510
			strlcpy(ir->c.name, "Hauppauge PVR150", I2C_NAME_SIZE);
507
		} else /* I2C_HW_B_CX2388x */
511
		}
508
			strlcpy(ir->c.name, "Hauppauge HVR1300", I2C_NAME_SIZE);
509
		ir->l.code_length = 13;
512
		ir->l.code_length = 13;
510
		ir->l.add_to_buf = add_to_buf_haup_pvr150;
513
		ir->l.add_to_buf = add_to_buf_haup_pvr150;
511
		break;
514
		break;
Lines 516-534 Link Here
516
		break;
519
		break;
517
	case 0x18:
520
	case 0x18:
518
	case 0x1a:
521
	case 0x1a:
519
#ifdef I2C_HW_B_CX2341X
522
#ifdef I2C_HW_B_CX2388x
520
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
523
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2388x)) {
521
		    adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X)) {
524
			strlcpy(ir->c.name, "Leadtek IR", I2C_NAME_SIZE);
525
			ir->l.code_length = 8;
526
			ir->l.add_to_buf = add_to_buf_pvr2000;
527
		} else {
522
#else
528
#else
523
		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) {
529
		{
524
#endif
530
#endif
525
			strlcpy(ir->c.name, "Hauppauge IR", I2C_NAME_SIZE);
531
			strlcpy(ir->c.name, "Hauppauge IR", I2C_NAME_SIZE);
526
			ir->l.code_length = 13;
532
			ir->l.code_length = 13;
527
			ir->l.add_to_buf = add_to_buf_haup;
533
			ir->l.add_to_buf = add_to_buf_haup;
528
		} else { /* I2C_HW_B_CX2388x */
529
			strlcpy(ir->c.name, "Leadtek IR", I2C_NAME_SIZE);
530
			ir->l.code_length = 8;
531
			ir->l.add_to_buf = add_to_buf_pvr2000;
532
		}
534
		}
533
		break;
535
		break;
534
	case 0x30:
536
	case 0x30:

Return to bug 301321