From 79efdb0fcd92a93d6c881a3d30bbb89922ac3431 Mon Sep 17 00:00:00 2001 From: zianed Date: Wed, 19 May 2021 15:22:30 +0800 Subject: [PATCH] sync code to master --- .gitattributes | 15 +++++++++++++++ .gitignore | 5 +++++ README.md | 4 ++-- README_zh.md | 4 ++-- hcs/Makefile | 23 ++++++++++++++++++----- osal/src/Makefile | 3 ++- osal/src/osal_cdev.c | 2 ++ osal/src/osal_irq.c | 2 +- osal/src/osal_mem.c | 2 +- test/Kconfig | 2 +- 10 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..51c63e2 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,15 @@ +*.tgz filter=lfs diff=lfs merge=lfs -text +*.trp filter=lfs diff=lfs merge=lfs -text +*.apk filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.mp4 filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.asm filter=lfs diff=lfs merge=lfs -text +*.8svn filter=lfs diff=lfs merge=lfs -text +*.9svn filter=lfs diff=lfs merge=lfs -text +*.dylib filter=lfs diff=lfs merge=lfs -text +*.exe filter=lfs diff=lfs merge=lfs -text +*.a filter=lfs diff=lfs merge=lfs -text +*.so filter=lfs diff=lfs merge=lfs -text +*.bin filter=lfs diff=lfs merge=lfs -text +*.dll filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9e65b91 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.cmd +*.o +*.a +*.d +*.hcb diff --git a/README.md b/README.md index a7b293b..75c6cc9 100644 --- a/README.md +++ b/README.md @@ -41,9 +41,9 @@ This repository stores the code and compilation scripts for the OpenHarmony driv [drivers\_framework](https://gitee.com/openharmony/drivers_framework/blob/master/README.md) -[drivers\_adapter\_uhdf](https://gitee.com/openharmony/drivers_adapter_uhdf/blob/master/README.md) +[drivers\_adapter](https://gitee.com/openharmony/drivers_adapter/blob/master/README.md) drivers\_adapter\_khdf\_linux -[drivers\_adapter\_khdf\_liteos](https://gitee.com/openharmony/drivers_adapter_khdf_liteos/blob/master/README.md) +drivers\_peripheral diff --git a/README_zh.md b/README_zh.md index 3767db5..a0a71d1 100644 --- a/README_zh.md +++ b/README_zh.md @@ -41,9 +41,9 @@ [drivers\_framework](https://gitee.com/openharmony/drivers_framework/blob/master/README_zh.md) -[drivers\_adapter\_uhdf](https://gitee.com/openharmony/drivers_adapter_uhdf/blob/master/README_zh.md) +[drivers\_adapter](https://gitee.com/openharmony/drivers_adapter/blob/master/README_zh.md) drivers\_adapter\_khdf\_linux -[drivers\_adapter\_khdf\_liteos](https://gitee.com/openharmony/drivers_adapter_khdf_liteos/blob/master/README_zh.md) +drivers\_peripheral diff --git a/hcs/Makefile b/hcs/Makefile index 9b91ef3..93c1758 100755 --- a/hcs/Makefile +++ b/hcs/Makefile @@ -18,7 +18,12 @@ else HCGEN_PATH := win-x86/bin/hc-gen.exe endif -SOURCE_ROOT:=$(PROJECT_ROOT) +ifeq ($(LOCAL_HCS_ROOT),) + LOCAL_HCS_ROOT := $(PRODUCT_PATH) +endif + +SOURCE_ROOT:=$(abspath ../../../../../) + HC_GEN := hc-gen BUILD_IN_HC_GEN := $(SOURCE_ROOT)/prebuilts/build-tools/$(HCGEN_PATH) ifneq ($(wildcard $(BUILD_IN_HC_GEN)),) @@ -27,11 +32,19 @@ endif LOCAL_HCS_ROOT := $(abspath $(dir $(realpath $(lastword $(MAKEFILE_LIST))))) -HCS_DIR := $(SOURCE_ROOT)/$(product_path) -ifneq ($(wildcard $(HCS_DIR)),) - HCS_DIR := $(LOCAL_HCS_ROOT) -endif +HCS_DIR := $(LOCAL_HCS_ROOT) +ifneq ($(TARGET_BOARD_PLATFORM),) + HCS_DIR := $(LOCAL_HCS_ROOT)/$(TARGET_BOARD_PLATFORM) +else + ifneq ($(CONFIG_ARCH_HI3516DV300),) + HCS_DIR := $(LOCAL_HCS_ROOT) + endif + ifneq ($(CONFIG_ARCH_HI3518EV300),) + HCS_DIR := $(LOCAL_HCS_ROOT) + endif +endif +$(info HCS_DIR = $(HCS_DIR)) HCB_FLAGS := -b -i -a HCS_OBJ := hdf_hcs_hex.o diff --git a/osal/src/Makefile b/osal/src/Makefile index a9b93be..ec83c84 100644 --- a/osal/src/Makefile +++ b/osal/src/Makefile @@ -17,5 +17,6 @@ obj-y += osal_workqueue.o osal_thread.o osal_firmware.o osal_irq.o osal_mem.o o ccflags-y += -Iinclude/hdf \ -Iinclude/hdf/osal \ -Iinclude/hdf/utils \ + -Iinclude/../drivers/hdf/framework/utils/include \ -Idrivers/hdf/khdf/osal/include \ - -I../../../../third_party/bounds_checking_function/include + -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include diff --git a/osal/src/osal_cdev.c b/osal/src/osal_cdev.c index 3f743a4..ca113ef 100644 --- a/osal/src/osal_cdev.c +++ b/osal/src/osal_cdev.c @@ -60,6 +60,7 @@ static const char* StringRfindChar(const char* str, char chr) static char* hdfDevnode(struct device* dev, umode_t* mode) { + (void)mode; return kasprintf(GFP_KERNEL, "hdf/%s", dev_name(dev)); } @@ -132,6 +133,7 @@ static int RegisterDev(struct OsalCdev* cdev, const char* devName) if (ret) { ida_simple_remove(&hdf_vnode_ids, devMinor); HDF_LOGE("failed to add hdf cdev(%s)\n", devName); + return ret; } ret = device_add(&cdev->dev); diff --git a/osal/src/osal_irq.c b/osal/src/osal_irq.c index fe48474..0b024be 100644 --- a/osal/src/osal_irq.c +++ b/osal/src/osal_irq.c @@ -34,7 +34,7 @@ int32_t OsalRegisterIrq(uint32_t irq, ret = request_threaded_irq(irq, NULL, (irq_handler_t)handle, config | IRQF_ONESHOT | IRQF_NO_SUSPEND, irq_name, data); if (ret != 0) { - HDF_LOGE("%s fail %d", __func__, ret); + HDF_LOGE("%s fail %u", __func__, ret); return HDF_FAILURE; } diff --git a/osal/src/osal_mem.c b/osal/src/osal_mem.c index a41f363..23886ce 100644 --- a/osal/src/osal_mem.c +++ b/osal/src/osal_mem.c @@ -158,7 +158,7 @@ void OsalMemFree(void *buf) else if (type == TYPE_VMALLOC) vfree(base); else - HDF_LOGE("%s block : type %d fail", __func__, type); + HDF_LOGE("%s block : type %u fail", __func__, type); } EXPORT_SYMBOL(OsalMemFree); diff --git a/test/Kconfig b/test/Kconfig index 852f474..e1c527b 100644 --- a/test/Kconfig +++ b/test/Kconfig @@ -11,7 +11,7 @@ config DRIVERS_HDF_TEST bool "Enable HDF linux test" - default y + default n depends on DRIVERS_HDF help Answer Y to enable linux support HDF test. -- Gitee