hidl: consumerir: Update samsung_consumerir header for HIDL hal

Change-Id: Ife68fd0ccd65eb16241694bbf911fc6810f7dd80

diff --git a/hidl/consumerir/ConsumerIr.cpp b/hidl/consumerir/ConsumerIr.cpp
index a594aab12866590a4e3be46b0b238c87db01e1e2..8b5ef82e1bd3add19705b8bf3daff454c2c9324d 100644 (file)
--- a/hidl/consumerir/ConsumerIr.cpp
+++ b/hidl/consumerir/ConsumerIr.cpp
@@ -16,7 +16,7 @@
 
 #include "ConsumerIr.h"
 
-#include <samsung_consumerir.h>
+#include <samsung_ir.h>
 
 namespace android {
 namespace hardware {

diff --git a/hidl/consumerir/include/samsung_consumerir.h b/hidl/consumerir/include/samsung_consumerir.h
deleted file mode 100644 (file)
index 590b107..0000000
--- a/hidl/consumerir/include/samsung_consumerir.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2016 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef SAMSUNG_CONSUMERIR_H
-#define SAMSUNG_CONSUMERIR_H
-
-/*
- * Board specific nodes
- *
- * If your kernel exposes these controls in another place, you can either
- * symlink to the locations given here, or override this header in your
- * device tree.
- */
-#define IR_PATH "/sys/class/sec/sec_ir/ir_send"
-
-/*
- * Board specific configs
- *
- * If your device needs a different configuration, you
- * can override this header in your device tree
- */
-// Some devices need MS_IR_SIGNAL to avoid ms to pulses conversionn
-//#define MS_IR_SIGNAL
-
-static const consumerir_freq_range_t consumerir_freqs[] = {
-    {.min = 30000, .max = 30000},
-    {.min = 33000, .max = 33000},
-    {.min = 36000, .max = 36000},
-    {.min = 38000, .max = 38000},
-    {.min = 40000, .max = 40000},
-    {.min = 56000, .max = 56000},
-};
-
-#endif  // SAMSUNG_CONSUMERIR_H

diff --git a/hidl/consumerir/include/samsung_ir.h b/hidl/consumerir/include/samsung_ir.h
new file mode 100644 (file)
index 0000000..74adf42
--- /dev/null
+++ b/hidl/consumerir/include/samsung_ir.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod Project
+ * Copyright (C) 2020 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SAMSUNG_CONSUMERIR_H
+#define SAMSUNG_CONSUMERIR_H
+
+#include <android/hardware/ir/1.0/IConsumerIr.h>
+
+using android::hardware::ir::V1_0::ConsumerIrFreqRange;
+
+/*
+ * Board specific nodes
+ *
+ * If your kernel exposes these controls in another place, you can either
+ * symlink to the locations given here, or override this header in your
+ * device tree.
+ */
+#define IR_PATH "/sys/class/sec/sec_ir/ir_send"
+
+/*
+ * Board specific configs
+ *
+ * If your device needs a different configuration, you
+ * can override this header in your device tree
+ */
+// Some devices need MS_IR_SIGNAL to avoid ms to pulses conversionn
+//#define MS_IR_SIGNAL
+
+static const std::vector<ConsumerIrFreqRange> consumerirFreqs = {
+    {.min = 30000, .max = 30000},
+    {.min = 33000, .max = 33000},
+    {.min = 36000, .max = 36000},
+    {.min = 38000, .max = 38000},
+    {.min = 40000, .max = 40000},
+    {.min = 56000, .max = 56000},
+};
+
+#endif  // SAMSUNG_CONSUMERIR_H