summaryrefslogtreecommitdiffstats
path: root/include/media/ir-common.h
diff options
context:
space:
mode:
authorDavid Härdeman2010-10-29 21:08:23 +0200
committerMauro Carvalho Chehab2010-12-29 11:16:37 +0100
commitd8b4b5822f51e2142b731b42c81e3f03eec475b2 (patch)
treefce9a9b7ca5031adc95fbd6be118352fb2527da5 /include/media/ir-common.h
parent[media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main (diff)
downloadkernel-qcow2-linux-d8b4b5822f51e2142b731b42c81e3f03eec475b2.tar.gz
kernel-qcow2-linux-d8b4b5822f51e2142b731b42c81e3f03eec475b2.tar.xz
kernel-qcow2-linux-d8b4b5822f51e2142b731b42c81e3f03eec475b2.zip
[media] ir-core: make struct rc_dev the primary interface
This patch merges the ir_input_dev and ir_dev_props structs into a single struct called rc_dev. The drivers and various functions in rc-core used by the drivers are also changed to use rc_dev as the primary interface when dealing with rc-core. This means that the input_dev is abstracted away from the drivers which is necessary if we ever want to support multiple input devs per rc device. The new API is similar to what the input subsystem uses, i.e: rc_device_alloc() rc_device_free() rc_device_register() rc_device_unregister() [mchehab@redhat.com: Fix compilation on mceusb and cx231xx, due to merge conflicts] Signed-off-by: David Härdeman <david@hardeman.nu> Acked-by: Jarod Wilson <jarod@redhat.com> Tested-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/ir-common.h')
-rw-r--r--include/media/ir-common.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index d1ae869f962c..41fefd9816ea 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -36,12 +36,11 @@
/* this was saa7134_ir and bttv_ir, moved here for
* rc5 decoding. */
struct card_ir {
- struct input_dev *dev;
+ struct rc_dev *dev;
char name[32];
char phys[32];
int users;
u32 running:1;
- struct ir_dev_props props;
/* Usual gpio signalling */
u32 mask_keycode;