diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2017-08-20 06:53:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-08-26 08:35:10 -0400 |
commit | 28e11b15b6606c3308f87f7c9c4c9e404eddde6d (patch) | |
tree | 4cd4c99a2eb10e773d7aa967286ae10ced76c4db /include/media | |
parent | 152b0a9a3d62f90e6784a5d35ffc3f552f1c2c54 (diff) | |
download | blackbird-op-linux-28e11b15b6606c3308f87f7c9c4c9e404eddde6d.tar.gz blackbird-op-linux-28e11b15b6606c3308f87f7c9c4c9e404eddde6d.zip |
media: cec: replace pin->cur_value by adap->cec_pin_is_high
The current CEC pin value (0 or 1) was part of the cec_pin struct,
but that assumes that CEC pin monitoring can only be used with
a driver that uses the low-level CEC pin framework.
But hardware that has both a high-level API and can monitor the
CEC pin at low-level at the same time does not need to depend on
the cec pin framework.
To support such devices remove the cur_value field from struct cec_pin
and add a cec_pin_is_high field to cec_adapter. This also makes it
possible to drop the '#ifdef CONFIG_CEC_PIN' in cec-api.c.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/cec-pin.h | 1 | ||||
-rw-r--r-- | include/media/cec.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/media/cec-pin.h b/include/media/cec-pin.h index d28d07fa312e..f09cc9579d53 100644 --- a/include/media/cec-pin.h +++ b/include/media/cec-pin.h @@ -128,7 +128,6 @@ struct cec_pin { u16 la_mask; bool enabled; bool monitor_all; - bool cur_value; bool rx_eom; bool enable_irq_failed; enum cec_pin_state state; diff --git a/include/media/cec.h b/include/media/cec.h index 60b26fc18464..df6b3bd31284 100644 --- a/include/media/cec.h +++ b/include/media/cec.h @@ -180,6 +180,7 @@ struct cec_adapter { bool needs_hpd; bool is_configuring; bool is_configured; + bool cec_pin_is_high; u32 monitor_all_cnt; u32 monitor_pin_cnt; u32 follower_cnt; |