diff --git a/model/misc/vibrator/Makefile b/model/misc/vibrator/Makefile index 9c8a233ec7b8f05baac0a2894834845581f10aa0..46f1d0fffba8c6212227cf9dd47651c5c0e3d527 100644 --- a/model/misc/vibrator/Makefile +++ b/model/misc/vibrator/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2022 Huawei Device Co., Ltd. # # This software is licensed under the terms of the GNU General Public # License version 2, as published by the Free Software Foundation, and @@ -13,16 +13,17 @@ # VIBRATOR_ROOT_DIR = ../../../../../../framework/model/misc/vibrator/driver +VIBRATOR_ROOT_CHIPSET = ../../../../../../peripheral/misc/vibrator obj-$(CONFIG_DRIVERS_HDF_VIBRATOR) += \ $(VIBRATOR_ROOT_DIR)/src/vibrator_driver.o \ $(VIBRATOR_ROOT_DIR)/src/vibrator_haptic.o obj-$(CONFIG_DRIVERS_HDF_VIBRATOR_LINEAR) += \ - $(VIBRATOR_ROOT_DIR)/chipset/vibrator_linear_driver.o + $(VIBRATOR_ROOT_CHIPSET)/chipset/vibrator_linear_driver.o ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/misc/vibrator/driver/include \ - -I$(srctree)/drivers/hdf/framework/model/misc/vibrator/driver/chipset \ + -I$(srctree)/drivers/hdf/peripheral/misc/vibrator/chipset \ -I$(srctree)/drivers/hdf/framework/include/core \ -I$(srctree)/drivers/hdf/framework/core/common/include/host \ -I$(srctree)/drivers/hdf/framework/include/utils \ diff --git a/model/sensor/Makefile b/model/sensor/Makefile index 2134978e99bb718d2a522ea89a02d4a9e2d7fee0..0cbe4cb7529046282f1d9ce826d5bf203a194746 100755 --- a/model/sensor/Makefile +++ b/model/sensor/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2022 Huawei Device Co., Ltd. # # This software is licensed under the terms of the GNU General Public # License version 2, as published by the Free Software Foundation, and @@ -10,6 +10,7 @@ # GNU General Public License for more details. SENSOR_ROOT_DIR = ../../../../../framework/model/sensor/driver +SENSOR_ROOT_CHIPSET = ../../../../../peripheral/sensor obj-$(CONFIG_DRIVERS_HDF_SENSOR) += \ $(SENSOR_ROOT_DIR)/common/src/sensor_config_controller.o \ @@ -20,67 +21,67 @@ obj-$(CONFIG_DRIVERS_HDF_SENSOR) += \ obj-$(CONFIG_DRIVERS_HDF_SENSOR_ACCEL) += $(SENSOR_ROOT_DIR)/accel/sensor_accel_driver.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_ACCEL_BMI160) += $(SENSOR_ROOT_DIR)/chipset/accel/accel_bmi160.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_ACCEL_BMI160) += $(SENSOR_ROOT_CHIPSET)/chipset/accel/accel_bmi160.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_ACCEL_MXC6655XA) += $(SENSOR_ROOT_DIR)/chipset/accel/accel_mxc6655xa.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_ACCEL_MXC6655XA) += $(SENSOR_ROOT_CHIPSET)/chipset/accel/accel_mxc6655xa.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_PPG) += $(SENSOR_ROOT_DIR)/ppg/sensor_ppg_driver.o \ $(SENSOR_ROOT_DIR)/ppg/sensor_ppg_config.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_PPG_CS1262) += $(SENSOR_ROOT_DIR)/chipset/ppg/ppg_cs1262_spi.o \ - $(SENSOR_ROOT_DIR)/chipset/ppg/ppg_cs1262.o \ - $(SENSOR_ROOT_DIR)/chipset/ppg/ppg_cs1262_fw.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_PPG_CS1262) += $(SENSOR_ROOT_CHIPSET)/chipset/ppg/ppg_cs1262_spi.o \ + $(SENSOR_ROOT_CHIPSET)/chipset/ppg/ppg_cs1262.o \ + $(SENSOR_ROOT_CHIPSET)/chipset/ppg/ppg_cs1262_fw.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_ALS) += $(SENSOR_ROOT_DIR)/als/sensor_als_driver.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_ALS_BH1745) += $(SENSOR_ROOT_DIR)/chipset/als/als_bh1745.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_ALS_BH1745) += $(SENSOR_ROOT_CHIPSET)/chipset/als/als_bh1745.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_PROXIMITY) += $(SENSOR_ROOT_DIR)/proximity/sensor_proximity_driver.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_PROXIMITY_APDS9960) += $(SENSOR_ROOT_DIR)/chipset/proximity/proximity_apds9960.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_PROXIMITY_APDS9960) += $(SENSOR_ROOT_CHIPSET)/chipset/proximity/proximity_apds9960.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_GYRO) += $(SENSOR_ROOT_DIR)/gyro/sensor_gyro_driver.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_GYRO_BMI160) += $(SENSOR_ROOT_DIR)/chipset/gyro/gyro_bmi160.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_GYRO_BMI160) += $(SENSOR_ROOT_CHIPSET)/chipset/gyro/gyro_bmi160.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_BAROMETER) += $(SENSOR_ROOT_DIR)/barometer/sensor_barometer_driver.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_BAROMETER_BMP180) += $(SENSOR_ROOT_DIR)/chipset/barometer/barometer_bmp180.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_BAROMETER_BMP180) += $(SENSOR_ROOT_CHIPSET)/chipset/barometer/barometer_bmp180.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_HALL) += $(SENSOR_ROOT_DIR)/hall/sensor_hall_driver.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_HALL_AK8789) += $(SENSOR_ROOT_DIR)/chipset/hall/hall_ak8789.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_HALL_AK8789) += $(SENSOR_ROOT_CHIPSET)/chipset/hall/hall_ak8789.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_MAGNETIC) += $(SENSOR_ROOT_DIR)/magnetic/sensor_magnetic_driver.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_MAGNETIC_LSM303) += $(SENSOR_ROOT_DIR)/chipset/magnetic/magnetic_lsm303.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_MAGNETIC_LSM303) += $(SENSOR_ROOT_CHIPSET)/chipset/magnetic/magnetic_lsm303.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_GRAVITY) += $(SENSOR_ROOT_DIR)/accel/sensor_gravity_driver.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_PEDOMETER) += $(SENSOR_ROOT_DIR)/pedometer/sensor_pedometer_driver.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_PEDOMETER_BMI160) += $(SENSOR_ROOT_DIR)/chipset/pedometer/pedometer_bmi160.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_PEDOMETER_BMI160) += $(SENSOR_ROOT_CHIPSET)/chipset/pedometer/pedometer_bmi160.o ccflags-y += -I$(srctree)/drivers/hdf/framework/model/sensor/driver/include \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/common/include \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/accel \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/accel \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/accel \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/ppg \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/ppg \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/ppg \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/als \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/als \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/als \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/gyro \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/gyro \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/gyro \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/pedometer \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/pedometer \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/pedometer \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/barometer \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/barometer \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/barometer \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/hall \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/hall \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/magnetic \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/hall \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/magnetic \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/magnetic \ -I$(srctree)/drivers/hdf/framework/model/sensor/driver/proximity \ - -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/proximity \ + -I$(srctree)/drivers/hdf/peripheral/sensor/chipset/proximity \ -I$(srctree)/drivers/hdf/framework/include/core \ -I$(srctree)/drivers/hdf/framework/core/common/include/host \ -I$(srctree)/drivers/hdf/framework/include/utils \