diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-11-27 20:40:22 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:42:19 -0500 |
commit | 8573b74af25c279de3e309beddcba984bee9ec15 (patch) | |
tree | 62635afe2df0727b5eed544f43d9e6b5c2aabdcb /drivers/media/video/cx88 | |
parent | ef53a1159dfcdc1fecf5adb5b8d26803f194c09b (diff) |
V4L/DVB (13533): ir: use dynamic tables, instead of static ones
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 47c03019357d..7b2066415d7e 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -118,13 +118,13 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) | |||
118 | 118 | ||
119 | data = (data << 4) | ((gpio_key & 0xf0) >> 4); | 119 | data = (data << 4) | ((gpio_key & 0xf0) >> 4); |
120 | 120 | ||
121 | ir_input_keydown(ir->input, &ir->ir, data, data); | 121 | ir_input_keydown(ir->input, &ir->ir, data); |
122 | ir_input_nokey(ir->input, &ir->ir); | 122 | ir_input_nokey(ir->input, &ir->ir); |
123 | 123 | ||
124 | } else if (ir->mask_keydown) { | 124 | } else if (ir->mask_keydown) { |
125 | /* bit set on keydown */ | 125 | /* bit set on keydown */ |
126 | if (gpio & ir->mask_keydown) { | 126 | if (gpio & ir->mask_keydown) { |
127 | ir_input_keydown(ir->input, &ir->ir, data, data); | 127 | ir_input_keydown(ir->input, &ir->ir, data); |
128 | } else { | 128 | } else { |
129 | ir_input_nokey(ir->input, &ir->ir); | 129 | ir_input_nokey(ir->input, &ir->ir); |
130 | } | 130 | } |
@@ -132,14 +132,14 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) | |||
132 | } else if (ir->mask_keyup) { | 132 | } else if (ir->mask_keyup) { |
133 | /* bit cleared on keydown */ | 133 | /* bit cleared on keydown */ |
134 | if (0 == (gpio & ir->mask_keyup)) { | 134 | if (0 == (gpio & ir->mask_keyup)) { |
135 | ir_input_keydown(ir->input, &ir->ir, data, data); | 135 | ir_input_keydown(ir->input, &ir->ir, data); |
136 | } else { | 136 | } else { |
137 | ir_input_nokey(ir->input, &ir->ir); | 137 | ir_input_nokey(ir->input, &ir->ir); |
138 | } | 138 | } |
139 | 139 | ||
140 | } else { | 140 | } else { |
141 | /* can't distinguish keydown/up :-/ */ | 141 | /* can't distinguish keydown/up :-/ */ |
142 | ir_input_keydown(ir->input, &ir->ir, data, data); | 142 | ir_input_keydown(ir->input, &ir->ir, data); |
143 | ir_input_nokey(ir->input, &ir->ir); | 143 | ir_input_nokey(ir->input, &ir->ir); |
144 | } | 144 | } |
145 | } | 145 | } |
@@ -487,7 +487,7 @@ void cx88_ir_irq(struct cx88_core *core) | |||
487 | 487 | ||
488 | ir_dprintk("Key Code: %x\n", (ircode >> 16) & 0x7f); | 488 | ir_dprintk("Key Code: %x\n", (ircode >> 16) & 0x7f); |
489 | 489 | ||
490 | ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f, (ircode >> 16) & 0xff); | 490 | ir_input_keydown(ir->input, &ir->ir, (ircode >> 16) & 0x7f); |
491 | ir->release = jiffies + msecs_to_jiffies(120); | 491 | ir->release = jiffies + msecs_to_jiffies(120); |
492 | break; | 492 | break; |
493 | case CX88_BOARD_HAUPPAUGE: | 493 | case CX88_BOARD_HAUPPAUGE: |
@@ -524,7 +524,7 @@ void cx88_ir_irq(struct cx88_core *core) | |||
524 | if ( dev != 0x1e && dev != 0x1f ) | 524 | if ( dev != 0x1e && dev != 0x1f ) |
525 | /* not a hauppauge remote */ | 525 | /* not a hauppauge remote */ |
526 | break; | 526 | break; |
527 | ir_input_keydown(ir->input, &ir->ir, code, ircode); | 527 | ir_input_keydown(ir->input, &ir->ir, code); |
528 | ir->release = jiffies + msecs_to_jiffies(120); | 528 | ir->release = jiffies + msecs_to_jiffies(120); |
529 | break; | 529 | break; |
530 | case CX88_BOARD_PINNACLE_PCTV_HD_800i: | 530 | case CX88_BOARD_PINNACLE_PCTV_HD_800i: |
@@ -532,7 +532,7 @@ void cx88_ir_irq(struct cx88_core *core) | |||
532 | ir_dprintk("biphase decoded: %x\n", ircode); | 532 | ir_dprintk("biphase decoded: %x\n", ircode); |
533 | if ((ircode & 0xfffff000) != 0x3000) | 533 | if ((ircode & 0xfffff000) != 0x3000) |
534 | break; | 534 | break; |
535 | ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f, ircode); | 535 | ir_input_keydown(ir->input, &ir->ir, ircode & 0x3f); |
536 | ir->release = jiffies + msecs_to_jiffies(120); | 536 | ir->release = jiffies + msecs_to_jiffies(120); |
537 | break; | 537 | break; |
538 | } | 538 | } |