diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/media/rc-core.h | 8 | ||||
-rw-r--r-- | include/uapi/linux/v4l2-common.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h index 0b9f890ce431..fde142e5f25a 100644 --- a/include/media/rc-core.h +++ b/include/media/rc-core.h | |||
@@ -60,6 +60,7 @@ enum rc_filter_type { | |||
60 | /** | 60 | /** |
61 | * struct rc_dev - represents a remote control device | 61 | * struct rc_dev - represents a remote control device |
62 | * @dev: driver model's view of this device | 62 | * @dev: driver model's view of this device |
63 | * @sysfs_groups: sysfs attribute groups | ||
63 | * @input_name: name of the input child device | 64 | * @input_name: name of the input child device |
64 | * @input_phys: physical path to the input child device | 65 | * @input_phys: physical path to the input child device |
65 | * @input_id: id of the input child device (struct input_id) | 66 | * @input_id: id of the input child device (struct input_id) |
@@ -112,10 +113,12 @@ enum rc_filter_type { | |||
112 | * device doesn't interrupt host until it sees IR pulses | 113 | * device doesn't interrupt host until it sees IR pulses |
113 | * @s_learning_mode: enable wide band receiver used for learning | 114 | * @s_learning_mode: enable wide band receiver used for learning |
114 | * @s_carrier_report: enable carrier reports | 115 | * @s_carrier_report: enable carrier reports |
115 | * @s_filter: set the scancode filter of a given type | 116 | * @s_filter: set the scancode filter |
117 | * @s_wakeup_filter: set the wakeup scancode filter | ||
116 | */ | 118 | */ |
117 | struct rc_dev { | 119 | struct rc_dev { |
118 | struct device dev; | 120 | struct device dev; |
121 | const struct attribute_group *sysfs_groups[5]; | ||
119 | const char *input_name; | 122 | const char *input_name; |
120 | const char *input_phys; | 123 | const char *input_phys; |
121 | struct input_id input_id; | 124 | struct input_id input_id; |
@@ -159,8 +162,9 @@ struct rc_dev { | |||
159 | int (*s_learning_mode)(struct rc_dev *dev, int enable); | 162 | int (*s_learning_mode)(struct rc_dev *dev, int enable); |
160 | int (*s_carrier_report) (struct rc_dev *dev, int enable); | 163 | int (*s_carrier_report) (struct rc_dev *dev, int enable); |
161 | int (*s_filter)(struct rc_dev *dev, | 164 | int (*s_filter)(struct rc_dev *dev, |
162 | enum rc_filter_type type, | ||
163 | struct rc_scancode_filter *filter); | 165 | struct rc_scancode_filter *filter); |
166 | int (*s_wakeup_filter)(struct rc_dev *dev, | ||
167 | struct rc_scancode_filter *filter); | ||
164 | }; | 168 | }; |
165 | 169 | ||
166 | #define to_rc_dev(d) container_of(d, struct rc_dev, dev) | 170 | #define to_rc_dev(d) container_of(d, struct rc_dev, dev) |
diff --git a/include/uapi/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h index 270db8914c01..9bf508ad0957 100644 --- a/include/uapi/linux/v4l2-common.h +++ b/include/uapi/linux/v4l2-common.h | |||
@@ -29,6 +29,8 @@ | |||
29 | #ifndef __V4L2_COMMON__ | 29 | #ifndef __V4L2_COMMON__ |
30 | #define __V4L2_COMMON__ | 30 | #define __V4L2_COMMON__ |
31 | 31 | ||
32 | #include <linux/types.h> | ||
33 | |||
32 | /* | 34 | /* |
33 | * | 35 | * |
34 | * Selection interface definitions | 36 | * Selection interface definitions |