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

Commit d5e52653 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: 784: several improvement on i2c ir handling for em2820 



- Several Improvement on I2C IR handling for em2820:
        - moved Pinnacle IR table (ir_codes_em2820) to em2820-input.c
        - IR struct renamed and moved to a header file.
        - New file to handle em2820-specific IR.
        - Some cleanups.
        - attach now detects I2C IR and calls em2820-specific IR code
        - IR compat code moved to compat.h
        - New header with struct IR_i2c there, to allow it to be
          used by board-specific input handlers.

- Some improvements at em28xx board detection:
        - Board detection message improved to show interface and class.
        - Now it doesn't touch audio interfaces.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent da45a2a5

drivers/media/video/em28xx/em28xx-cards.c

+2 −1
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ void em2820_card_setup(struct em2820 *dev) 
		struct tveeprom tv;

#ifdef CONFIG_MODULES

		request_module("tveeprom");

		request_module("ir-kbd-i2c");

#endif

		/* Call first TVeeprom */

drivers/media/video/em28xx/em28xx-i2c.c

+24 −19
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
#include <linux/kernel.h>

#include <linux/usb.h>

#include <linux/i2c.h>

#include <media/tuner.h>

#include <linux/video_decoder.h>



#include "em2820.h"

#include <media/tuner.h>



/* ----------------------------------------------------------- */
@@ -41,14 +41,11 @@ static unsigned int i2c_debug = 0; 
module_param(i2c_debug, int, 0644);

MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");



#define dprintk(fmt, args...) if (i2c_debug) do {\

			printk(KERN_DEBUG "%s: %s: " fmt "\n",\

			dev->name, __FUNCTION__ , ##args); } while (0)

#define dprintk1(fmt, args...) if (i2c_debug) do{ \

			printk(KERN_DEBUG "%s: %s: " fmt, \

			dev->name, __FUNCTION__ , ##args); } while (0)

#define dprintk2(fmt, args...) if (i2c_debug) do {\

#define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\

			printk(fmt , ##args); } while (0)

#define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \

			printk(KERN_DEBUG "%s at %s: " fmt, \

			dev->name, __FUNCTION__ , ##args); } while (0)



/*

 * em2800_i2c_send_max4()
@@ -238,7 +235,7 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap, 
		return 0;

	for (i = 0; i < num; i++) {

		addr = msgs[i].addr << 1;

		dprintk1("%s %s addr=%x len=%d:",

		dprintk2(2,"%s %s addr=%x len=%d:",

			 (msgs[i].flags & I2C_M_RD) ? "read" : "write",

			 i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len);

		if (!msgs[i].len) {	/* no len: check only for device presence */
@@ -247,7 +244,7 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap, 
			else

				rc = em2820_i2c_check_for_device(dev, addr);

			if (rc < 0) {

				dprintk2(" no device\n");

				dprintk2(2," no device\n");

				return rc;

			}
@@ -261,14 +258,14 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap, 
				rc = em2820_i2c_recv_bytes(dev, addr,

							   msgs[i].buf,

							   msgs[i].len);

			if (i2c_debug) {

			if (i2c_debug>=2) {

				for (byte = 0; byte < msgs[i].len; byte++) {

					printk(" %02x", msgs[i].buf[byte]);

				}

			}

		} else {

			/* write bytes */

			if (i2c_debug) {

			if (i2c_debug>=2) {

				for (byte = 0; byte < msgs[i].len; byte++)

					printk(" %02x", msgs[i].buf[byte]);

			}
@@ -284,13 +281,13 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap, 
			if (rc < 0)

				goto err;

		}

		if (i2c_debug)

		if (i2c_debug>=2)

			printk("\n");

	}



	return num;

      err:

	dprintk2(" ERROR: %i\n", rc);

	dprintk2(2," ERROR: %i\n", rc);

	return rc;

}
@@ -436,26 +433,34 @@ static int attach_inform(struct i2c_client *client) 
{

	struct em2820 *dev = client->adapter->algo_data;



	dprintk("address %x", client->addr << 1);

	switch (client->addr << 1) {

		case 0x86:

			em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);

			break;

		case 0x4a:

			dprintk1("attach_inform: saa7113 detected.\n");

			dprintk1(1,"attach_inform: saa7113 detected.\n");

			break;

		case 0xa0:

			dprintk1("attach_inform: eeprom detected.\n");

			dprintk1(1,"attach_inform: eeprom detected.\n");

			break;

		case 0x60:

		case 0x8e:

		{

			struct IR_i2c *ir = i2c_get_clientdata(client);

			dprintk1(1,"attach_inform: IR detected (%s).\n",ir->phys);

			em2820_set_ir(dev,ir);

			break;

		}

		case 0x80:

		case 0x88:

			dprintk1("attach_inform: msp34xx detected.\n");

			dprintk1(1,"attach_inform: msp34xx detected.\n");

			break;

		case 0xb8:

		case 0xba:

			dprintk1("attach_inform: tvp5150 detected.\n");

			dprintk1(1,"attach_inform: tvp5150 detected.\n");

			break;

		default:

			dprintk1(1,"attach inform: detected I2C address %x\n", client->addr << 1);

			dev->tuner_addr = client->addr;

			em2820_set_tuner(-1, client);

	}

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

0 → 100644
+150 −0
Original line number Diff line number Diff line 
/*

 *

 * handle saa7134 IR remotes via linux kernel input layer.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 *

 */



#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/input.h>

#include <linux/usb.h>



#include "em2820.h"



static unsigned int disable_ir = 0;

module_param(disable_ir, int, 0444);

MODULE_PARM_DESC(disable_ir,"disable infrared remote support");



static unsigned int ir_debug = 0;

module_param(ir_debug, int, 0644);

MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]");



#define dprintk(fmt, arg...)	if (ir_debug) \

	printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)



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



static IR_KEYTAB_TYPE ir_codes_em_pinnacle[IR_KEYTAB_SIZE] = {

	[  0 ] = KEY_CHANNEL,

	[  1 ] = KEY_SELECT,

	[  2 ] = KEY_MUTE,

	[  3 ] = KEY_POWER,

	[  4 ] = KEY_KP1,

	[  5 ] = KEY_KP2,

	[  6 ] = KEY_KP3,

	[  7 ] = KEY_CHANNELUP,

	[  8 ] = KEY_KP4,

	[  9 ] = KEY_KP5,

	[ 10 ] = KEY_KP6,



	[ 11 ] = KEY_CHANNELDOWN,

	[ 12 ] = KEY_KP7,

	[ 13 ] = KEY_KP8,

	[ 14 ] = KEY_KP9,

	[ 15 ] = KEY_VOLUMEUP,

	[ 16 ] = KEY_KP0,

	[ 17 ] = KEY_MENU,

	[ 18 ] = KEY_PRINT,



	[ 19 ] = KEY_VOLUMEDOWN,

	[ 21 ] = KEY_PAUSE,

	[ 23 ] = KEY_RECORD,

	[ 24 ] = KEY_REWIND,

	[ 25 ] = KEY_PLAY,

	[ 27 ] = KEY_BACKSPACE,

	[ 29 ] = KEY_STOP,

	[ 31 ] = KEY_ZOOM,

};



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



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

{

	unsigned char buf[2];

	unsigned char code;



	/* poll IR chip */

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

		return -EIO;



	/* Does eliminate repeated parity code */

	if (buf[1]==0xff)

		return 0;



	/* avoid fast reapeating */

	if (buf[1]==ir->old)

		return 0;

	ir->old=buf[1];



	/* Rearranges bits to the right order */

	code=    ((buf[0]&0x01)<<5) | /* 0010 0000 */

		 ((buf[0]&0x02)<<3) | /* 0001 0000 */

		 ((buf[0]&0x04)<<1) | /* 0000 1000 */

		 ((buf[0]&0x08)>>1) | /* 0000 0100 */

		 ((buf[0]&0x10)>>3) | /* 0000 0010 */

		 ((buf[0]&0x20)>>5);  /* 0000 0001 */



	dprintk("ir hauppauge (em2840): code=0x%02x (rcv=0x%02x)\n",code,buf[0]);



	/* return key */

	*ir_key = code;

	*ir_raw = code;

	return 1;

}



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

void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir)

{

	if (disable_ir)

		return ;



	/* detect & configure */

	switch (dev->model) {

	case (EM2800_BOARD_UNKNOWN):

		break;

	case (EM2820_BOARD_UNKNOWN):

		break;

	case (EM2820_BOARD_TERRATEC_CINERGY_250):

		break;

	case (EM2820_BOARD_PINNACLE_USB_2):

		ir->ir_codes = ir_codes_em_pinnacle;

		break;

	case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):

		ir->ir_codes = ir_codes_hauppauge_new;

		ir->get_key = get_key_em_haup;

		snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM2840 Hauppage)");

		break;

	case (EM2820_BOARD_MSI_VOX_USB_2):

		break;

	case (EM2800_BOARD_TERRATEC_CINERGY_200):

		break;

	case (EM2800_BOARD_LEADTEK_WINFAST_USBII):

		break;

	case (EM2800_BOARD_KWORLD_USB2800):

		break;

	}

}



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

 * Local variables:

 * c-basic-offset: 8

 * End:

 */

drivers/media/video/em28xx/em28xx-video.c

+11 −4
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include <linux/kernel.h>

#include <linux/usb.h>

#include <linux/i2c.h>

#include <media/tuner.h>

#include <linux/video_decoder.h>



#include "em2820.h"

#include <media/tuner.h>



#define DRIVER_AUTHOR "Markus Rechberger <mrechberger@gmail.com>, " \

			"Ludovico Cavedon <cavedon@sssup.it>, " \
@@ -1699,15 +1699,22 @@ static int em2820_usb_probe(struct usb_interface *interface, 
	struct usb_device *udev;

	struct em2820 *dev = NULL;

	int retval = -ENODEV;

	int model,i,nr;

	int model,i,nr,ifnum;



	udev = usb_get_dev(interface_to_usbdev(interface));

	endpoint = &interface->cur_altsetting->endpoint[1].desc;

	ifnum = interface->altsetting[0].desc.bInterfaceNumber;



	em2820_err(DRIVER_NAME " new device (%04x:%04x): interface %i, class %i\n",

			udev->descriptor.idVendor,udev->descriptor.idProduct,

			ifnum,

			interface->altsetting[0].desc.bInterfaceClass);



	/* Don't register audio interfaces */

	if (interface->altsetting[1].desc.bInterfaceClass == USB_CLASS_AUDIO)

	if (interface->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO)

		return -ENODEV;



	endpoint = &interface->cur_altsetting->endpoint[1].desc;



	/* check if the the device has the iso in endpoint at the correct place */

	if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=

	    USB_ENDPOINT_XFER_ISOC) {

drivers/media/video/em28xx/em28xx.h

+9 −11
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <linux/videodev.h>

#include <linux/i2c.h>

#include <media/ir-kbd-i2c.h>



/* Boards supported by driver */
@@ -53,19 +54,12 @@ 
/* number of buffers for isoc transfers */

#define EM2820_NUM_BUFS 5



/* number of packets for each buffer */

// windows requests only 40 packets .. so we better do the same

// this is what I found out for all alternate numbers there!



/* number of packets for each buffer

   windows requests only 40 packets .. so we better do the same

   this is what I found out for all alternate numbers there!

 */

#define EM2820_NUM_PACKETS 40



/* packet size for each packet */

/* no longer needed: read from endpoint descriptor */

//#define EM2820_MAX_PACKET_SIZE 3072 //7

//#define EM2820_MAX_PACKET_SIZE 2892 //6

//#define EM2820_MAX_PACKET_SIZE 2580 //5

//#define EM2820_MAX_PACKET_SIZE 1448 //2



/* default alternate; 0 means choose the best */

#define EM2820_PINOUT 0

#define EM2820_MAX_ALT 7
@@ -292,6 +286,10 @@ void em2820_i2c_call_clients(struct em2820 *dev, unsigned int cmd, void *arg); 
int em2820_i2c_register(struct em2820 *dev);

int em2820_i2c_unregister(struct em2820 *dev);



/* Provided by em2820-input.c */



void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir);



/* Provided by em2820-core.c */



void em2820_print_ioctl(char *name, unsigned int cmd);