Merge PR #32

diff --combined include/cectypes.h
index bb1015dbec6b282361026609b826a1b0128aac26,a220d6c551801e4963c970d6842d3f26cc863a90..5d6144ae5aac2f7a0a93912b2bfcafe316e71b54
--- 1/include/cectypes.h
--- 2/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
   */
@@@ -646,6 -636,13 +646,13 @@@ typedef enum cec_user_control_cod
    CEC_USER_CONTROL_CODE_CONTENTS_MENU               = 0x0B,
    CEC_USER_CONTROL_CODE_FAVORITE_MENU               = 0x0C,
    CEC_USER_CONTROL_CODE_EXIT                        = 0x0D,
+   // reserved: 0x0E, 0x0F
+   CEC_USER_CONTROL_CODE_TOP_MENU                    = 0x10,
+   CEC_USER_CONTROL_CODE_DVD_MENU                    = 0x11,
+   // reserved: 0x12 ... 0x1C
+   CEC_USER_CONTROL_CODE_NUMBER_ENTRY_MODE           = 0x1D,
+   CEC_USER_CONTROL_CODE_NUMBER11                    = 0x1E,
+   CEC_USER_CONTROL_CODE_NUMBER12                    = 0x1F,
    CEC_USER_CONTROL_CODE_NUMBER0                     = 0x20,
    CEC_USER_CONTROL_CODE_NUMBER1                     = 0x21,
    CEC_USER_CONTROL_CODE_NUMBER2                     = 0x22,
@@@ -669,6 -666,7 +676,7 @@@
    CEC_USER_CONTROL_CODE_HELP                        = 0x36,
    CEC_USER_CONTROL_CODE_PAGE_UP                     = 0x37,
    CEC_USER_CONTROL_CODE_PAGE_DOWN                   = 0x38,
+   // reserved: 0x39 ... 0x3F
    CEC_USER_CONTROL_CODE_POWER                       = 0x40,
    CEC_USER_CONTROL_CODE_VOLUME_UP                   = 0x41,
    CEC_USER_CONTROL_CODE_VOLUME_DOWN                 = 0x42,
@@@ -684,12 -682,16 +692,16 @@@
    CEC_USER_CONTROL_CODE_BACKWARD                    = 0x4C,
    CEC_USER_CONTROL_CODE_STOP_RECORD                 = 0x4D,
    CEC_USER_CONTROL_CODE_PAUSE_RECORD                = 0x4E,
+   // reserved: 0x4F
    CEC_USER_CONTROL_CODE_ANGLE                       = 0x50,
    CEC_USER_CONTROL_CODE_SUB_PICTURE                 = 0x51,
    CEC_USER_CONTROL_CODE_VIDEO_ON_DEMAND             = 0x52,
    CEC_USER_CONTROL_CODE_ELECTRONIC_PROGRAM_GUIDE    = 0x53,
    CEC_USER_CONTROL_CODE_TIMER_PROGRAMMING           = 0x54,
    CEC_USER_CONTROL_CODE_INITIAL_CONFIGURATION       = 0x55,
+   CEC_USER_CONTROL_CODE_SELECT_BROADCAST_TYPE       = 0x56,
+   CEC_USER_CONTROL_CODE_SELECT_SOUND_PRESENTATION   = 0x57,
+   // reserved: 0x58 ... 0x5F
    CEC_USER_CONTROL_CODE_PLAY_FUNCTION               = 0x60,
    CEC_USER_CONTROL_CODE_PAUSE_PLAY_FUNCTION         = 0x61,
    CEC_USER_CONTROL_CODE_RECORD_FUNCTION             = 0x62,
@@@ -704,14 -706,16 +716,16 @@@
    CEC_USER_CONTROL_CODE_POWER_TOGGLE_FUNCTION       = 0x6B,
    CEC_USER_CONTROL_CODE_POWER_OFF_FUNCTION          = 0x6C,
    CEC_USER_CONTROL_CODE_POWER_ON_FUNCTION           = 0x6D,
+   // reserved: 0x6E ... 0x70
    CEC_USER_CONTROL_CODE_F1_BLUE                     = 0x71,
    CEC_USER_CONTROL_CODE_F2_RED                      = 0X72,
    CEC_USER_CONTROL_CODE_F3_GREEN                    = 0x73,
    CEC_USER_CONTROL_CODE_F4_YELLOW                   = 0x74,
    CEC_USER_CONTROL_CODE_F5                          = 0x75,
    CEC_USER_CONTROL_CODE_DATA                        = 0x76,
-   CEC_USER_CONTROL_CODE_AN_RETURN                   = 0x91,
-   CEC_USER_CONTROL_CODE_AN_CHANNELS_LIST            = 0x96,
+   // reserved: 0x77 ... 0xFF
+   CEC_USER_CONTROL_CODE_AN_RETURN                   = 0x91, // return (Samsung)
+   CEC_USER_CONTROL_CODE_AN_CHANNELS_LIST            = 0x96, // channels list (Samsung)
    CEC_USER_CONTROL_CODE_MAX                         = 0x96,
    CEC_USER_CONTROL_CODE_UNKNOWN                     = 0xFF
  } cec_user_control_code;
@@@ -835,32 -839,31 +849,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
@@@ -869,8 -872,7 +883,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

diff --combined src/lib/CECTypeUtils.h
index 27671081835ab41df4cc6c419b1d5db3e09e7a3b,a39611cb3587deb2ed796f3cceeebb71ed529824..0eccdcc6f5a28379f493fe0aaf2a798474ab1af8
--- 1/src/lib/CECTypeUtils.h
--- 2/src/lib/CECTypeUtils.h
+++ b/src/lib/CECTypeUtils.h
@@@ -520,7 -520,6 +520,7 @@@ namespace CE
        case CEC_VENDOR_MARANTZ:
          return "Marantz";
        case CEC_VENDOR_HARMAN_KARDON:
 +      case CEC_VENDOR_HARMAN_KARDON2:
          return "Harman/Kardon";
        case CEC_VENDOR_PULSE_EIGHT:
          return "Pulse Eight";
@@@ -710,6 -709,16 +710,16 @@@
          return "favourite menu";
        case CEC_USER_CONTROL_CODE_EXIT:
          return "exit";
+       case CEC_USER_CONTROL_CODE_TOP_MENU:
+         return "top menu";
+       case CEC_USER_CONTROL_CODE_DVD_MENU:
+         return "dvd menu";
+       case CEC_USER_CONTROL_CODE_NUMBER_ENTRY_MODE:
+         return "number entry mode";
+       case CEC_USER_CONTROL_CODE_NUMBER11:
+         return "11";
+       case CEC_USER_CONTROL_CODE_NUMBER12:
+         return "12";
        case CEC_USER_CONTROL_CODE_NUMBER0:
          return "0";
        case CEC_USER_CONTROL_CODE_NUMBER1:
@@@ -798,6 -807,10 +808,10 @@@
          return "timer programming";
        case CEC_USER_CONTROL_CODE_INITIAL_CONFIGURATION:
          return "initial configuration";
+       case CEC_USER_CONTROL_CODE_SELECT_BROADCAST_TYPE:
+         return "select broadcast type";
+       case CEC_USER_CONTROL_CODE_SELECT_SOUND_PRESENTATION:
+         return "select sound presentation";
        case CEC_USER_CONTROL_CODE_PLAY_FUNCTION:
          return "play (function)";
        case CEC_USER_CONTROL_CODE_PAUSE_PLAY_FUNCTION: