diff options
author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-11-24 10:58:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-10 06:05:21 -0500 |
commit | e457579079642924da621e92cb39d8fb90a4d5a7 (patch) | |
tree | 6b98b50353fdb99ddb66ca1f6f0bf43dae5b7969 /drivers/media/dvb | |
parent | 9abec6189aa8b6659222544bf893158fc96e8822 (diff) |
V4L/DVB (4884): Remove stray IR code left from patchset
This caused compilation to fail - completely replaced by new style
functions, so can be removed.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index a68f5bf01259..8f71124099b0 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -187,56 +187,6 @@ static void msp430_ir_interrupt(unsigned long data) | |||
187 | } | 187 | } |
188 | } | 188 | } |
189 | 189 | ||
190 | static void msp430_ir_debounce(unsigned long data) | ||
191 | { | ||
192 | struct input_dev *dev = (struct input_dev *) data; | ||
193 | |||
194 | if (dev->rep[0] == 0 || dev->rep[0] == ~0) { | ||
195 | input_event(dev, EV_KEY, key_map[dev->repeat_key], 0); | ||
196 | } else { | ||
197 | dev->rep[0] = 0; | ||
198 | dev->timer.expires = jiffies + HZ * 350 / 1000; | ||
199 | add_timer(&dev->timer); | ||
200 | input_event(dev, EV_KEY, key_map[dev->repeat_key], 2); /* REPEAT */ | ||
201 | } | ||
202 | input_sync(dev); | ||
203 | } | ||
204 | |||
205 | static void msp430_ir_interrupt(unsigned long data) | ||
206 | { | ||
207 | struct budget_ci *budget_ci = (struct budget_ci *) data; | ||
208 | struct input_dev *dev = budget_ci->ir.dev; | ||
209 | unsigned int code = | ||
210 | ttpci_budget_debiread(&budget_ci->budget, DEBINOSWAP, DEBIADDR_IR, 2, 1, 0) >> 8; | ||
211 | |||
212 | if (code & 0x40) { | ||
213 | code &= 0x3f; | ||
214 | |||
215 | if (timer_pending(&dev->timer)) { | ||
216 | if (code == dev->repeat_key) { | ||
217 | ++dev->rep[0]; | ||
218 | return; | ||
219 | } | ||
220 | del_timer(&dev->timer); | ||
221 | input_event(dev, EV_KEY, key_map[dev->repeat_key], 0); | ||
222 | } | ||
223 | |||
224 | if (!key_map[code]) { | ||
225 | printk("DVB (%s): no key for %02x!\n", __FUNCTION__, code); | ||
226 | return; | ||
227 | } | ||
228 | |||
229 | input_event(dev, EV_KEY, key_map[code], 1); | ||
230 | input_sync(dev); | ||
231 | |||
232 | /* initialize debounce and repeat */ | ||
233 | dev->repeat_key = code; | ||
234 | /* Zenith remote _always_ sends 2 sequences */ | ||
235 | dev->rep[0] = ~0; | ||
236 | mod_timer(&dev->timer, jiffies + msecs_to_jiffies(350)); | ||
237 | } | ||
238 | } | ||
239 | |||
240 | static int msp430_ir_init(struct budget_ci *budget_ci) | 190 | static int msp430_ir_init(struct budget_ci *budget_ci) |
241 | { | 191 | { |
242 | struct saa7146_dev *saa = budget_ci->budget.dev; | 192 | struct saa7146_dev *saa = budget_ci->budget.dev; |