lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
- 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: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Mauro Carvalho Chehab
2005-11-08 21:37:32 -08:00
committed by Linus Torvalds
parent da45a2a5b9
commit d5e5265315
8 changed files with 305 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/em28xx/em28xx-cards.c
View File

@@ -143,7 +143,7 @@ struct em2820_board em2820_boards[] = {
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE, .tda9887_conf = TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,
.has_tuner = 1, .has_tuner = 1,
.decoder = EM2820_SAA7114, .decoder = EM2820_SAA7114,
.input = {{ .input = {{
.type = EM2820_VMUX_TELEVISION, .type = EM2820_VMUX_TELEVISION,
.vmux = 2, .vmux = 2,
@@ -250,6 +250,7 @@ void em2820_card_setup(struct em2820 *dev)
struct tveeprom tv; struct tveeprom tv;
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
request_module("tveeprom"); request_module("tveeprom");
request_module("ir-kbd-i2c");
#endif #endif
/* Call first TVeeprom */ /* Call first TVeeprom */

43
drivers/media/video/em28xx/em28xx-i2c.c
View File

@@ -26,10 +26,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <media/tuner.h>
#include <linux/video_decoder.h> #include <linux/video_decoder.h>
#include "em2820.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_param(i2c_debug, int, 0644);
MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
#define dprintk(fmt, args...) if (i2c_debug) do {\ #define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) 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 {\
printk(fmt , ##args); } while (0) 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() * em2800_i2c_send_max4()
@@ -238,7 +235,7 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap,
return 0; return 0;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
addr = msgs[i].addr << 1; 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", (msgs[i].flags & I2C_M_RD) ? "read" : "write",
i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len); i == num - 1 ? "stop" : "nonstop", addr, msgs[i].len);
if (!msgs[i].len) { /* no len: check only for device presence */ 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 else
rc = em2820_i2c_check_for_device(dev, addr); rc = em2820_i2c_check_for_device(dev, addr);
if (rc < 0) { if (rc < 0) {
dprintk2(" no device\n"); dprintk2(2," no device\n");
return rc; return rc;
} }
@@ -261,14 +258,14 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap,
rc = em2820_i2c_recv_bytes(dev, addr, rc = em2820_i2c_recv_bytes(dev, addr,
msgs[i].buf, msgs[i].buf,
msgs[i].len); msgs[i].len);
if (i2c_debug) { if (i2c_debug>=2) {
for (byte = 0; byte < msgs[i].len; byte++) { for (byte = 0; byte < msgs[i].len; byte++) {
printk(" %02x", msgs[i].buf[byte]); printk(" %02x", msgs[i].buf[byte]);
} }
} }
} else { } else {
/* write bytes */ /* write bytes */
if (i2c_debug) { if (i2c_debug>=2) {
for (byte = 0; byte < msgs[i].len; byte++) for (byte = 0; byte < msgs[i].len; byte++)
printk(" %02x", msgs[i].buf[byte]); printk(" %02x", msgs[i].buf[byte]);
} }
@@ -284,13 +281,13 @@ static int em2820_i2c_xfer(struct i2c_adapter *i2c_adap,
if (rc < 0) if (rc < 0)
goto err; goto err;
} }
if (i2c_debug) if (i2c_debug>=2)
printk("\n"); printk("\n");
} }
return num; return num;
err: err:
dprintk2(" ERROR: %i\n", rc); dprintk2(2," ERROR: %i\n", rc);
return rc; return rc;
} }
@@ -436,26 +433,34 @@ static int attach_inform(struct i2c_client *client)
{ {
struct em2820 *dev = client->adapter->algo_data; struct em2820 *dev = client->adapter->algo_data;
dprintk("address %x", client->addr << 1);
switch (client->addr << 1) { switch (client->addr << 1) {
case 0x86: case 0x86:
em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf); em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
break; break;
case 0x4a: case 0x4a:
dprintk1("attach_inform: saa7113 detected.\n"); dprintk1(1,"attach_inform: saa7113 detected.\n");
break; break;
case 0xa0: case 0xa0:
dprintk1("attach_inform: eeprom detected.\n"); dprintk1(1,"attach_inform: eeprom detected.\n");
break; 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 0x80:
case 0x88: case 0x88:
dprintk1("attach_inform: msp34xx detected.\n"); dprintk1(1,"attach_inform: msp34xx detected.\n");
break; break;
case 0xb8: case 0xb8:
case 0xba: case 0xba:
dprintk1("attach_inform: tvp5150 detected.\n"); dprintk1(1,"attach_inform: tvp5150 detected.\n");
break; break;
default: default:
dprintk1(1,"attach inform: detected I2C address %x\n", client->addr << 1);
dev->tuner_addr = client->addr; dev->tuner_addr = client->addr;
em2820_set_tuner(-1, client); em2820_set_tuner(-1, client);
} }

150
drivers/media/video/em28xx/em28xx-input.c Normal file
View File

@@ -0,0 +1,150 @@
/*
*
* 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:
*/

15
drivers/media/video/em28xx/em28xx-video.c
View File

@@ -28,10 +28,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <media/tuner.h>
#include <linux/video_decoder.h> #include <linux/video_decoder.h>
#include "em2820.h" #include "em2820.h"
#include <media/tuner.h>
#define DRIVER_AUTHOR "Markus Rechberger <mrechberger@gmail.com>, " \ #define DRIVER_AUTHOR "Markus Rechberger <mrechberger@gmail.com>, " \
"Ludovico Cavedon <cavedon@sssup.it>, " \ "Ludovico Cavedon <cavedon@sssup.it>, " \
@@ -1699,15 +1699,22 @@ static int em2820_usb_probe(struct usb_interface *interface,
struct usb_device *udev; struct usb_device *udev;
struct em2820 *dev = NULL; struct em2820 *dev = NULL;
int retval = -ENODEV; int retval = -ENODEV;
int model,i,nr; int model,i,nr,ifnum;
udev = usb_get_dev(interface_to_usbdev(interface)); 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 */ /* 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; return -ENODEV;
endpoint = &interface->cur_altsetting->endpoint[1].desc;
/* check if the the device has the iso in endpoint at the correct place */ /* check if the the device has the iso in endpoint at the correct place */
if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
USB_ENDPOINT_XFER_ISOC) { USB_ENDPOINT_XFER_ISOC) {

20
drivers/media/video/em28xx/em28xx.h
View File

@@ -27,6 +27,7 @@
#include <linux/videodev.h> #include <linux/videodev.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <media/ir-kbd-i2c.h>
/* Boards supported by driver */ /* Boards supported by driver */
@@ -53,19 +54,12 @@
/* number of buffers for isoc transfers */ /* number of buffers for isoc transfers */
#define EM2820_NUM_BUFS 5 #define EM2820_NUM_BUFS 5
/* number of packets for each buffer */ /* number of packets for each buffer
// windows requests only 40 packets .. so we better do the same windows requests only 40 packets .. so we better do the same
// this is what I found out for all alternate numbers there! this is what I found out for all alternate numbers there!
*/
#define EM2820_NUM_PACKETS 40 #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 */ /* default alternate; 0 means choose the best */
#define EM2820_PINOUT 0 #define EM2820_PINOUT 0
#define EM2820_MAX_ALT 7 #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_register(struct em2820 *dev);
int em2820_i2c_unregister(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 */ /* Provided by em2820-core.c */
void em2820_print_ioctl(char *name, unsigned int cmd); void em2820_print_ioctl(char *name, unsigned int cmd);

234
drivers/media/video/ir-kbd-i2c.c
View File

@@ -41,101 +41,71 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <media/ir-common.h> #include <media/ir-common.h>
#include <media/ir-kbd-i2c.h>
static IR_KEYTAB_TYPE ir_codes_em2820[IR_KEYTAB_SIZE] = {
[ 0x01 ] = KEY_CHANNEL,
[ 0x02 ] = KEY_SELECT,
[ 0x03 ] = KEY_MUTE,
[ 0x04 ] = KEY_POWER,
[ 0x05 ] = KEY_KP1,
[ 0x06 ] = KEY_KP2,
[ 0x07 ] = KEY_KP3,
[ 0x08 ] = KEY_CHANNELUP,
[ 0x09 ] = KEY_KP4,
[ 0x0a ] = KEY_KP5,
[ 0x0b ] = KEY_KP6,
[ 0x0c ] = KEY_CHANNELDOWN,
[ 0x0d ] = KEY_KP7,
[ 0x0e ] = KEY_KP8,
[ 0x0f ] = KEY_KP9,
[ 0x10 ] = KEY_VOLUMEUP,
[ 0x11 ] = KEY_KP0,
[ 0x12 ] = KEY_MENU,
[ 0x13 ] = KEY_PRINT,
[ 0x14 ] = KEY_VOLUMEDOWN,
[ 0x16 ] = KEY_PAUSE,
[ 0x18 ] = KEY_RECORD,
[ 0x19 ] = KEY_REWIND,
[ 0x1a ] = KEY_PLAY,
[ 0x1b ] = KEY_FORWARD,
[ 0x1c ] = KEY_BACKSPACE,
[ 0x1e ] = KEY_STOP,
[ 0x40 ] = KEY_ZOOM,
};
/* Mark Phalan <phalanm@o2.ie> */ /* Mark Phalan <phalanm@o2.ie> */
static IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE] = { static IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE] = {
[ 0x00 ] = KEY_KP0, [ 0 ] = KEY_KP0,
[ 0x01 ] = KEY_KP1, [ 1 ] = KEY_KP1,
[ 0x02 ] = KEY_KP2, [ 2 ] = KEY_KP2,
[ 0x03 ] = KEY_KP3, [ 3 ] = KEY_KP3,
[ 0x04 ] = KEY_KP4, [ 4 ] = KEY_KP4,
[ 0x05 ] = KEY_KP5, [ 5 ] = KEY_KP5,
[ 0x06 ] = KEY_KP6, [ 6 ] = KEY_KP6,
[ 0x07 ] = KEY_KP7, [ 7 ] = KEY_KP7,
[ 0x08 ] = KEY_KP8, [ 8 ] = KEY_KP8,
[ 0x09 ] = KEY_KP9, [ 9 ] = KEY_KP9,
[ 0x12 ] = KEY_POWER, [ 18 ] = KEY_POWER,
[ 0x10 ] = KEY_MUTE, [ 16 ] = KEY_MUTE,
[ 0x1f ] = KEY_VOLUMEDOWN, [ 31 ] = KEY_VOLUMEDOWN,
[ 0x1b ] = KEY_VOLUMEUP, [ 27 ] = KEY_VOLUMEUP,
[ 0x1a ] = KEY_CHANNELUP, [ 26 ] = KEY_CHANNELUP,
[ 0x1e ] = KEY_CHANNELDOWN, [ 30 ] = KEY_CHANNELDOWN,
[ 0x0e ] = KEY_PAGEUP, [ 14 ] = KEY_PAGEUP,
[ 0x1d ] = KEY_PAGEDOWN, [ 29 ] = KEY_PAGEDOWN,
[ 0x13 ] = KEY_SOUND, [ 19 ] = KEY_SOUND,
[ 0x18 ] = KEY_KPPLUSMINUS, /* CH +/- */ [ 24 ] = KEY_KPPLUSMINUS, /* CH +/- */
[ 0x16 ] = KEY_SUBTITLE, /* CC */ [ 22 ] = KEY_SUBTITLE, /* CC */
[ 0x0d ] = KEY_TEXT, /* TTX */ [ 13 ] = KEY_TEXT, /* TTX */
[ 0x0b ] = KEY_TV, /* AIR/CBL */ [ 11 ] = KEY_TV, /* AIR/CBL */
[ 0x11 ] = KEY_PC, /* PC/TV */ [ 17 ] = KEY_PC, /* PC/TV */
[ 0x17 ] = KEY_OK, /* CH RTN */ [ 23 ] = KEY_OK, /* CH RTN */
[ 0x19 ] = KEY_MODE, /* FUNC */ [ 25 ] = KEY_MODE, /* FUNC */
[ 0x0c ] = KEY_SEARCH, /* AUTOSCAN */ [ 12 ] = KEY_SEARCH, /* AUTOSCAN */
/* Not sure what to do with these ones! */ /* Not sure what to do with these ones! */
[ 0x0f ] = KEY_SELECT, /* SOURCE */ [ 15 ] = KEY_SELECT, /* SOURCE */
[ 0x0a ] = KEY_KPPLUS, /* +100 */ [ 10 ] = KEY_KPPLUS, /* +100 */
[ 0x14 ] = KEY_KPEQUAL, /* SYNC */ [ 20 ] = KEY_KPEQUAL, /* SYNC */
[ 0x1c ] = KEY_MEDIA, /* PC/TV */ [ 28 ] = KEY_MEDIA, /* PC/TV */
}; };
static IR_KEYTAB_TYPE ir_codes_purpletv[IR_KEYTAB_SIZE] = { static IR_KEYTAB_TYPE ir_codes_purpletv[IR_KEYTAB_SIZE] = {
[ 0x03 ] = KEY_POWER, [ 0x3 ] = KEY_POWER,
[ 0x6f ] = KEY_MUTE, [ 0x6f ] = KEY_MUTE,
[ 0x10 ] = KEY_BACKSPACE, /* Recall */ [ 0x10 ] = KEY_BACKSPACE, /* Recall */
[ 0x11 ] = KEY_KP0, [ 0x11 ] = KEY_KP0,
[ 0x04 ] = KEY_KP1, [ 0x4 ] = KEY_KP1,
[ 0x05 ] = KEY_KP2, [ 0x5 ] = KEY_KP2,
[ 0x06 ] = KEY_KP3, [ 0x6 ] = KEY_KP3,
[ 0x08 ] = KEY_KP4, [ 0x8 ] = KEY_KP4,
[ 0x09 ] = KEY_KP5, [ 0x9 ] = KEY_KP5,
[ 0x0a ] = KEY_KP6, [ 0xa ] = KEY_KP6,
[ 0x0c ] = KEY_KP7, [ 0xc ] = KEY_KP7,
[ 0x0d ] = KEY_KP8, [ 0xd ] = KEY_KP8,
[ 0x0e ] = KEY_KP9, [ 0xe ] = KEY_KP9,
[ 0x12 ] = KEY_KPDOT, /* 100+ */ [ 0x12 ] = KEY_KPDOT, /* 100+ */
[ 0x07 ] = KEY_VOLUMEUP, [ 0x7 ] = KEY_VOLUMEUP,
[ 0x0b ] = KEY_VOLUMEDOWN, [ 0xb ] = KEY_VOLUMEDOWN,
[ 0x1a ] = KEY_KPPLUS, [ 0x1a ] = KEY_KPPLUS,
[ 0x18 ] = KEY_KPMINUS, [ 0x18 ] = KEY_KPMINUS,
[ 0x15 ] = KEY_UP, [ 0x15 ] = KEY_UP,
[ 0x1d ] = KEY_DOWN, [ 0x1d ] = KEY_DOWN,
[ 0x0f ] = KEY_CHANNELUP, [ 0xf ] = KEY_CHANNELUP,
[ 0x13 ] = KEY_CHANNELDOWN, [ 0x13 ] = KEY_CHANNELDOWN,
[ 0x48 ] = KEY_ZOOM, [ 0x48 ] = KEY_ZOOM,
@@ -152,17 +122,6 @@ static IR_KEYTAB_TYPE ir_codes_purpletv[IR_KEYTAB_SIZE] = {
}; };
struct IR {
struct i2c_client c;
struct input_dev *input;
struct ir_input_state ir;
struct work_struct work;
struct timer_list timer;
char phys[32];
int (*get_key)(struct IR*, u32*, u32*);
};
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* insmod parameters */ /* insmod parameters */
@@ -173,12 +132,9 @@ module_param(debug, int, 0644); /* debug level (0,1,2) */
#define dprintk(level, fmt, arg...) if (debug >= level) \ #define dprintk(level, fmt, arg...) if (debug >= level) \
printk(KERN_DEBUG DEVNAME ": " fmt , ## arg) printk(KERN_DEBUG DEVNAME ": " fmt , ## arg)
#define IR_PINNACLE_REMOTE 0x01
#define IR_TERRATEC_REMOTE 0x02
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static int get_key_haup(struct IR *ir, u32 *ir_key, u32 *ir_raw) static int get_key_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
{ {
unsigned char buf[3]; unsigned char buf[3];
int start, toggle, dev, code; int start, toggle, dev, code;
@@ -205,7 +161,7 @@ static int get_key_haup(struct IR *ir, u32 *ir_key, u32 *ir_raw)
return 1; return 1;
} }
static int get_key_pixelview(struct IR *ir, u32 *ir_key, u32 *ir_raw) static int get_key_pixelview(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
{ {
unsigned char b; unsigned char b;
@@ -219,7 +175,7 @@ static int get_key_pixelview(struct IR *ir, u32 *ir_key, u32 *ir_raw)
return 1; return 1;
} }
static int get_key_pv951(struct IR *ir, u32 *ir_key, u32 *ir_raw) static int get_key_pv951(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
{ {
unsigned char b; unsigned char b;
@@ -239,7 +195,7 @@ static int get_key_pv951(struct IR *ir, u32 *ir_key, u32 *ir_raw)
return 1; return 1;
} }
static int get_key_knc1(struct IR *ir, u32 *ir_key, u32 *ir_raw) static int get_key_knc1(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
{ {
unsigned char b; unsigned char b;
@@ -267,7 +223,7 @@ static int get_key_knc1(struct IR *ir, u32 *ir_key, u32 *ir_raw)
return 1; return 1;
} }
static int get_key_purpletv(struct IR *ir, u32 *ir_key, u32 *ir_raw) static int get_key_purpletv(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
{ {
unsigned char b; unsigned char b;
@@ -289,10 +245,9 @@ static int get_key_purpletv(struct IR *ir, u32 *ir_key, u32 *ir_raw)
*ir_raw = b; *ir_raw = b;
return 1; return 1;
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
static void ir_key_poll(struct IR *ir) static void ir_key_poll(struct IR_i2c *ir)
{ {
static u32 ir_key, ir_raw; static u32 ir_key, ir_raw;
int rc; int rc;
@@ -313,13 +268,13 @@ static void ir_key_poll(struct IR *ir)
static void ir_timer(unsigned long data) static void ir_timer(unsigned long data)
{ {
struct IR *ir = (struct IR*)data; struct IR_i2c *ir = (struct IR_i2c*)data;
schedule_work(&ir->work); schedule_work(&ir->work);
} }
static void ir_work(void *data) static void ir_work(void *data)
{ {
struct IR *ir = data; struct IR_i2c *ir = data;
ir_key_poll(ir); ir_key_poll(ir);
mod_timer(&ir->timer, jiffies+HZ/10); mod_timer(&ir->timer, jiffies+HZ/10);
} }
@@ -351,10 +306,10 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
IR_KEYTAB_TYPE *ir_codes = NULL; IR_KEYTAB_TYPE *ir_codes = NULL;
char *name; char *name;
int ir_type; int ir_type;
struct IR *ir; struct IR_i2c *ir;
struct input_dev *input_dev; struct input_dev *input_dev;
ir = kzalloc(sizeof(struct IR), GFP_KERNEL); ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
input_dev = input_allocate_device(); input_dev = input_allocate_device();
if (!ir || !input_dev) { if (!ir || !input_dev) {
kfree(ir); kfree(ir);
@@ -390,36 +345,18 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
ir_codes = ir_codes_rc5_tv; ir_codes = ir_codes_rc5_tv;
break; break;
case 0x30: case 0x30:
switch(kind){ name = "KNC One";
case IR_TERRATEC_REMOTE: ir->get_key = get_key_knc1;
name = "Terratec IR"; ir_type = IR_TYPE_OTHER;
ir->get_key = get_key_knc1; ir_codes = ir_codes_empty;
ir_type = IR_TYPE_OTHER;
ir_codes = ir_codes_em2820;
break;
default:
name = "KNC One";
ir->get_key = get_key_knc1;
ir_type = IR_TYPE_OTHER;
ir_codes = ir_codes_empty;
}
break; break;
case 0x47:
case 0x7a: case 0x7a:
switch(kind){ name = "Purple TV";
case IR_PINNACLE_REMOTE: ir->get_key = get_key_purpletv;
name = "Pinnacle IR Remote"; ir_type = IR_TYPE_OTHER;
ir->get_key = get_key_purpletv; ir_codes = ir_codes_purpletv;
ir_type = IR_TYPE_OTHER;
ir_codes = ir_codes_em2820;
break;
default:
name = "Purple TV";
ir->get_key = get_key_purpletv;
ir_type = IR_TYPE_OTHER;
ir_codes = ir_codes_purpletv;
}
break; break;
default: default:
/* shouldn't happen */ /* shouldn't happen */
printk(DEVNAME ": Huh? unknown i2c address (0x%02x)?\n",addr); printk(DEVNAME ": Huh? unknown i2c address (0x%02x)?\n",addr);
@@ -427,12 +364,18 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
return -1; return -1;
} }
/* register i2c device */ /* Sets name and its physical addr */
i2c_attach_client(&ir->c);
snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (%s)", name); snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (%s)", name);
snprintf(ir->phys, sizeof(ir->phys), "%s/%s/ir0", snprintf(ir->phys, sizeof(ir->phys), "%s/%s/ir0",
ir->c.adapter->dev.bus_id, ir->c.adapter->dev.bus_id,
ir->c.dev.bus_id); ir->c.dev.bus_id);
ir->ir_codes=ir_codes;
/* register i2c device
* At device register, IR codes may be changed to be
* board dependent.
*/
i2c_attach_client(&ir->c);
/* init + register input device */ /* init + register input device */
ir_input_init(input_dev, &ir->ir, ir_type, ir_codes); ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
@@ -440,6 +383,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
input_dev->name = ir->c.name; input_dev->name = ir->c.name;
input_dev->phys = ir->phys; input_dev->phys = ir->phys;
/* register event device */
input_register_device(ir->input); input_register_device(ir->input);
/* start polling via eventd */ /* start polling via eventd */
@@ -454,7 +398,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
static int ir_detach(struct i2c_client *client) static int ir_detach(struct i2c_client *client)
{ {
struct IR *ir = i2c_get_clientdata(client); struct IR_i2c *ir = i2c_get_clientdata(client);
/* kill outstanding polls */ /* kill outstanding polls */
del_timer(&ir->timer); del_timer(&ir->timer);
@@ -483,11 +427,9 @@ static int ir_probe(struct i2c_adapter *adap)
static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1}; static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
static const int probe_saa7134[] = { 0x7a, -1 }; static const int probe_saa7134[] = { 0x7a, -1 };
static const int probe_em2820[] = { 0x47, 0x30, -1 }; static const int probe_em2820[] = { 0x30, 0x47, -1 };
const int *probe = NULL; const int *probe = NULL;
int attached = 0; struct i2c_client c; char buf; int i,rc;
struct i2c_client c; unsigned char buf; int i,rc;
switch (adap->id) { switch (adap->id) {
case I2C_HW_B_BT848: case I2C_HW_B_BT848:
@@ -505,27 +447,15 @@ static int ir_probe(struct i2c_adapter *adap)
memset(&c,0,sizeof(c)); memset(&c,0,sizeof(c));
c.adapter = adap; c.adapter = adap;
for (i = 0; -1 != probe[i] && attached != 1; i++) { for (i = 0; -1 != probe[i]; i++) {
c.addr = probe[i]; c.addr = probe[i];
rc = i2c_master_recv(&c,&buf,1); rc = i2c_master_recv(&c,&buf,0);
dprintk(1,"probe 0x%02x @ %s: %s\n", dprintk(1,"probe 0x%02x @ %s: %s\n",
probe[i], adap->name, probe[i], adap->name,
(1 == rc) ? "yes" : "no"); (0 == rc) ? "yes" : "no");
switch(adap->id){ if (0 == rc) {
case I2C_HW_B_BT848: ir_attach(adap,probe[i],0,0);
case I2C_HW_SAA7134: break;
if (1 == rc) {
ir_attach(adap,probe[i],0,0);
attached=1;
break;
}
case I2C_HW_B_EM2820:
/* windows logs are needed for fixing the pinnacle device */
if (1 == rc && 0xff == buf){
ir_attach(adap,probe[i],0,IR_TERRATEC_REMOTE);
attached=1;
}
break;
} }
} }
return 0; return 0;

6
include/media/ir-common.h
View File

@@ -20,8 +20,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <linux/input.h> #ifndef _IR_COMMON
#define _IR_COMMON
#include <linux/input.h>
#define IR_TYPE_RC5 1 #define IR_TYPE_RC5 1
#define IR_TYPE_PD 2 /* Pulse distance encoded IR */ #define IR_TYPE_PD 2 /* Pulse distance encoded IR */
@@ -61,6 +63,8 @@ int ir_dump_samples(u32 *samples, int count);
int ir_decode_biphase(u32 *samples, int count, int low, int high); int ir_decode_biphase(u32 *samples, int count, int low, int high);
int ir_decode_pulsedistance(u32 *samples, int count, int low, int high); int ir_decode_pulsedistance(u32 *samples, int count, int low, int high);
#endif
/* /*
* Local variables: * Local variables:
* c-basic-offset: 8 * c-basic-offset: 8

22
include/media/ir-kbd-i2c.h Normal file
View File

@@ -0,0 +1,22 @@
#ifndef _IR_I2C
#define _IR_I2C
#include <media/ir-common.h>
struct IR_i2c;
struct IR_i2c {
IR_KEYTAB_TYPE *ir_codes;
struct i2c_client c;
struct input_dev *input;
struct ir_input_state ir;
/* Used to avoid fast repeating */
unsigned char old;
struct work_struct work;
struct timer_list timer;
char phys[32];
int (*get_key)(struct IR_i2c*, u32*, u32*);
};
#endif