diff --git a/khdf/liteos/model/misc/vibrator/BUILD.gn b/khdf/liteos/model/misc/vibrator/BUILD.gn index 3a5b13ba1bf9f90738efb6bd7980476ee94a2b61..6b0a52c8f3405c7abbeee6c4f482092d38810ed9 100644 --- a/khdf/liteos/model/misc/vibrator/BUILD.gn +++ b/khdf/liteos/model/misc/vibrator/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: @@ -32,6 +32,7 @@ module_switch = defined(LOSCFG_DRIVERS_HDF_VIBRATOR) module_name = "hdf_vibrator_driver" hdf_driver(module_name) { FRAMEWORKS_VIBRATOR_ROOT = "$HDF_FRAMEWORKS_PATH/model/misc/vibrator/driver" + PERIPHERAL_VIBRATOR_ROOT = "$HDF_PERIPHERAL_PATH/misc/vibrator" sources = [ "$FRAMEWORKS_VIBRATOR_ROOT/src/vibrator_driver.c", @@ -39,11 +40,11 @@ hdf_driver(module_name) { ] if (defined(LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR)) { - sources += [ "$FRAMEWORKS_VIBRATOR_ROOT/chipset/vibrator_linear_driver.c" ] + sources += [ "$PERIPHERAL_VIBRATOR_ROOT/chipset/vibrator_linear_driver.c" ] } include_dirs = [ "$FRAMEWORKS_VIBRATOR_ROOT/include", - "$FRAMEWORKS_VIBRATOR_ROOT/chipset", + "$PERIPHERAL_VIBRATOR_ROOT/chipset", ] } diff --git a/khdf/liteos/model/misc/vibrator/Makefile b/khdf/liteos/model/misc/vibrator/Makefile index ebc67f6f81f96ee3c954df58398aaefde353dce0..66cb379cc066ab78806539bbd2c7b09f57508fbf 100644 --- a/khdf/liteos/model/misc/vibrator/Makefile +++ b/khdf/liteos/model/misc/vibrator/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. All rights reserved. +# Copyright (c) 2022 Huawei Device Co., Ltd. All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: @@ -31,15 +31,16 @@ include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk MODULE_NAME := hdf_vibrator_driver FRAMEWORKS_VIBRATOR_ROOT = $(LITEOSTOPDIR)/../../drivers/framework/model/misc/vibrator/driver +PERIPHERAL_VIBRATOR_ROOT = $(LITEOSTOPDIR)/../../drivers/peripheral/misc/vibrator LOCAL_INCLUDE := $(FRAMEWORKS_VIBRATOR_ROOT)/include \ - $(FRAMEWORKS_VIBRATOR_ROOT)/chipset + $(PERIPHERAL_VIBRATOR_ROOT)/chipset LOCAL_SRCS += $(FRAMEWORKS_VIBRATOR_ROOT)/src/vibrator_driver.c \ $(FRAMEWORKS_VIBRATOR_ROOT)/src/vibrator_haptic.c ifeq ($(LOSCFG_DRIVERS_HDF_VIBRATOR_LINEAR), y) -LOCAL_SRCS += $(FRAMEWORKS_VIBRATOR_ROOT)/chipset/vibrator_linear_driver.c +LOCAL_SRCS += $(PERIPHERAL_VIBRATOR_ROOT)/chipset/vibrator_linear_driver.c endif include $(HDF_DRIVER) diff --git a/khdf/liteos/model/sensor/BUILD.gn b/khdf/liteos/model/sensor/BUILD.gn index f7e8a7babdd50d58e27855b7da58538aae015cd1..233039f5b7860174080a3293a23dff995cb97aee 100644 --- a/khdf/liteos/model/sensor/BUILD.gn +++ b/khdf/liteos/model/sensor/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: @@ -32,6 +32,7 @@ module_switch = defined(LOSCFG_DRIVERS_HDF_SENSOR) module_name = "hdf_sensor_driver" hdf_driver(module_name) { FRAMEWORKS_SENSOR_ROOT = "$HDF_FRAMEWORKS_PATH/model/sensor/driver" + PERIPHERAL_SENSOR_ROOT = "$HDF_PERIPHERAL_PATH/sensor" sources = [ "$FRAMEWORKS_SENSOR_ROOT/common/src/sensor_config_controller.c", "$FRAMEWORKS_SENSOR_ROOT/common/src/sensor_config_parser.c", @@ -43,14 +44,14 @@ hdf_driver(module_name) { sources += [ "$FRAMEWORKS_SENSOR_ROOT/accel/sensor_accel_driver.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_ACCEL_BMI160)) { - sources += [ "$FRAMEWORKS_SENSOR_ROOT/chipset/accel/accel_bmi160.c" ] + sources += [ "$PERIPHERAL_SENSOR_ROOT/chipset/accel/accel_bmi160.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_ALS)) { sources += [ "$FRAMEWORKS_SENSOR_ROOT/als/sensor_als_driver.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_ALS_BH1745)) { - sources += [ "$FRAMEWORKS_SENSOR_ROOT/chipset/als/als_bh1745.c" ] + sources += [ "$PERIPHERAL_SENSOR_ROOT/chipset/als/als_bh1745.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_BAROMETER)) { @@ -58,20 +59,20 @@ hdf_driver(module_name) { } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_BAROMETER_BMP180)) { sources += - [ "$FRAMEWORKS_SENSOR_ROOT/chipset/barometer/barometer_bmp180.c" ] + [ "$PERIPHERAL_SENSOR_ROOT/chipset/barometer/barometer_bmp180.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_PROXIMITY)) { sources += [ "$FRAMEWORKS_SENSOR_ROOT/proximity/sensor_proximity_driver.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_PROXIMITY_APDS9960)) { sources += - [ "$FRAMEWORKS_SENSOR_ROOT/chipset/proximity/proximity_apds9960.c" ] + [ "$PERIPHERAL_SENSOR_ROOT/chipset/proximity/proximity_apds9960.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_GYRO)) { sources += [ - "$FRAMEWORKS_SENSOR_ROOT/chipset/gyro/gyro_bmi160.c", "$FRAMEWORKS_SENSOR_ROOT/gyro/sensor_gyro_driver.c", + "$PERIPHERAL_SENSOR_ROOT/chipset/gyro/gyro_bmi160.c", ] } @@ -79,14 +80,14 @@ hdf_driver(module_name) { sources += [ "$FRAMEWORKS_SENSOR_ROOT/hall/sensor_hall_driver.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_HALL_AK8789)) { - sources += [ "$FRAMEWORKS_SENSOR_ROOT/chipset/hall/hall_ak8789.c" ] + sources += [ "$PERIPHERAL_SENSOR_ROOT/chipset/hall/hall_ak8789.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_MAGNETIC)) { sources += [ "$FRAMEWORKS_SENSOR_ROOT/magnetic/sensor_magnetic_driver.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_MAGNETIC_LSM303)) { - sources += [ "$FRAMEWORKS_SENSOR_ROOT/chipset/magnetic/magnetic_lsm303.c" ] + sources += [ "$PERIPHERAL_SENSOR_ROOT/chipset/magnetic/magnetic_lsm303.c" ] } if (defined(LOSCFG_DRIVERS_HDF_SENSOR_GRAVITY)) { @@ -97,18 +98,18 @@ hdf_driver(module_name) { "$FRAMEWORKS_SENSOR_ROOT/include", "$FRAMEWORKS_SENSOR_ROOT/common/include", "$FRAMEWORKS_SENSOR_ROOT/accel", - "$FRAMEWORKS_SENSOR_ROOT/chipset/accel", + "$PERIPHERAL_SENSOR_ROOT/chipset/accel", "$FRAMEWORKS_SENSOR_ROOT/als", - "$FRAMEWORKS_SENSOR_ROOT/chipset/als", + "$PERIPHERAL_SENSOR_ROOT/chipset/als", "$FRAMEWORKS_SENSOR_ROOT/barometer", - "$FRAMEWORKS_SENSOR_ROOT/chipset/barometer", + "$PERIPHERAL_SENSOR_ROOT/chipset/barometer", "$FRAMEWORKS_SENSOR_ROOT/gyro", - "$FRAMEWORKS_SENSOR_ROOT/chipset/gyro", + "$PERIPHERAL_SENSOR_ROOT/chipset/gyro", "$FRAMEWORKS_SENSOR_ROOT/hall", - "$FRAMEWORKS_SENSOR_ROOT/chipset/hall", + "$PERIPHERAL_SENSOR_ROOT/chipset/hall", "$FRAMEWORKS_SENSOR_ROOT/magnetic", - "$FRAMEWORKS_SENSOR_ROOT/chipset/magnetic", + "$PERIPHERAL_SENSOR_ROOT/chipset/magnetic", "$FRAMEWORKS_SENSOR_ROOT/proximity", - "$FRAMEWORKS_SENSOR_ROOT/chipset/proximity", + "$PERIPHERAL_SENSOR_ROOT/chipset/proximity", ] } diff --git a/khdf/liteos/model/sensor/Makefile b/khdf/liteos/model/sensor/Makefile index 220b48514b2b9c44b53ca15f2cbdff485d9a1189..f604529a9d38249c2f55d18239006ee143781cd9 100644 --- a/khdf/liteos/model/sensor/Makefile +++ b/khdf/liteos/model/sensor/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. # # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: @@ -31,21 +31,22 @@ include $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/lite.mk MODULE_NAME := hdf_sensor_driver FRAMEWORKS_SENSOR_ROOT = $(LITEOSTOPDIR)/../../drivers/framework/model/sensor/driver +PERIPHERAL_SENSOR_ROOT = $(LITEOSTOPDIR)/../../drivers/peripheral/sensor LOCAL_INCLUDE := $(FRAMEWORKS_SENSOR_ROOT)/include \ $(FRAMEWORKS_SENSOR_ROOT)/common/include \ $(FRAMEWORKS_SENSOR_ROOT)/accel \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/accel \ + $(PERIPHERAL_SENSOR_ROOT)/chipset/accel \ $(FRAMEWORKS_SENSOR_ROOT)/als \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/als \ + $(PERIPHERAL_SENSOR_ROOT)/chipset/als \ $(FRAMEWORKS_SENSOR_ROOT)/barometer \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/barometer \ + $(PERIPHERAL_SENSOR_ROOT)/chipset/barometer \ $(FRAMEWORKS_SENSOR_ROOT)/hall \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/hall \ + $(PERIPHERAL_SENSOR_ROOT)/chipset/hall \ $(FRAMEWORKS_SENSOR_ROOT)/magnetic \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/magnetic \ + $(PERIPHERAL_SENSOR_ROOT)/chipset/magnetic \ $(FRAMEWORKS_SENSOR_ROOT)/proximity \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/proximity + $(PERIPHERAL_SENSOR_ROOT)/chipset/proximity LOCAL_SRCS += $(FRAMEWORKS_SENSOR_ROOT)/common/src/sensor_config_controller.c \ $(FRAMEWORKS_SENSOR_ROOT)/common/src/sensor_config_parser.c \ @@ -54,32 +55,32 @@ LOCAL_SRCS += $(FRAMEWORKS_SENSOR_ROOT)/common/src/sensor_config_controller.c \ ifeq ($(LOSCFG_DRIVERS_HDF_SENSOR_ACCEL), y) LOCAL_SRCS += $(FRAMEWORKS_SENSOR_ROOT)/accel/sensor_accel_driver.c \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/accel/accel_bmi160.c + $(PERIPHERAL_SENSOR_ROOT)/chipset/accel/accel_bmi160.c endif ifeq ($(LOSCFG_DRIVERS_HDF_SENSOR_ALS), y) LOCAL_SRCS += $(FRAMEWORKS_SENSOR_ROOT)/als/sensor_als_driver.c \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/als/als_bh1745.c + $(PERIPHERAL_SENSOR_ROOT)/chipset/als/als_bh1745.c endif ifeq ($(LOSCFG_DRIVERS_HDF_SENSOR_BAROMETER), y) LOCAL_SRCS += $(FRAMEWORKS_SENSOR_ROOT)/barometer/sensor_barometer_driver.c \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/barometer/barometer_bmp180.c + $(PERIPHERAL_SENSOR_ROOT)/chipset/barometer/barometer_bmp180.c endif ifeq ($(LOSCFG_DRIVERS_HDF_SENSOR_HALL), y) LOCAL_SRCS += $(FRAMEWORKS_SENSOR_ROOT)/hall/sensor_hall_driver.c \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/hall/hall_ak8789.c + $(PERIPHERAL_SENSOR_ROOT)/chipset/hall/hall_ak8789.c endif ifeq ($(LOSCFG_DRIVERS_HDF_SENSOR_MAGNETIC), y) LOCAL_SRCS += $(FRAMEWORKS_SENSOR_ROOT)/magnetic/sensor_magnetic_driver.c \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/magnetic/magnetic_lsm303.c + $(PERIPHERAL_SENSOR_ROOT)/chipset/magnetic/magnetic_lsm303.c endif ifeq ($(LOSCFG_DRIVERS_HDF_SENSOR_PROXIMITY), y) LOCAL_SRCS += $(FRAMEWORKS_SENSOR_ROOT)/proximity/sensor_proximity_driver.c \ - $(FRAMEWORKS_SENSOR_ROOT)/chipset/proximity/proximity_apds9960.c + $(PERIPHERAL_SENSOR_ROOT)/chipset/proximity/proximity_apds9960.c endif ifeq ($(LOSCFG_DRIVERS_HDF_SENSOR_GRAVITY), y)