diff --git a/model/misc/vibrator/driver/src/vibrator_driver.c b/model/misc/vibrator/driver/src/vibrator_driver.c index 9d47a1be9bbfa56fa6e6f374e99325acd8dbc405..5e8be1847f868c09bc1d44e7707f3550c76879b3 100644 --- a/model/misc/vibrator/driver/src/vibrator_driver.c +++ b/model/misc/vibrator/driver/src/vibrator_driver.c @@ -291,9 +291,16 @@ int32_t InitVibratorDriver(struct HdfDeviceObject *device) void ReleaseVibratorDriver(struct HdfDeviceObject *device) { - struct VibratorDriverData *drvData = (struct VibratorDriverData *)device->service; - if (device == NULL || drvData == NULL) { - HDF_LOGE("%s: pointer is null and return errno", __func__); + struct VibratorDriverData *drvData = NULL; + + if (device == NULL) { + HDF_LOGE("%s: device is null", __func__); + return; + } + + drvData = (struct VibratorDriverData *)device->service; + if (drvData == NULL) { + HDF_LOGE("%s: drvData is null", __func__); return; } diff --git a/model/sensor/driver/common/src/sensor_config_parser.c b/model/sensor/driver/common/src/sensor_config_parser.c index c91f8d0ee6a725d0a9ea04e5d1f5d3f8c905aa53..c844da6f85dd320231b617fe4f474923f6e0057c 100644 --- a/model/sensor/driver/common/src/sensor_config_parser.c +++ b/model/sensor/driver/common/src/sensor_config_parser.c @@ -162,7 +162,7 @@ int32_t ParseSensorRegConfig(struct SensorCfgData *config) parser = DeviceResourceGetIfaceInstance(HDF_CONFIG_SOURCE); CHECK_NULL_PTR_RETURN_VALUE(parser, HDF_ERR_INVALID_PARAM); - regCfgNode = parser->GetChildNode(config->root, "accelRegConfig"); + regCfgNode = parser->GetChildNode(config->root, "sensorRegConfig"); CHECK_NULL_PTR_RETURN_VALUE(regCfgNode, HDF_ERR_INVALID_PARAM); DEV_RES_NODE_FOR_EACH_ATTR(regCfgNode, regAttr) { @@ -386,18 +386,18 @@ int32_t GetSensorBaseConfigData(const struct DeviceResourceNode *node, struct Se config->root = node; CHECK_NULL_PTR_RETURN_VALUE(parser->GetChildNode, HDF_ERR_INVALID_PARAM); - const struct DeviceResourceNode *infoNode = parser->GetChildNode(node, "accelInfo"); + const struct DeviceResourceNode *infoNode = parser->GetChildNode(node, "sensorInfo"); CHECK_NULL_PTR_RETURN_VALUE(infoNode, HDF_ERR_INVALID_PARAM); - const struct DeviceResourceNode *busNode = parser->GetChildNode(node, "accelBusConfig"); + const struct DeviceResourceNode *busNode = parser->GetChildNode(node, "sensorBusConfig"); CHECK_NULL_PTR_RETURN_VALUE(busNode, HDF_ERR_INVALID_PARAM); - const struct DeviceResourceNode *attrNode = parser->GetChildNode(node, "accelAttr"); + const struct DeviceResourceNode *attrNode = parser->GetChildNode(node, "sensorIdAttr"); CHECK_NULL_PTR_RETURN_VALUE(attrNode, HDF_ERR_INVALID_PARAM); ret = ParseSensorInfo(parser, infoNode, config); - CHECK_PARSER_RESULT_RETURN_VALUE(ret, "accelInfo"); + CHECK_PARSER_RESULT_RETURN_VALUE(ret, "sensorInfo"); ret = ParseSensorBus(parser, busNode, config); - CHECK_PARSER_RESULT_RETURN_VALUE(ret, "accelBusConfig"); + CHECK_PARSER_RESULT_RETURN_VALUE(ret, "sensorBusConfig"); ret = ParseSensorAttr(parser, attrNode, config); - CHECK_PARSER_RESULT_RETURN_VALUE(ret, "accelAttr"); + CHECK_PARSER_RESULT_RETURN_VALUE(ret, "sensorIdAttr"); return HDF_SUCCESS; } \ No newline at end of file diff --git a/model/sensor/driver/include/sensor_platform_if.h b/model/sensor/driver/include/sensor_platform_if.h index bc91bf731cf81f25b18300e2d66f0a69e7291f69..6bf64210f4623059483eaedc66f2babe86b04d16 100644 --- a/model/sensor/driver/include/sensor_platform_if.h +++ b/model/sensor/driver/include/sensor_platform_if.h @@ -44,10 +44,10 @@ #define SENSOR_DATA_WIDTH_8_BIT 8 // 8 bit #define SENSOR_CONVERT_UNIT 1000 #define SENSOR_1K_UNIT 1024 -#define SENSOR_SPI_MAX_SPEED 115200 +#define SENSOR_SPI_MAX_SPEED 115200 #define SENSOR_SECOND_CONVERT_NANOSECOND (SENSOR_CONVERT_UNIT * SENSOR_CONVERT_UNIT * SENSOR_CONVERT_UNIT) -#define SENSOR_TIMER_MIN_TIME 20 +#define SENSOR_TIMER_MIN_TIME 20 enum SensorBusType { SENSOR_BUS_I2C = 0, @@ -76,16 +76,6 @@ struct SensorBusCfg { }; }; -enum SensorThreadStatus { - SENSOR_THREAD_NONE = 0, - SENSOR_THREAD_START = 1, - SENSOR_THREAD_RUNNING = 2, - SENSOR_THREAD_STOPPING = 3, - SENSOR_THREAD_STOPPED = 4, - SENSOR_THREAD_DESTROY = 5, - SENSOR_THREAD_STATUS_BUT, -}; - enum SENSORConfigValueIndex { SENSOR_ADDR_INDEX, SENSOR_VALUE_INDEX,