Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=056d1a899201f02777a35a32f8e6c9a2aac63f63
Commit:     056d1a899201f02777a35a32f8e6c9a2aac63f63
Parent:     f5174af201f2e22c101bb02d06343e4bc5f056de
Author:     Mike Isely <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 26 02:09:42 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:03:05 2008 -0200

    V4L/DVB (6699): pvrusb2: Use of virtual IR chip is a device-specific 
attribute
    
    For Hauppauge 24xxx devices, the IR receiver is a custom piece of
    logic that is very specific to the device.  The pvrusb2 driver can
    virtualize this to make it look like a more normal IR receiver found
    in other Hauppauge devices.  The decision of whether or not to enable
    this virtualization however is a device-specific attribute, thus this
    changeset.
    
    Signed-off-by: Mike Isely <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/pvrusb2/pvrusb2-devattr.c  |    1 +
 drivers/media/video/pvrusb2/pvrusb2-devattr.h  |    4 ++++
 drivers/media/video/pvrusb2/pvrusb2-i2c-core.c |    2 +-
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c 
b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 464a13a..6ba0b79 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -85,6 +85,7 @@ const struct pvr2_device_desc pvr2_device_descriptions[] = {
                .flag_has_cx25840 = !0,
                .flag_has_wm8775 = !0,
                .flag_has_hauppauge_rom = !0,
+               .flag_has_hauppauge_custom_ir = !0,
                .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
        },
 };
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h 
b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index 05eb2c6..2aff5a3 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -84,6 +84,10 @@ struct pvr2_device_desc {
        /* Device has a wm8775 - this enables special additional logic to
           ensure that it is found. */
        char flag_has_wm8775;
+
+       /* Device has IR hardware that can be faked into looking like a
+          normal Hauppauge i2c IR receiver. */
+       char flag_has_hauppauge_custom_ir;
 };
 
 extern const struct pvr2_device_desc pvr2_device_descriptions[];
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 
b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index 7721ec8..62867fa 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -980,7 +980,7 @@ void pvr2_i2c_core_init(struct pvr2_hdw *hdw)
                printk(KERN_INFO "%s: IR disabled\n",hdw->name);
                hdw->i2c_func[0x18] = i2c_black_hole;
        } else if (ir_mode[hdw->unit_number] == 1) {
-               if (hdw->hdw_desc->flag_has_cx25840) {
+               if (hdw->hdw_desc->flag_has_hauppauge_custom_ir) {
                        hdw->i2c_func[0x18] = i2c_24xxx_ir;
                }
        }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to