aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx/bttv-input.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-input.c')
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index e4df7f85f9d..773ee6a8eed 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -70,14 +70,14 @@ static void ir_handle_key(struct bttv *btv)
70 70
71 if ((ir->mask_keydown && (gpio & ir->mask_keydown)) || 71 if ((ir->mask_keydown && (gpio & ir->mask_keydown)) ||
72 (ir->mask_keyup && !(gpio & ir->mask_keyup))) { 72 (ir->mask_keyup && !(gpio & ir->mask_keyup))) {
73 ir_keydown_notimeout(ir->dev, data, 0); 73 rc_keydown_notimeout(ir->dev, data, 0);
74 } else { 74 } else {
75 /* HACK: Probably, ir->mask_keydown is missing 75 /* HACK: Probably, ir->mask_keydown is missing
76 for this board */ 76 for this board */
77 if (btv->c.type == BTTV_BOARD_WINFAST2000) 77 if (btv->c.type == BTTV_BOARD_WINFAST2000)
78 ir_keydown_notimeout(ir->dev, data, 0); 78 rc_keydown_notimeout(ir->dev, data, 0);
79 79
80 ir_keyup(ir->dev); 80 rc_keyup(ir->dev);
81 } 81 }
82} 82}
83 83
@@ -100,9 +100,9 @@ static void ir_enltv_handle_key(struct bttv *btv)
100 gpio, data, 100 gpio, data,
101 (gpio & ir->mask_keyup) ? " up" : "up/down"); 101 (gpio & ir->mask_keyup) ? " up" : "up/down");
102 102
103 ir_keydown_notimeout(ir->dev, data, 0); 103 rc_keydown_notimeout(ir->dev, data, 0);
104 if (keyup) 104 if (keyup)
105 ir_keyup(ir->dev); 105 rc_keyup(ir->dev);
106 } else { 106 } else {
107 if ((ir->last_gpio & 1 << 31) == keyup) 107 if ((ir->last_gpio & 1 << 31) == keyup)
108 return; 108 return;
@@ -112,9 +112,9 @@ static void ir_enltv_handle_key(struct bttv *btv)
112 (gpio & ir->mask_keyup) ? " up" : "down"); 112 (gpio & ir->mask_keyup) ? " up" : "down");
113 113
114 if (keyup) 114 if (keyup)
115 ir_keyup(ir->dev); 115 rc_keyup(ir->dev);
116 else 116 else
117 ir_keydown_notimeout(ir->dev, data, 0); 117 rc_keydown_notimeout(ir->dev, data, 0);
118 } 118 }
119 119
120 ir->last_gpio = data | keyup; 120 ir->last_gpio = data | keyup;
@@ -232,7 +232,7 @@ void bttv_rc5_timer_end(unsigned long data)
232 u32 instr = RC5_INSTR(rc5); 232 u32 instr = RC5_INSTR(rc5);
233 233
234 /* Good code */ 234 /* Good code */
235 ir_keydown(ir->dev, instr, toggle); 235 rc_keydown(ir->dev, instr, toggle);
236 dprintk(KERN_INFO DEVNAME ":" 236 dprintk(KERN_INFO DEVNAME ":"
237 " instruction %x, toggle %x\n", 237 " instruction %x, toggle %x\n",
238 instr, toggle); 238 instr, toggle);