Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a6b2a87 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: cec: rename pin events/function 



The CEC_EVENT_PIN_LOW/HIGH defines and the cec_queue_pin_event() function
did not specify that these were about CEC pin events.

Since in the future there will also be HPD pin events it is wise to rename
the event defines and function to CEC_EVENT_PIN_CEC_LOW/HIGH and
cec_queue_pin_cec_event() now before these become part of the ABI.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 583352be

Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ returns the information to the application. The ioctl never fails. 
      - 0x00000080

      - The CEC hardware can monitor CEC pin changes from low to high voltage

        and vice versa. When in pin monitoring mode the application will

	receive ``CEC_EVENT_PIN_LOW`` and ``CEC_EVENT_PIN_HIGH`` events.

	receive ``CEC_EVENT_PIN_CEC_LOW`` and ``CEC_EVENT_PIN_CEC_HIGH`` events.

Documentation/media/uapi/cec/cec-ioc-dqevent.rst

+4 −4
Original line number Diff line number Diff line
@@ -146,16 +146,16 @@ it is guaranteed that the state did change in between the two events. 
      - 2

      - Generated if one or more CEC messages were lost because the

	application didn't dequeue CEC messages fast enough.

    * .. _`CEC-EVENT-PIN-LOW`:

    * .. _`CEC-EVENT-PIN-CEC-LOW`:



      - ``CEC_EVENT_PIN_LOW``

      - ``CEC_EVENT_PIN_CEC_LOW``

      - 3

      - Generated if the CEC pin goes from a high voltage to a low voltage.

        Only applies to adapters that have the ``CEC_CAP_MONITOR_PIN``

	capability set.

    * .. _`CEC-EVENT-PIN-HIGH`:

    * .. _`CEC-EVENT-PIN-CEC-HIGH`:



      - ``CEC_EVENT_PIN_HIGH``

      - ``CEC_EVENT_PIN_CEC_HIGH``

      - 4

      - Generated if the CEC pin goes from a low voltage to a high voltage.

        Only applies to adapters that have the ``CEC_CAP_MONITOR_PIN``

Documentation/media/uapi/cec/cec-ioc-g-mode.rst

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ Available follower modes are: 
	This mode requires that the :ref:`CEC_CAP_MONITOR_PIN <CEC-CAP-MONITOR-PIN>`

	capability is set, otherwise the ``EINVAL`` error code is returned.

	While in pin monitoring mode this file descriptor can receive the

	``CEC_EVENT_PIN_LOW`` and ``CEC_EVENT_PIN_HIGH`` events to see the

	``CEC_EVENT_PIN_CEC_LOW`` and ``CEC_EVENT_PIN_CEC_HIGH`` events to see the

	low-level CEC pin transitions. This is very useful for debugging.

	This mode is only allowed if the process has the ``CAP_NET_ADMIN``

	capability. If that is not set, then the ``EPERM`` error code is returned.

drivers/media/cec/cec-adap.c

+4 −3
Original line number Diff line number Diff line
@@ -154,10 +154,11 @@ static void cec_queue_event(struct cec_adapter *adap, 
}



/* Notify userspace that the CEC pin changed state at the given time. */

void cec_queue_pin_event(struct cec_adapter *adap, bool is_high, ktime_t ts)

void cec_queue_pin_cec_event(struct cec_adapter *adap, bool is_high, ktime_t ts)

{

	struct cec_event ev = {

		.event = is_high ? CEC_EVENT_PIN_HIGH : CEC_EVENT_PIN_LOW,

		.event = is_high ? CEC_EVENT_PIN_CEC_HIGH :

				   CEC_EVENT_PIN_CEC_LOW,

	};

	struct cec_fh *fh;
@@ -167,7 +168,7 @@ void cec_queue_pin_event(struct cec_adapter *adap, bool is_high, ktime_t ts) 
			cec_queue_event_fh(fh, &ev, ktime_to_ns(ts));

	mutex_unlock(&adap->devnode.lock);

}

EXPORT_SYMBOL_GPL(cec_queue_pin_event);

EXPORT_SYMBOL_GPL(cec_queue_pin_cec_event);



/*

 * Queue a new message for this filehandle.

drivers/media/cec/cec-api.c

+2 −2
Original line number Diff line number Diff line
@@ -449,8 +449,8 @@ static long cec_s_mode(struct cec_adapter *adap, struct cec_fh *fh, 
			.flags = CEC_EVENT_FL_INITIAL_STATE,

		};



		ev.event = adap->pin->cur_value ? CEC_EVENT_PIN_HIGH :

						  CEC_EVENT_PIN_LOW;

		ev.event = adap->pin->cur_value ? CEC_EVENT_PIN_CEC_HIGH :

						  CEC_EVENT_PIN_CEC_LOW;

		cec_queue_event_fh(fh, &ev, 0);

#endif

		adap->monitor_pin_cnt++;