From 621887a91a18eb66997212ab3acb03384538620a Mon Sep 17 00:00:00 2001
From: Amy Zhang <amyjojo@google.com>
Date: Wed, 30 Sep 2020 11:33:34 -0700
Subject: [PATCH] Add DVBC Time Interleave Mode enum in Tuner HAL 1.1

Test: make android.hardware.tv.tuner@1.1
Bug: 158818695
Change-Id: I11ea762a789aaab1cf3a17b3c0515c6a37942098
---
 tv/tuner/1.1/types.hal | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tv/tuner/1.1/types.hal b/tv/tuner/1.1/types.hal
index 938751351a..efde55d431 100644
--- a/tv/tuner/1.1/types.hal
+++ b/tv/tuner/1.1/types.hal
@@ -137,6 +137,24 @@ enum FrontendAnalogAftFlag : uint32_t {
     AFT_FALSE,
 };
 
+/**
+ * Time Interleave Mode for DVBC Frontend.
+ */
+@export
+enum FrontendCableTimeInterleaveMode : uint32_t {
+    UNDEFINED = 0,
+    AUTO = 1 << 0,
+    INTERLEAVING_128_1_0 = 1 << 1,
+    INTERLEAVING_128_1_1 = 1 << 2,
+    INTERLEAVING_64_2 = 1 << 3,
+    INTERLEAVING_32_4 = 1 << 4,
+    INTERLEAVING_16_8 = 1 << 5,
+    INTERLEAVING_8_16 = 1 << 6,
+    INTERLEAVING_128_2 = 1 << 7,
+    INTERLEAVING_128_3 = 1 << 8,
+    INTERLEAVING_128_4 = 1 << 9,
+};
+
 /**
  *  Extended Transmission Mode for DVBT.
  */
@@ -183,6 +201,13 @@ struct FrontendAnalogSettingsExt1_1 {
     FrontendAnalogAftFlag aftFlag;
 };
 
+/**
+ *  Extended Signal Settings for DVBC Frontend.
+ */
+struct FrontendDvbcSettingsExt1_1 {
+    FrontendCableTimeInterleaveMode interleaveMode;
+};
+
 /**
  *  Extended Signal Settings for Frontend.
  */
@@ -196,6 +221,8 @@ struct FrontendSettingsExt1_1 {
 
         FrontendAnalogSettingsExt1_1 analog;
 
+        FrontendDvbcSettingsExt1_1 dvbc;
+
         FrontendDvbsSettingsExt1_1 dvbs;
 
         FrontendDvbtSettingsExt1_1 dvbt;
@@ -366,6 +393,8 @@ safe_union FrontendModulation {
 safe_union FrontendInterleaveMode {
     @1.0::FrontendAtsc3TimeInterleaveMode atsc3;
 
+    FrontendCableTimeInterleaveMode dvbc;
+
     FrontendDtmbTimeInterleaveMode dtmb;
 };