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

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

[media] cec.h: merge cec-edid.h into cec.h 



Drop the separate cec-edid.h header and merge it into cec.h.

There was really no need to have a separate header for this.

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

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -3077,7 +3077,6 @@ F: Documentation/media/uapi/cec 
F:	drivers/media/cec/

F:	drivers/media/rc/keymaps/rc-cec.c

F:	include/media/cec.h

F:	include/media/cec-edid.h

F:	include/media/cec-notifier.h

F:	include/uapi/linux/cec.h

F:	include/uapi/linux/cec-funcs.h

drivers/media/cec/cec-edid.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/types.h>

#include <media/cec-edid.h>

#include <media/cec.h>



/*

 * This EDID is expected to be a CEA-861 compliant, which means that there are

drivers/media/cec/cec-notifier.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/list.h>

#include <linux/kref.h>



#include <media/cec.h>

#include <media/cec-notifier.h>

#include <drm/drm_edid.h>

drivers/media/platform/s5p-cec/s5p_cec.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/timer.h>

#include <linux/workqueue.h>

#include <media/cec.h>

#include <media/cec-edid.h>

#include <media/cec-notifier.h>



#include "exynos_hdmi_cec.h"

include/media/cec-edid.h

deleted100644 → 0
+0 −133
Original line number Diff line number Diff line 
/*

 * cec-edid - HDMI Consumer Electronics Control & EDID helpers

 *

 * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

 *

 * This program is free software; you may redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#ifndef _MEDIA_CEC_EDID_H

#define _MEDIA_CEC_EDID_H



#include <linux/types.h>



#define CEC_PHYS_ADDR_INVALID		0xffff

#define cec_phys_addr_exp(pa) \

	((pa) >> 12), ((pa) >> 8) & 0xf, ((pa) >> 4) & 0xf, (pa) & 0xf



#if IS_ENABLED(CONFIG_CEC_CORE)



/**

 * cec_get_edid_phys_addr() - find and return the physical address

 *

 * @edid:	pointer to the EDID data

 * @size:	size in bytes of the EDID data

 * @offset:	If not %NULL then the location of the physical address

 *		bytes in the EDID will be returned here. This is set to 0

 *		if there is no physical address found.

 *

 * Return: the physical address or CEC_PHYS_ADDR_INVALID if there is none.

 */

u16 cec_get_edid_phys_addr(const u8 *edid, unsigned int size,

			   unsigned int *offset);



/**

 * cec_set_edid_phys_addr() - find and set the physical address

 *

 * @edid:	pointer to the EDID data

 * @size:	size in bytes of the EDID data

 * @phys_addr:	the new physical address

 *

 * This function finds the location of the physical address in the EDID

 * and fills in the given physical address and updates the checksum

 * at the end of the EDID block. It does nothing if the EDID doesn't

 * contain a physical address.

 */

void cec_set_edid_phys_addr(u8 *edid, unsigned int size, u16 phys_addr);



/**

 * cec_phys_addr_for_input() - calculate the PA for an input

 *

 * @phys_addr:	the physical address of the parent

 * @input:	the number of the input port, must be between 1 and 15

 *

 * This function calculates a new physical address based on the input

 * port number. For example:

 *

 * PA = 0.0.0.0 and input = 2 becomes 2.0.0.0

 *

 * PA = 3.0.0.0 and input = 1 becomes 3.1.0.0

 *

 * PA = 3.2.1.0 and input = 5 becomes 3.2.1.5

 *

 * PA = 3.2.1.3 and input = 5 becomes f.f.f.f since it maxed out the depth.

 *

 * Return: the new physical address or CEC_PHYS_ADDR_INVALID.

 */

u16 cec_phys_addr_for_input(u16 phys_addr, u8 input);



/**

 * cec_phys_addr_validate() - validate a physical address from an EDID

 *

 * @phys_addr:	the physical address to validate

 * @parent:	if not %NULL, then this is filled with the parents PA.

 * @port:	if not %NULL, then this is filled with the input port.

 *

 * This validates a physical address as read from an EDID. If the

 * PA is invalid (such as 1.0.1.0 since '0' is only allowed at the end),

 * then it will return -EINVAL.

 *

 * The parent PA is passed into %parent and the input port is passed into

 * %port. For example:

 *

 * PA = 0.0.0.0: has parent 0.0.0.0 and input port 0.

 *

 * PA = 1.0.0.0: has parent 0.0.0.0 and input port 1.

 *

 * PA = 3.2.0.0: has parent 3.0.0.0 and input port 2.

 *

 * PA = f.f.f.f: has parent f.f.f.f and input port 0.

 *

 * Return: 0 if the PA is valid, -EINVAL if not.

 */

int cec_phys_addr_validate(u16 phys_addr, u16 *parent, u16 *port);



#else



static inline u16 cec_get_edid_phys_addr(const u8 *edid, unsigned int size,

					 unsigned int *offset)

{

	if (offset)

		*offset = 0;

	return CEC_PHYS_ADDR_INVALID;

}



static inline void cec_set_edid_phys_addr(u8 *edid, unsigned int size,

					  u16 phys_addr)

{

}



static inline u16 cec_phys_addr_for_input(u16 phys_addr, u8 input)

{

	return CEC_PHYS_ADDR_INVALID;

}



static inline int cec_phys_addr_validate(u16 phys_addr, u16 *parent, u16 *port)

{

	return 0;

}



#endif



#endif /* _MEDIA_CEC_EDID_H */