From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Fri, 24 Oct 2014 19:40:44 +0000 (+0200)
Subject: Merge PR #31
X-Git-Tag: upstream/2.2.0~1^2~1^2~3^2~9
X-Git-Url: https://git.piment-noir.org/?p=deb_libcec.git;a=commitdiff_plain;h=1953d813b44edd22dfc8dfcb59ab480918b4ca2c;hp=-c

Merge PR #31
---

1953d813b44edd22dfc8dfcb59ab480918b4ca2c
diff --combined include/cectypes.h
index bc4a664,929d85c..bb1015d
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@@ -294,16 -294,6 +294,16 @@@ namespace CEC 
   */
  #define CEC_TDA995x_VIRTUAL_COM		"CuBox"
  
 +/*!
 + * the path to use for the Exynos HDMI CEC device
 + */
 +#define CEC_EXYNOS_PATH		"/dev/CEC"
 +
 +/*!
 + * the name of the virtual COM port to use for the EXYNOS' CEC wire
 + */
 +#define CEC_EXYNOS_VIRTUAL_COM		"Exynos"
 +
  /*!
   * Mimimum client version
   */
@@@ -835,31 -825,32 +835,32 @@@ typedef enum cec_bus_device_statu
  
  typedef enum cec_vendor_id
  {
-   CEC_VENDOR_TOSHIBA       = 0x000039,
-   CEC_VENDOR_SAMSUNG       = 0x0000F0,
-   CEC_VENDOR_DENON         = 0x0005CD,
-   CEC_VENDOR_MARANTZ       = 0x000678,
-   CEC_VENDOR_LOEWE         = 0x000982,
-   CEC_VENDOR_ONKYO         = 0x0009B0,
-   CEC_VENDOR_MEDION        = 0x000CB8,
-   CEC_VENDOR_TOSHIBA2      = 0x000CE7,
-   CEC_VENDOR_PULSE_EIGHT   = 0x001582,
-   CEC_VENDOR_AKAI          = 0x0020C7,
-   CEC_VENDOR_AOC           = 0x002467,
-   CEC_VENDOR_PANASONIC     = 0x008045,
-   CEC_VENDOR_PHILIPS       = 0x00903E,
-   CEC_VENDOR_DAEWOO        = 0x009053,
-   CEC_VENDOR_YAMAHA        = 0x00A0DE,
-   CEC_VENDOR_GRUNDIG       = 0x00D0D5,
-   CEC_VENDOR_PIONEER       = 0x00E036,
-   CEC_VENDOR_LG            = 0x00E091,
-   CEC_VENDOR_SHARP         = 0x08001F,
-   CEC_VENDOR_SONY          = 0x080046,
-   CEC_VENDOR_BROADCOM      = 0x18C086,
-   CEC_VENDOR_VIZIO         = 0x6B746D,
-   CEC_VENDOR_BENQ          = 0x8065E9,
-   CEC_VENDOR_HARMAN_KARDON = 0x9C645E,
-   CEC_VENDOR_UNKNOWN       = 0
+   CEC_VENDOR_TOSHIBA        = 0x000039,
+   CEC_VENDOR_SAMSUNG        = 0x0000F0,
+   CEC_VENDOR_DENON          = 0x0005CD,
+   CEC_VENDOR_MARANTZ        = 0x000678,
+   CEC_VENDOR_LOEWE          = 0x000982,
+   CEC_VENDOR_ONKYO          = 0x0009B0,
+   CEC_VENDOR_MEDION         = 0x000CB8,
+   CEC_VENDOR_TOSHIBA2       = 0x000CE7,
+   CEC_VENDOR_PULSE_EIGHT    = 0x001582,
+   CEC_VENDOR_HARMAN_KARDON2 = 0x001950,
+   CEC_VENDOR_AKAI           = 0x0020C7,
+   CEC_VENDOR_AOC            = 0x002467,
+   CEC_VENDOR_PANASONIC      = 0x008045,
+   CEC_VENDOR_PHILIPS        = 0x00903E,
+   CEC_VENDOR_DAEWOO         = 0x009053,
+   CEC_VENDOR_YAMAHA         = 0x00A0DE,
+   CEC_VENDOR_GRUNDIG        = 0x00D0D5,
+   CEC_VENDOR_PIONEER        = 0x00E036,
+   CEC_VENDOR_LG             = 0x00E091,
+   CEC_VENDOR_SHARP          = 0x08001F,
+   CEC_VENDOR_SONY           = 0x080046,
+   CEC_VENDOR_BROADCOM       = 0x18C086,
+   CEC_VENDOR_VIZIO          = 0x6B746D,
+   CEC_VENDOR_BENQ           = 0x8065E9,
+   CEC_VENDOR_HARMAN_KARDON  = 0x9C645E,
+   CEC_VENDOR_UNKNOWN        = 0
  } cec_vendor_id;
  
  typedef enum cec_adapter_type
@@@ -868,8 -859,7 +869,8 @@@
    ADAPTERTYPE_P8_EXTERNAL      = 0x1,
    ADAPTERTYPE_P8_DAUGHTERBOARD = 0x2,
    ADAPTERTYPE_RPI              = 0x100,
 -  ADAPTERTYPE_TDA995x          = 0x200
 +  ADAPTERTYPE_TDA995x          = 0x200,
 +  ADAPTERTYPE_EXYNOS           = 0x300
  } cec_adapter_type;
  
  typedef struct cec_menu_language