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=90f2b42b0f4ad28265830b8fbb2a941200aa933c

Merge PR #31
---

diff --git a/include/cectypes.h b/include/cectypes.h
index bc4a664..bb1015d 100644
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -835,31 +835,32 @@ typedef enum cec_bus_device_status
 
 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
diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 2de94bf..563bb0a 100644
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -784,31 +784,32 @@ namespace CecSharp
   /// </summary>
   public enum class CecVendorId
   {
-    Toshiba      = 0x000039,
-    Samsung      = 0x0000F0,
-    Denon        = 0x0005CD,
-    Marantz      = 0x000678,
-    Loewe        = 0x000982,
-    Onkyo        = 0x0009B0,
-    Medion       = 0x000CB8,
-    Toshiba2     = 0x000CE7,
-    PulseEight   = 0x001582,
-    Akai         = 0x0020C7,
-    AOC          = 0x002467,
-    Panasonic    = 0x008045,
-    Philips      = 0x00903E,
-    Daewoo       = 0x009053,
-    Yamaha       = 0x00A0DE,
-    Grundig      = 0x00D0D5,
-    Pioneer      = 0x00E036,
-    LG           = 0x00E091,
-    Sharp        = 0x08001F,
-    Sony         = 0x080046,
-    Broadcom     = 0x18C086,
-    Vizio        = 0x6B746D,
-    Benq         = 0x8065E9,
-    HarmanKardon = 0x9C645E,
-    Unknown      = 0
+    Toshiba       = 0x000039,
+    Samsung       = 0x0000F0,
+    Denon         = 0x0005CD,
+    Marantz       = 0x000678,
+    Loewe         = 0x000982,
+    Onkyo         = 0x0009B0,
+    Medion        = 0x000CB8,
+    Toshiba2      = 0x000CE7,
+    PulseEight    = 0x001582,
+    HarmanKardon2 = 0x001950,
+    Akai          = 0x0020C7,
+    AOC           = 0x002467,
+    Panasonic     = 0x008045,
+    Philips       = 0x00903E,
+    Daewoo        = 0x009053,
+    Yamaha        = 0x00A0DE,
+    Grundig       = 0x00D0D5,
+    Pioneer       = 0x00E036,
+    LG            = 0x00E091,
+    Sharp         = 0x08001F,
+    Sony          = 0x080046,
+    Broadcom      = 0x18C086,
+    Vizio         = 0x6B746D,
+    Benq          = 0x8065E9,
+    HarmanKardon  = 0x9C645E,
+    Unknown       = 0
   };
 
   /// <summary>
diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h
index dc4e5f1..2767108 100644
--- a/src/lib/CECTypeUtils.h
+++ b/src/lib/CECTypeUtils.h
@@ -520,6 +520,7 @@ namespace CEC
       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";