diff options
author | David Härdeman <david@hardeman.nu> | 2014-04-04 18:06:01 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-04-06 10:30:25 -0400 |
commit | 23c843b5eb11198e7de3a2af0756d1f897117932 (patch) | |
tree | 9a6a57b60b9d048f105d8585c1e84b0e2d4a3bc0 /include/media | |
parent | 42f5e630e06326fa47b3ba86e572b51c36b0a3b1 (diff) |
[media] rc-core: split dev->s_filter
Overloading dev->s_filter to do two different functions (set wakeup filters
and generic hardware filters) makes it impossible to tell what the
hardware actually supports, so create a separate dev->s_wakeup_filter and
make the distinction explicit.
Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/rc-core.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h index 0b9f890ce431..6dbc7c11224f 100644 --- a/include/media/rc-core.h +++ b/include/media/rc-core.h | |||
@@ -112,7 +112,8 @@ enum rc_filter_type { | |||
112 | * device doesn't interrupt host until it sees IR pulses | 112 | * device doesn't interrupt host until it sees IR pulses |
113 | * @s_learning_mode: enable wide band receiver used for learning | 113 | * @s_learning_mode: enable wide band receiver used for learning |
114 | * @s_carrier_report: enable carrier reports | 114 | * @s_carrier_report: enable carrier reports |
115 | * @s_filter: set the scancode filter of a given type | 115 | * @s_filter: set the scancode filter |
116 | * @s_wakeup_filter: set the wakeup scancode filter | ||
116 | */ | 117 | */ |
117 | struct rc_dev { | 118 | struct rc_dev { |
118 | struct device dev; | 119 | struct device dev; |
@@ -159,8 +160,9 @@ struct rc_dev { | |||
159 | int (*s_learning_mode)(struct rc_dev *dev, int enable); | 160 | int (*s_learning_mode)(struct rc_dev *dev, int enable); |
160 | int (*s_carrier_report) (struct rc_dev *dev, int enable); | 161 | int (*s_carrier_report) (struct rc_dev *dev, int enable); |
161 | int (*s_filter)(struct rc_dev *dev, | 162 | int (*s_filter)(struct rc_dev *dev, |
162 | enum rc_filter_type type, | ||
163 | struct rc_scancode_filter *filter); | 163 | struct rc_scancode_filter *filter); |
164 | int (*s_wakeup_filter)(struct rc_dev *dev, | ||
165 | struct rc_scancode_filter *filter); | ||
164 | }; | 166 | }; |
165 | 167 | ||
166 | #define to_rc_dev(d) container_of(d, struct rc_dev, dev) | 168 | #define to_rc_dev(d) container_of(d, struct rc_dev, dev) |