未验证 提交 4acf1e9f 编写于 作者: O openharmony_ci 提交者: Gitee

!896 feat: normalize drivers framework component and repos

Merge pull request !896 from yuanbo/master
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
include $(LITEOSTOPDIR)/config.mk include $(LITEOSTOPDIR)/config.mk
include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk
MODULE_NAME := usb_base MODULE_NAME := usb_base
...@@ -122,13 +122,13 @@ LOCAL_SRCS += $(STORAGE_SRC)/umass.c ...@@ -122,13 +122,13 @@ LOCAL_SRCS += $(STORAGE_SRC)/umass.c
endif endif
ifeq ($(LOSCFG_DRIVERS_USB_HID_CLASS)_$(LOSCFG_DRIVERS_HDF_INPUT), y_y) ifeq ($(LOSCFG_DRIVERS_USB_HID_CLASS)_$(LOSCFG_DRIVERS_HDF_INPUT), y_y)
LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/framework/model/input/driver \ LOCAL_FLAGS += -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/model/input/driver \
-I$(LITEOSTOPDIR)/../../drivers/framework/include/core \ -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/core \
-I$(LITEOSTOPDIR)/../../drivers/framework/core/common/include/host \ -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/core/common/include/host \
-I$(LITEOSTOPDIR)/../../drivers/framework/utils \ -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/utils \
-I$(LITEOSTOPDIR)/../../drivers/framework/osal \ -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/osal \
-I$(LITEOSTOPDIR)/../../drivers/framework/ability/sbuf/include \ -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/ability/sbuf/include \
-I$(LITEOSTOPDIR)/../../drivers/framework/include/osal \ -I$(LITEOSTOPDIR)/../../drivers/hdf_core/framework/include/osal \
-I$(LITEOSTOPDIR)/../../third_party/FreeBSD/sys/dev/evdev -I$(LITEOSTOPDIR)/../../third_party/FreeBSD/sys/dev/evdev
LOCAL_SRCS += $(INPUT_SRC)/uhid.c \ LOCAL_SRCS += $(INPUT_SRC)/uhid.c \
......
...@@ -5,7 +5,7 @@ config DRIVERS ...@@ -5,7 +5,7 @@ config DRIVERS
Answer Y to enable LiteOS support driver. Answer Y to enable LiteOS support driver.
source "bsd/dev/usb/Kconfig" source "bsd/dev/usb/Kconfig"
source "../../drivers/adapter/khdf/liteos/Kconfig" source "../../drivers/hdf_core/adapter/khdf/liteos/Kconfig"
# Device driver Kconfig import # Device driver Kconfig import
source "$(DEVICE_PATH)/drivers/Kconfig" source "$(DEVICE_PATH)/drivers/Kconfig"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
include $(LITEOSTOPDIR)/config.mk include $(LITEOSTOPDIR)/config.mk
include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/lite.mk
MODULE_NAME := $(notdir $(shell pwd)) MODULE_NAME := $(notdir $(shell pwd))
......
...@@ -31,7 +31,7 @@ import("$root_out_dir/config.gni") ...@@ -31,7 +31,7 @@ import("$root_out_dir/config.gni")
LITEOSTOPDIR = "//kernel/liteos_a" LITEOSTOPDIR = "//kernel/liteos_a"
LITEOSTHIRDPARTY = "//third_party" LITEOSTHIRDPARTY = "//third_party"
HDFTOPDIR = "//drivers/adapter/khdf/liteos" HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos"
ARCH = "" ARCH = ""
if (defined(LOSCFG_ARCH_ARM_AARCH32)) { if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
......
...@@ -355,7 +355,7 @@ endif ...@@ -355,7 +355,7 @@ endif
LITEOS_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../drivers/liteos LITEOS_DRIVERS_BASE_PATH := $(LITEOSTOPDIR)/../../drivers/liteos
################################## Driver Option Begin ################################# ################################## Driver Option Begin #################################
ifeq ($(LOSCFG_DRIVERS_HDF), y) ifeq ($(LOSCFG_DRIVERS_HDF), y)
include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/hdf_lite.mk include $(LITEOSTOPDIR)/../../drivers/hdf_core/adapter/khdf/liteos/hdf_lite.mk
endif endif
ifeq ($(LOSCFG_DRIVERS_HIEVENT), y) ifeq ($(LOSCFG_DRIVERS_HIEVENT), y)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册