From b43a8d575def17b79c0798584b4f2f48169be244 Mon Sep 17 00:00:00 2001 From: Paul Keith Date: Mon, 27 Jan 2020 20:19:45 -0600 Subject: [PATCH] hidl: consumerir: Update samsung_consumerir header for HIDL hal Change-Id: Ife68fd0ccd65eb16241694bbf911fc6810f7dd80 --- hidl/consumerir/ConsumerIr.cpp | 2 +- .../include/{samsung_consumerir.h => samsung_ir.h} | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) rename hidl/consumerir/include/{samsung_consumerir.h => samsung_ir.h} (86%) diff --git a/hidl/consumerir/ConsumerIr.cpp b/hidl/consumerir/ConsumerIr.cpp index a594aab1..8b5ef82e 100644 --- a/hidl/consumerir/ConsumerIr.cpp +++ b/hidl/consumerir/ConsumerIr.cpp @@ -16,7 +16,7 @@ #include "ConsumerIr.h" -#include +#include namespace android { namespace hardware { diff --git a/hidl/consumerir/include/samsung_consumerir.h b/hidl/consumerir/include/samsung_ir.h similarity index 86% rename from hidl/consumerir/include/samsung_consumerir.h rename to hidl/consumerir/include/samsung_ir.h index 590b1076..74adf420 100644 --- a/hidl/consumerir/include/samsung_consumerir.h +++ b/hidl/consumerir/include/samsung_ir.h @@ -1,5 +1,6 @@ /* * 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. @@ -17,6 +18,10 @@ #ifndef SAMSUNG_CONSUMERIR_H #define SAMSUNG_CONSUMERIR_H +#include + +using android::hardware::ir::V1_0::ConsumerIrFreqRange; + /* * Board specific nodes * @@ -35,7 +40,7 @@ // Some devices need MS_IR_SIGNAL to avoid ms to pulses conversionn //#define MS_IR_SIGNAL -static const consumerir_freq_range_t consumerir_freqs[] = { +static const std::vector consumerirFreqs = { {.min = 30000, .max = 30000}, {.min = 33000, .max = 33000}, {.min = 36000, .max = 36000},