From f0d44e1c6e63962a2626f0397f2cf0b5419ab99f Mon Sep 17 00:00:00 2001
From: Vikram Dattu <vikram.dattu@espressif.com>
Date: Fri, 22 Sep 2023 11:45:36 +0530
Subject: [PATCH] mfi_i2c: Added support for C2 and C6

- Also extended CI for IDF v5.1 and chipsets ESP32C2 and ESP32C6
- H2 is not added as it is BLE+Thread (No Wi-Fi) chip
---
 .gitlab-ci.yml                                | 12 ++++++++---
 .../esp_hap_platform/src/esp_mfi_i2c.c        | 21 +++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92a5828..d1ce78d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,13 +3,13 @@ stages:
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  
+
 .build_template:
   stage: build
   image: espressif/idf:latest
   tags:
     - build
-    
+
   variables:
     EXAMPLES: "aws-iot bridge data_tlv8 emulator fan lightbulb smart_outlet"
     EXAMPLE_TARGETS: "esp32 esp32c3 esp32s3"
@@ -33,7 +33,7 @@ variables:
     - chmod 600 ~/.ssh/id_rsa
     - echo -e "Host gitlab.espressif.cn\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
 
-  script: 
+  script:
     - for EXAMPLE in $EXAMPLES; do
     - cd $CI_PROJECT_DIR/examples/$EXAMPLE
     - echo Building $EXAMPLE
@@ -89,3 +89,9 @@ build_idf_v5.0:
   image: espressif/idf:release-v5.0
   variables:
     EXAMPLE_TARGETS: "esp32 esp32s2 esp32c3 esp32s3"
+
+build_idf_v5.1:
+  extends: .build_template
+  image: espressif/idf:release-v5.1
+  variables:
+    EXAMPLE_TARGETS: "esp32 esp32s2 esp32c3 esp32s3 esp32c2 esp32c6"
diff --git a/components/homekit/esp_hap_platform/src/esp_mfi_i2c.c b/components/homekit/esp_hap_platform/src/esp_mfi_i2c.c
index b39fc09..91178a7 100644
--- a/components/homekit/esp_hap_platform/src/esp_mfi_i2c.c
+++ b/components/homekit/esp_hap_platform/src/esp_mfi_i2c.c
@@ -25,18 +25,21 @@
 #include <stdio.h>
 #include <sys/errno.h>
 #include <sdkconfig.h>
-#ifdef CONFIG_IDF_TARGET_ESP32S2
+
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/rom/ets_sys.h"
-#else
-#ifdef CONFIG_IDF_TARGET_ESP32C3
-#include "esp32c3/rom/ets_sys.h"
-#else
-#ifdef CONFIG_IDF_TARGET_ESP32S3
+#elif CONFIG_IDF_TARGET_ESP32S3
 #include "esp32s3/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32C3
+#include "esp32c3/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32C2
+#include "esp32c2/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32C6
+#include "esp32c6/rom/ets_sys.h"
 #else
-#include "esp32/rom/ets_sys.h"
-#endif
-#endif
+#error "please include ets_sys.h"
 #endif
 
 #ifdef CONFIG_I2C_SOFTWARE