From e26584a4d7ddefbbe653c674ef343b7c13765f8b Mon Sep 17 00:00:00 2001
From: ygopenhm <ygopenhm@vyagoo.com>
Date: Wed, 16 Mar 2022 11:42:44 +0800
Subject: [PATCH] Add xr829 And fix compile err

Signed-off-by: ygopenhm <ygopenhm@vyagoo.com>
Change-Id: I908fc6b86d9511162ffdaa6ed435749ec90bea44
---
 manager/Makefile                   | 1 +
 model/audio/Makefile               | 2 +-
 model/input/Makefile               | 3 ++-
 model/network/wifi/Kconfig         | 7 +++++++
 model/network/wifi/vendor/Makefile | 3 +++
 test/Makefile                      | 3 ++-
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/manager/Makefile b/manager/Makefile
index 9f5022d..73e73aa 100644
--- a/manager/Makefile
+++ b/manager/Makefile
@@ -69,6 +69,7 @@ obj-y += \
         $(SEC_FUNCTION_OBJECTS)
 
 ccflags-y += \
+       -Wno-strict-prototypes \
        -I$(srctree)/drivers/hdf/framework/include \
        -I$(srctree)/drivers/hdf/framework/include/osal \
        -I$(srctree)/drivers/hdf/framework/include/utils \
diff --git a/model/audio/Makefile b/model/audio/Makefile
index dd5c7e8..c94407f 100644
--- a/model/audio/Makefile
+++ b/model/audio/Makefile
@@ -60,7 +60,7 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO_RK3568) += \
           $(KHDF_AUDIO_RK3568_DIR)/soc/src/rk3568_dma_adapter.o \
           $(KHDF_AUDIO_RK3568_DIR)/soc/src/rk3568_dma_ops.o
 
-ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Werror\
+ccflags-$(CONFIG_DRIVERS_HDF_AUDIO) += -lm -lc -lgcc -std=gnu99 -Wall\
              -I$(srctree)/$(KHDF_AUDIO_KHDF_ROOT_DIR)/osal/include \
              -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/core \
              -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/utils \
diff --git a/model/input/Makefile b/model/input/Makefile
index 52eae07..7efd34f 100644
--- a/model/input/Makefile
+++ b/model/input/Makefile
@@ -28,7 +28,8 @@ obj-$(CONFIG_DRIVERS_HDF_TP_5P5_GT911) += \
 obj-$(CONFIG_DRIVERS_HDF_TP_2P35_FT6236) += \
               $(INPUT_ROOT_DIR)/touchscreen/touch_ft6336.o
 
-ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/input/driver \
+ccflags-y +=-std=gnu99 \
+            -I$(srctree)/drivers/hdf/framework/model/input/driver \
             -I$(srctree)/drivers/hdf/framework/model/input/driver/input_bus_ops \
             -I$(srctree)/drivers/hdf/framework/include/core \
             -I$(srctree)/drivers/hdf/framework/core/common/include/host \
diff --git a/model/network/wifi/Kconfig b/model/network/wifi/Kconfig
index 7d893dd..9187cb0 100644
--- a/model/network/wifi/Kconfig
+++ b/model/network/wifi/Kconfig
@@ -12,6 +12,13 @@ config DRIVERS_HI3881
     help
       Answer Y to enable hi3881 wifi chip driver.
 
+config DRIVERS_XR829
+    bool "Enable xr829"
+    default n
+    depends on DRIVERS_HDF_WIFI
+        select DRIVERS_HDF_NETDEV_EXT
+    help
+      Answer Y to enable hi3881 wifi chip driver.
 
 config DRIVERS_HDF_NETDEV_EXT
     bool "Get Linux net device from HDF"
diff --git a/model/network/wifi/vendor/Makefile b/model/network/wifi/vendor/Makefile
index fa87955..b866ccf 100644
--- a/model/network/wifi/vendor/Makefile
+++ b/model/network/wifi/vendor/Makefile
@@ -30,6 +30,9 @@ ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \
 
 obj-$(CONFIG_DRIVERS_HI3881) += hi3881/
 
+obj-$(CONFIG_DRIVERS_XR829) += xr829_hdfadapter/
+obj-$(CONFIG_DRIVERS_XR829) += xr829_core/
+
 ifneq ($(CONFIG_AP6XXX_WIFI6_HDF),)
 RKWIFI_PATH := $(HDF_VENDOR_PREFIX)/device/$(product_company)/$(product_device)/wifi
 obj-$(CONFIG_AP6XXX_WIFI6_HDF) += $(RKWIFI_PATH)/
diff --git a/test/Makefile b/test/Makefile
index c9b359f..df3c19a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -96,7 +96,8 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO_TEST) += $(HDF_FRAMWORK_TEST_ROOT)/model/audio/sr
                                         $(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hi3516_codec_impl_test.o \
                                         $(HDF_CODEC_DRIVER_TEST_ROOT)/model/hi3516dv300/src/hi3516_aiao_impl_test.o
 
-ccflags-y += -I$(srctree)/drivers/hdf/framework/include \
+ccflags-y += -Wno-strict-prototypes \
+             -I$(srctree)/drivers/hdf/framework/include \
              -I$(srctree)/drivers/hdf/framework/include/osal \
              -I$(srctree)/drivers/hdf/framework/include/utils \
              -I$(srctree)/drivers/hdf/framework/include \
-- 
Gitee