Browse Source

[sensor] use arg to replace user_data

Meco Man 2 years ago
parent
commit
6b9bdc12a9

+ 2 - 2
bsp/stm32/stm32l475-atk-pandora/board/ports/sensor_port.c

@@ -19,7 +19,7 @@ int sensor_init(void)
 
     cfg.intf.type = RT_SENSOR_INTF_I2C;
     cfg.intf.dev_name = "i2c3";
-    cfg.intf.user_data = (void *)MPU6XXX_ADDR_DEFAULT;
+    cfg.intf.arg = (void *)MPU6XXX_ADDR_DEFAULT;
     cfg.irq_pin.pin  = RT_PIN_NONE;
 
     rt_hw_mpu6xxx_init("icm", &cfg);
@@ -40,7 +40,7 @@ int rt_hw_aht10_port(void)
     struct rt_sensor_config cfg;
 
     cfg.intf.dev_name  = AHT10_I2C_BUS;
-    cfg.intf.user_data = (void *)AHT10_I2C_ADDR;
+    cfg.intf.arg = (void *)AHT10_I2C_ADDR;
 
     rt_hw_aht10_init("aht10", &cfg);
 

+ 3 - 3
components/drivers/include/drivers/sensor.h

@@ -144,9 +144,9 @@ struct rt_sensor_info
 
 struct rt_sensor_intf
 {
-    char                       *dev_name;   /* The name of the communication device */
-    rt_uint8_t                  type;       /* Communication interface type */
-    void                       *user_data;  /* Private data for the sensor. ex. i2c addr,spi cs,control I/O */
+    char          *dev_name;                /* The name of the communication device */
+    rt_uint8_t     type;                    /* Communication interface type */
+    void          *arg;                     /* Interface argument for the sensor. ex. i2c addr,spi cs,control I/O */
 };
 
 struct rt_sensor_config