From 2ccbf751ab0b1d31f01ef9f55119e567307e146e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Mon, 27 Nov 2023 18:59:55 +0800 Subject: [PATCH 1/4] testStartOnce --- framework/model/misc/vibrator/driver/src/vibrator_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/model/misc/vibrator/driver/src/vibrator_driver.c b/framework/model/misc/vibrator/driver/src/vibrator_driver.c index 2eac1ef8c..0cbcbe53d 100644 --- a/framework/model/misc/vibrator/driver/src/vibrator_driver.c +++ b/framework/model/misc/vibrator/driver/src/vibrator_driver.c @@ -17,6 +17,7 @@ #define VIBRATOR_WORK_QUEUE_NAME "vibrator_queue" #define VIBRATOR_START_TIME 10 +#define HDF_ERR_INVALID_PARAM_TEST 99995 struct VibratorDriverData *g_vibratorDrvData = NULL; @@ -138,7 +139,7 @@ static int32_t StartOnce(struct HdfSBuf *data, struct HdfSBuf *reply) if (duration == 0) { HDF_LOGE("%s: vibrator duration invalid para!", __func__); - return HDF_ERR_INVALID_PARAM; + return HDF_ERR_INVALID_PARAM_TEST; } if (drvData->mode != VIBRATOR_MODE_BUTT) { -- Gitee From 8ab707671cf0c5178f2cc60607179e4c8282803c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Mon, 27 Nov 2023 19:54:32 +0800 Subject: [PATCH 2/4] testStartOnce --- framework/model/misc/vibrator/driver/src/vibrator_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/framework/model/misc/vibrator/driver/src/vibrator_driver.c b/framework/model/misc/vibrator/driver/src/vibrator_driver.c index 0cbcbe53d..a84f9997a 100644 --- a/framework/model/misc/vibrator/driver/src/vibrator_driver.c +++ b/framework/model/misc/vibrator/driver/src/vibrator_driver.c @@ -17,7 +17,6 @@ #define VIBRATOR_WORK_QUEUE_NAME "vibrator_queue" #define VIBRATOR_START_TIME 10 -#define HDF_ERR_INVALID_PARAM_TEST 99995 struct VibratorDriverData *g_vibratorDrvData = NULL; @@ -137,11 +136,6 @@ static int32_t StartOnce(struct HdfSBuf *data, struct HdfSBuf *reply) return HDF_FAILURE; } - if (duration == 0) { - HDF_LOGE("%s: vibrator duration invalid para!", __func__); - return HDF_ERR_INVALID_PARAM_TEST; - } - if (drvData->mode != VIBRATOR_MODE_BUTT) { HDF_LOGI("%s: vibrater haptic is busy now, please stop first!", __func__); return HDF_ERR_DEVICE_BUSY; -- Gitee From 1e33e16fbf27f26896baf47cb0650957b86c902d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Mon, 27 Nov 2023 20:54:04 +0800 Subject: [PATCH 3/4] testStartOnce --- framework/model/misc/vibrator/driver/src/vibrator_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/framework/model/misc/vibrator/driver/src/vibrator_driver.c b/framework/model/misc/vibrator/driver/src/vibrator_driver.c index a84f9997a..f1dac8bee 100644 --- a/framework/model/misc/vibrator/driver/src/vibrator_driver.c +++ b/framework/model/misc/vibrator/driver/src/vibrator_driver.c @@ -136,6 +136,10 @@ static int32_t StartOnce(struct HdfSBuf *data, struct HdfSBuf *reply) return HDF_FAILURE; } + if (duration == 0) { + HDF_LOGI("%{public}s: vibrator duration is 0, but i make it not return!", __func__); + } + if (drvData->mode != VIBRATOR_MODE_BUTT) { HDF_LOGI("%s: vibrater haptic is busy now, please stop first!", __func__); return HDF_ERR_DEVICE_BUSY; -- Gitee From 31b52e44992c2fa52f3e475be9905f13da2a1563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E9=B9=8F=E8=BE=89?= Date: Tue, 28 Nov 2023 09:05:43 +0800 Subject: [PATCH 4/4] testStartOnce --- framework/model/misc/vibrator/driver/src/vibrator_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/model/misc/vibrator/driver/src/vibrator_driver.c b/framework/model/misc/vibrator/driver/src/vibrator_driver.c index f1dac8bee..4b1221c59 100644 --- a/framework/model/misc/vibrator/driver/src/vibrator_driver.c +++ b/framework/model/misc/vibrator/driver/src/vibrator_driver.c @@ -12,6 +12,7 @@ #include "hdf_device_desc.h" #include "osal_mem.h" #include "vibrator_haptic.h" +#include "hdf_log.h" #define HDF_LOG_TAG khdf_vibrator_driver -- Gitee