diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-11-08 16:37:02 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-11-08 16:37:02 +0000 |
| commit | eaed794617f0bfe60c163b20beac76c49fddfa7e (patch) | |
| tree | e8bed37f1e114c5d4b7fcf882087c2ebb83b1662 /linux/include | |
| parent | 60e495e67bcdf6af4887af43fed88cc6531bcc24 (diff) | |
| download | mediapointer-dvb-s2-eaed794617f0bfe60c163b20beac76c49fddfa7e.tar.gz mediapointer-dvb-s2-eaed794617f0bfe60c163b20beac76c49fddfa7e.tar.bz2 | |
- The pinnacle handler & remote are common to saa7134 PCI boards
and em28xx USB boards, so the keymap was moved to ir-common and the
keyhandler is back to ir-kbd-i2c
- request_module("ir-kbd-i2c") is no longer necessary at saa7134-core
since saa7134.ko now depends on ir-kbd-i2c.ko to get the keyhandler
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/ir-common.h | 3 | ||||
| -rw-r--r-- | linux/include/media/ir-kbd-i2c.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index 1758f1507..7caf007b4 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -1,5 +1,5 @@ /* - * $Id: ir-common.h,v 1.13 2005/10/14 16:31:51 mchehab Exp $ + * $Id: ir-common.h,v 1.14 2005/11/08 16:37:02 rmcc Exp $ * * some common structs and functions to handle infrared remotes via * input layer ... @@ -50,6 +50,7 @@ struct ir_input_state { extern IR_KEYTAB_TYPE ir_codes_rc5_tv[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE]; +extern IR_KEYTAB_TYPE ir_codes_pinnacle[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_empty[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE]; diff --git a/linux/include/media/ir-kbd-i2c.h b/linux/include/media/ir-kbd-i2c.h index a6fcdd380..0bfcf6e74 100644 --- a/linux/include/media/ir-kbd-i2c.h +++ b/linux/include/media/ir-kbd-i2c.h @@ -19,4 +19,6 @@ struct IR_i2c { char phys[32]; int (*get_key)(struct IR_i2c*, u32*, u32*); }; + +int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw); #endif |