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>

3 files changed, 122 insertions, 18 deletions

diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index e0c9719cb..27ef3074d 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,79 @@
+2005-10-14 16:04  mchehab
+
+	* ../linux/drivers/media/video/ir-kbd-i2c.c: (get_key_haup),
+	(get_key_pixelview), (get_key_pv951), (get_key_knc1),
+	(get_key_purpletv), (ir_key_poll), (ir_timer), (ir_work),
+	(ir_attach), (ir_detach), (ir_probe):
+
+	- moved Pinnacle IR table (ir_codes_em2820) to em2820-input.c
+	- IR struct renamed and moved to a header file.
+
+	* ../v4l/Makefile:
+	* ../linux/drivers/usb/media/em2820-input.c:
+	- New file to handle em2820-specific IR.
+	- It uses ir-kbd-i2c to handle I2C IR.
+	- Experimental em2820 code removed and probe fixed.
+	- Detection code changed to be like i2c_scan, since the old one
+	  doesn't work with em2820 cards.
+
+	* ../linux/drivers/usb/media/em2820-cards.c: (em2820_card_setup):
+	- Removed some testing code.
+
+	* ../linux/drivers/usb/media/em2820-i2c.c: (em2820_i2c_xfer),
+	(attach_inform):
+	- Some cleanups at debug messages.
+	- attach now detects I2C IR and calls em2820-specific IR code
+
+	* ../linux/drivers/usb/media/em2820-video.c: (em2820_usb_probe):
+	- Board detection message improved to show interface and class.
+	- Now it doesn't touch audio interfaces.
+
+	* ../linux/drivers/usb/media/em2820.h:
+	- Comments changed to /* */ instead of //
+	- Included IR headers
+
+	* ../v4l/compat.h:
+	* ../linux/include/media/ir-common.h:
+	- IR compat code moved to compat.h
+
+	* ../linux/include/media/ir-kbd-i2c.h:
+	- New header with struct IR_i2c there, to allow it to be
+	  used by board-specific input handlers.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+2005-10-14 15:48  mchehab
+
+	* ../linux/drivers/usb/media/em2820-input.c
+	* ../v4l/Makefile:
+
+	* ../linux/drivers/usb/media/em2820-cards.c: (em2820_card_setup):
+	* ../linux/drivers/usb/media/em2820-i2c.c: (em2820_i2c_xfer),
+	(attach_inform):
+	* ../linux/drivers/usb/media/em2820-video.c: (em2820_usb_probe):
+	* ../linux/drivers/usb/media/em2820.h:
+	* ../linux/include/media/ir-common.h:
+	* ../v4l/compat.h:
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
+2005-10-14 15:46  mchehab
+
+	* ../linux/drivers/media/video/ir-kbd-i2c.c: (get_key_haup),
+	(get_key_pixelview), (get_key_pv951), (get_key_knc1),
+	(get_key_purpletv), (ir_key_poll), (ir_timer), (ir_work),
+	(ir_attach), (ir_detach), (ir_probe):
+	* ../linux/drivers/usb/media/em2820-cards.c: (em2820_card_setup):
+	* ../linux/drivers/usb/media/em2820-i2c.c: (em2820_i2c_xfer),
+	(attach_inform):
+	* ../linux/drivers/usb/media/em2820-video.c: (em2820_usb_probe):
+	* ../linux/drivers/usb/media/em2820.h:
+	* ../linux/include/media/ir-common.h:
+	* ../v4l/Makefile:
+	* ../v4l/compat.h:
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-10-13 01:09  mrechberger
 
        * ../linux/drivers/media/video/ir-kbd-i2c.c:
diff --git a/v4l/Makefile b/v4l/Makefile
index 026996c42..a25314779 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -26,7 +26,8 @@ cx8800-objs     := cx88-video.o cx88-vbi.o
 cx8802-objs     := cx88-mpeg.o
 tuner-objs	:= tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o
 list-multi	:= bttv.o saa7134.o cx88xx.o cx8800.o cx88-alsa.o cx8802.o
-em2820-objs     := em2820-video.o em2820-i2c.o em2820-cards.o em2820-core.o
+em2820-objs     := em2820-video.o em2820-i2c.o em2820-cards.o em2820-core.o \
+		   em2820-input.o
 
 # what to build
 obj-m				:= video-buf.o v4l1-compat.o v4l2-common.o
diff --git a/v4l/compat.h b/v4l/compat.h
index 2271e6524..bb2f0954a 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,5 +1,5 @@
 /*
- * $Id: compat.h,v 1.24 2005/10/11 20:04:27 nsh Exp $
+ * $Id: compat.h,v 1.25 2005/10/14 16:31:51 mchehab Exp $
  */
 
 #ifndef _COMPAT_H
@@ -136,22 +136,49 @@ static inline unsigned long msleep_interruptible(unsigned int msecs)
 #endif
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#define KEY_NEXT                0x197
-#define KEY_RADIO               0x181
-#define KEY_PREVIOUS            0x19c
-#define KEY_MHP                 0x16f
-#define KEY_EPG                 0x16d
-#define KEY_FASTFORWARD         208
-#define KEY_LIST                0x18b
-#define KEY_LAST                0x195
-#define KEY_CLEAR               0x163
-#define KEY_AUX                 0x186
-#define KEY_SCREEN              0x177
-#define KEY_MEDIA               226
-#define KEY_SLOW                0x199
-#define KEY_OK                  0x160
-#define KEY_DIGITS              0x19d
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+/* some keys from 2.6.x which are not (yet?) in 2.4.x */
+# define KEY_PLAY                207
+# define KEY_PRINT	     	 210
+# define KEY_SEARCH              217
+# define KEY_SELECT 	         0x161
+# define KEY_GOTO                0x162
+# define KEY_INFO                0x166
+# define KEY_CHANNEL             0x16b
+# define KEY_LANGUAGE            0x170
+# define KEY_SUBTITLE	         0x172
+# define KEY_ZOOM                0x174
+# define KEY_MODE		 0x175
+# define KEY_TV                  0x179
+# define KEY_CD                  0x17f
+# define KEY_TUNER               0x182
+# define KEY_TEXT                0x184
+# define KEY_DVD		 0x185
+# define KEY_AUDIO               0x188
+# define KEY_VIDEO               0x189
+# define KEY_RED                 0x18e
+# define KEY_GREEN               0x18f
+# define KEY_YELLOW              0x190
+# define KEY_BLUE                0x191
+# define KEY_CHANNELUP           0x192
+# define KEY_CHANNELDOWN         0x193
+# define KEY_RESTART	         0x198
+# define KEY_SHUFFLE     	 0x19a
+# define KEY_NEXT                0x197
+# define KEY_RADIO               0x181
+# define KEY_PREVIOUS            0x19c
+# define KEY_MHP                 0x16f
+# define KEY_EPG                 0x16d
+# define KEY_FASTFORWARD         208
+# define KEY_LIST                0x18b
+# define KEY_LAST                0x195
+# define KEY_CLEAR               0x163
+# define KEY_AUX                 0x186
+# define KEY_SCREEN              0x177
+# define KEY_MEDIA               226
+# define KEY_SLOW                0x199
+# define KEY_OK                  0x160
+# define KEY_DIGITS              0x19d
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)