From 22b53cfe0d615d2f261dceb63e19bb6f4bd09fdb Mon Sep 17 00:00:00 2001 From: sunxuejiao Date: Wed, 25 Aug 2021 11:30:52 +0800 Subject: [PATCH 1/2] modify the security coding specification in header file Signed-off-by: sunxuejiao --- model/misc/vibrator/driver/chipset/vibrator_linear_driver.c | 4 ++-- model/misc/vibrator/driver/src/vibrator_driver.c | 4 ++-- model/misc/vibrator/driver/src/vibrator_haptic.c | 4 ++-- model/sensor/driver/accel/sensor_accel_driver.c | 4 ++-- model/sensor/driver/chipset/accel/accel_bmi160.c | 2 +- model/sensor/driver/chipset/gyro/gyro_bmi160.c | 2 +- model/sensor/driver/common/src/sensor_config_controller.c | 4 ++-- model/sensor/driver/common/src/sensor_config_parser.c | 4 ++-- model/sensor/driver/common/src/sensor_device_manager.c | 4 ++-- model/sensor/driver/common/src/sensor_platform_if.c | 4 ++-- model/sensor/driver/gyro/sensor_gyro_driver.c | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/model/misc/vibrator/driver/chipset/vibrator_linear_driver.c b/model/misc/vibrator/driver/chipset/vibrator_linear_driver.c index f58e6ecaa..6f126069e 100644 --- a/model/misc/vibrator/driver/chipset/vibrator_linear_driver.c +++ b/model/misc/vibrator/driver/chipset/vibrator_linear_driver.c @@ -6,15 +6,15 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "vibrator_linear_driver.h" +#include #include "device_resource_if.h" #include "gpio_if.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" -#include "securec.h" #include "vibrator_driver.h" #include "vibrator_driver_type.h" -#include "vibrator_linear_driver.h" #define HDF_LOG_TAG vibrator_linear_driver_c diff --git a/model/misc/vibrator/driver/src/vibrator_driver.c b/model/misc/vibrator/driver/src/vibrator_driver.c index 5e8be1847..54c311422 100644 --- a/model/misc/vibrator/driver/src/vibrator_driver.c +++ b/model/misc/vibrator/driver/src/vibrator_driver.c @@ -6,11 +6,11 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" +#include "vibrator_driver.h" +#include #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" -#include "vibrator_driver.h" #include "vibrator_haptic.h" #define HDF_LOG_TAG vibrator_driver_c diff --git a/model/misc/vibrator/driver/src/vibrator_haptic.c b/model/misc/vibrator/driver/src/vibrator_haptic.c index 9bd5ae451..2fba10f7a 100644 --- a/model/misc/vibrator/driver/src/vibrator_haptic.c +++ b/model/misc/vibrator/driver/src/vibrator_haptic.c @@ -6,13 +6,13 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" +#include "vibrator_haptic.h" +#include #include "device_resource_if.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" #include "vibrator_driver.h" -#include "vibrator_haptic.h" #define HDF_LOG_TAG vibrator_haptic_c #define VIBRATOR_HAPTIC_STACK_SIZE 0x4000 diff --git a/model/sensor/driver/accel/sensor_accel_driver.c b/model/sensor/driver/accel/sensor_accel_driver.c index ab62901fc..d7d2bab86 100644 --- a/model/sensor/driver/accel/sensor_accel_driver.c +++ b/model/sensor/driver/accel/sensor_accel_driver.c @@ -6,13 +6,13 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" +#include "sensor_accel_driver.h" +#include #include "accel_bmi160.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_math.h" #include "osal_mem.h" -#include "sensor_accel_driver.h" #include "sensor_config_controller.h" #include "sensor_device_manager.h" #include "sensor_platform_if.h" diff --git a/model/sensor/driver/chipset/accel/accel_bmi160.c b/model/sensor/driver/chipset/accel/accel_bmi160.c index afb0755d0..6dba2d6e5 100644 --- a/model/sensor/driver/chipset/accel/accel_bmi160.c +++ b/model/sensor/driver/chipset/accel/accel_bmi160.c @@ -6,8 +6,8 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" #include "accel_bmi160.h" +#include #include "osal_time.h" #include "sensor_accel_driver.h" #include "sensor_config_controller.h" diff --git a/model/sensor/driver/chipset/gyro/gyro_bmi160.c b/model/sensor/driver/chipset/gyro/gyro_bmi160.c index f044a6503..e4a8c3665 100644 --- a/model/sensor/driver/chipset/gyro/gyro_bmi160.c +++ b/model/sensor/driver/chipset/gyro/gyro_bmi160.c @@ -6,8 +6,8 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" #include "gyro_bmi160.h" +#include #include "osal_time.h" #include "sensor_gyro_driver.h" #include "sensor_config_controller.h" diff --git a/model/sensor/driver/common/src/sensor_config_controller.c b/model/sensor/driver/common/src/sensor_config_controller.c index 777aac60a..2c54ff260 100644 --- a/model/sensor/driver/common/src/sensor_config_controller.c +++ b/model/sensor/driver/common/src/sensor_config_controller.c @@ -6,10 +6,10 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" +#include "sensor_config_controller.h" +#include #include "osal_mem.h" #include "osal_time.h" -#include "sensor_config_controller.h" #include "sensor_platform_if.h" #define HDF_LOG_TAG sensor_config_controller_c diff --git a/model/sensor/driver/common/src/sensor_config_parser.c b/model/sensor/driver/common/src/sensor_config_parser.c index c844da6f8..7a4d9a878 100644 --- a/model/sensor/driver/common/src/sensor_config_parser.c +++ b/model/sensor/driver/common/src/sensor_config_parser.c @@ -6,10 +6,10 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" +#include "sensor_config_parser.h" +#include #include "device_resource_if.h" #include "osal_mem.h" -#include "sensor_config_parser.h" #include "sensor_platform_if.h" #define HDF_LOG_TAG sensor_config_parser_c diff --git a/model/sensor/driver/common/src/sensor_device_manager.c b/model/sensor/driver/common/src/sensor_device_manager.c index 45d6c7b75..a6586de04 100644 --- a/model/sensor/driver/common/src/sensor_device_manager.c +++ b/model/sensor/driver/common/src/sensor_device_manager.c @@ -6,12 +6,12 @@ * See the LICENSE file in the root of this repository for complete details. */ +#include "sensor_device_manager.h" #include "asm/io.h" -#include "securec.h" +#include #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_mem.h" -#include "sensor_device_manager.h" #include "sensor_platform_if.h" #define HDF_LOG_TAG sensor_device_manager_c diff --git a/model/sensor/driver/common/src/sensor_platform_if.c b/model/sensor/driver/common/src/sensor_platform_if.c index fe7e81f6d..1035a4dd0 100644 --- a/model/sensor/driver/common/src/sensor_platform_if.c +++ b/model/sensor/driver/common/src/sensor_platform_if.c @@ -6,10 +6,10 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" +#include "sensor_platform_if.h" +#include #include "osal_io.h" #include "osal_time.h" -#include "sensor_platform_if.h" #define HDF_LOG_TAG sensor_platform_if_c diff --git a/model/sensor/driver/gyro/sensor_gyro_driver.c b/model/sensor/driver/gyro/sensor_gyro_driver.c index 290b0f4c5..3e827ae35 100644 --- a/model/sensor/driver/gyro/sensor_gyro_driver.c +++ b/model/sensor/driver/gyro/sensor_gyro_driver.c @@ -6,13 +6,13 @@ * See the LICENSE file in the root of this repository for complete details. */ -#include "securec.h" +#include "sensor_gyro_driver.h" +#include #include "gyro_bmi160.h" #include "hdf_base.h" #include "hdf_device_desc.h" #include "osal_math.h" #include "osal_mem.h" -#include "sensor_gyro_driver.h" #include "sensor_config_controller.h" #include "sensor_device_manager.h" #include "sensor_platform_if.h" -- Gitee From e575dc2d12d2252f43516d07b6bc87b6f4043282 Mon Sep 17 00:00:00 2001 From: sunxuejiao Date: Wed, 25 Aug 2021 16:06:45 +0800 Subject: [PATCH 2/2] modify the security coding specification in header file Signed-off-by: sunxuejiao --- model/sensor/driver/common/include/sensor_device_manager.h | 2 ++ model/sensor/driver/common/src/sensor_device_manager.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/model/sensor/driver/common/include/sensor_device_manager.h b/model/sensor/driver/common/include/sensor_device_manager.h index 2237b12fe..bea574679 100644 --- a/model/sensor/driver/common/include/sensor_device_manager.h +++ b/model/sensor/driver/common/include/sensor_device_manager.h @@ -9,6 +9,8 @@ #ifndef SENSOR_DEVICE_MANAGER_H #define SENSOR_DEVICE_MANAGER_H +#include "hdf_base.h" +#include "hdf_device_desc.h" #include "hdf_workqueue.h" #include "osal_mutex.h" #include "sensor_device_type.h" diff --git a/model/sensor/driver/common/src/sensor_device_manager.c b/model/sensor/driver/common/src/sensor_device_manager.c index a6586de04..8c3389392 100644 --- a/model/sensor/driver/common/src/sensor_device_manager.c +++ b/model/sensor/driver/common/src/sensor_device_manager.c @@ -7,10 +7,8 @@ */ #include "sensor_device_manager.h" -#include "asm/io.h" #include -#include "hdf_base.h" -#include "hdf_device_desc.h" +#include "asm/io.h" #include "osal_mem.h" #include "sensor_platform_if.h" -- Gitee