From 1497156eb51fc7fd36dd3bf6cde82cea538117fb Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Fri, 10 Feb 2023 22:19:48 +0100
Subject: [PATCH] Remove types-silabs.xml (#24976)

* Remove types-silabs.xml

* Update generated code
---
 .github/workflows/tests.yaml                  |  1 -
 src/app/zap-templates/zcl/data-model/all.xml  |  1 -
 .../zcl/data-model/silabs/types-silabs.xml    | 48 -------------------
 .../zcl/zcl-with-test-extensions.json         |  1 -
 src/app/zap-templates/zcl/zcl.json            |  1 -
 .../CHIP/templates/availability.yaml          |  2 +-
 .../app-common/zap-generated/enums.h          |  6 ---
 7 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index e0f6a5d90c83a5..08176a52890f4f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -186,7 +186,6 @@ jobs:
                       src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
                       src/app/zap-templates/zcl/data-model/silabs/ha-devices.xml \
                       src/app/zap-templates/zcl/data-model/silabs/lo-devices.xml \
-                      src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml \
                       src/app/zap-templates/zcl/data-model/silabs/zll-devices.xml \
                     "
             - name: Build Apps
diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index 8d9da386fbed1d..b05c47025c6b5f 100644
--- a/src/app/zap-templates/zcl/data-model/all.xml
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -77,6 +77,5 @@
    <xi:include href="draft/onoff-switch-configuration-cluster.xml" />
    <xi:include href="silabs/ha-devices.xml" />
    <xi:include href="silabs/lo-devices.xml" />
-   <xi:include href="silabs/types-silabs.xml" />
    <xi:include href="silabs/zll-devices.xml" />
 </all>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
deleted file mode 100644
index 7b3cdee16e6ed9..00000000000000
--- a/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Copyright (c) 2008,2020 Silicon Labs.
-
-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.
--->
-<configurator>
-  <enum name="OperatingMode" type="ENUM8">
-    <item name="normal" value="0x0"/>
-    <item name="configure" value="0x1"/>
-  </enum>
-  <enum name="AnonymousDataState" type="ENUM8">
-    <item name="NoSourceFound" value="0x0"/>
-    <item name="SourceFound" value="0x1"/>
-  </enum>
-  <struct name="Notification">
-    <item name="contentId" type="INT16U"/>
-    <item name="statusFeedback" type="ENUM8"/>
-  </struct>
-  <enum name="RemoteEnableFlags" type="ENUM8">
-    <item name="Disabled" value="0x00"/>
-    <item name="TemporarilyLockedDisabled" value="0x07"/>
-    <item name="EnabledRemoteControl" value="0x0F"/>
-    <item name="EnabledRemoteAndEnergyControl" value="0x01"/>
-  </enum>
-  <enum name="DeviceStatus2Structure" type="ENUM8">
-    <item name="IrisSymptomCode" value="0x20"/>
-  </enum>
-  <bitmap name="StartTime" type="BITMAP16">
-    <field name="Minutes" mask="0x003F"/>
-    <field name="TimeEncoding" mask="0x00C0"/>
-    <field name="Hours" mask="0xFF00"/>
-  </bitmap>
-  <enum name="TimeEncoding" type="ENUM8">
-    <item name="Relative" value="0x00"/>
-    <item name="Absolute" value="0x40"/>
-  </enum>
-</configurator>
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 80002a7e8b516c..8e4d7270f627a5 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -13,7 +13,6 @@
     "xmlFile": [
         "access-control-definitions.xml",
         "chip-types.xml",
-        "types-silabs.xml",
         "access-control-cluster.xml",
         "account-login-cluster.xml",
         "administrator-commissioning-cluster.xml",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 9e4d0a5384c028..60f1eb1e6280bc 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -12,7 +12,6 @@
     "xmlFile": [
         "access-control-definitions.xml",
         "chip-types.xml",
-        "types-silabs.xml",
         "access-control-cluster.xml",
         "account-login-cluster.xml",
         "administrator-commissioning-cluster.xml",
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 57d4dca7928975..656e472aeb75ed 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -6001,7 +6001,7 @@
               - DlOperationSource
               - DlUserStatus
               - DlUserType
-              # The enums after this come from the silabs types-silabs.xml, not the
+              # The enums after this come from the draft/types/door-lock.xml, not the
               # door lock cluster XML
               #
               # DoorLockUserStatus is not marked deprecated here because the
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h
index 1492f34440ce89..b1ef3423aeca0f 100644
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/enums.h
@@ -796,12 +796,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_SIMPLE_BITMAP_VALUE_C_OFFSET (2)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_FEATURE_WATER_MARKS (1)
 #define EMBER_AF_SOFTWARE_DIAGNOSTICS_FEATURE_WATER_MARKS_OFFSET (0)
-#define EMBER_AF_START_TIME_MINUTES (63)
-#define EMBER_AF_START_TIME_MINUTES_OFFSET (0)
-#define EMBER_AF_START_TIME_TIME_ENCODING (192)
-#define EMBER_AF_START_TIME_TIME_ENCODING_OFFSET (6)
-#define EMBER_AF_START_TIME_HOURS (65280)
-#define EMBER_AF_START_TIME_HOURS_OFFSET (8)
 #define EMBER_AF_SUPPORTED_STREAMING_PROTOCOL_DASH (1)
 #define EMBER_AF_SUPPORTED_STREAMING_PROTOCOL_DASH_OFFSET (0)
 #define EMBER_AF_SUPPORTED_STREAMING_PROTOCOL_HLS (2)