You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2019/06/19 13:35:53 UTC
[mynewt-core] branch master updated: sensors: Enhance helper
functions
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new e09b588 sensors: Enhance helper functions
e09b588 is described below
commit e09b5880865a6443e181e745e8fc2eae6920b0a7
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Mon Jun 3 10:34:05 2019 +0200
sensors: Enhance helper functions
sensor_itf.si_dev has to have valid pointer to node.
It could be done in sensor_itf variable declaration, but often
this is the only filed that needs to be initialized and it is
easy to overlook.
Device creation helpers have both pointers in argument list
so now they setup si_dev to correct value just to be sure.
This change dose not affect existing code.
---
hw/drivers/sensors/bma253/src/bma253.c | 1 +
hw/drivers/sensors/bme280/src/bme280.c | 2 ++
hw/drivers/sensors/bmp280/src/bmp280.c | 2 ++
hw/drivers/sensors/bmp388/src/bmp388.c | 2 ++
hw/drivers/sensors/dps368/src/dps368.c | 2 ++
hw/drivers/sensors/kxtj3/src/kxtj3.c | 1 +
hw/drivers/sensors/lis2de12/src/lis2de12.c | 2 ++
hw/drivers/sensors/lis2dh12/src/lis2dh12.c | 2 ++
hw/drivers/sensors/lis2dw12/src/lis2dw12.c | 2 ++
hw/drivers/sensors/lps33hw/src/lps33hw.c | 2 ++
hw/drivers/sensors/lps33thw/src/lps33thw.c | 2 ++
hw/drivers/sensors/lsm6dso/src/lsm6dso.c | 2 ++
hw/drivers/sensors/ms5837/src/ms5837.c | 1 +
hw/drivers/sensors/ms5840/src/ms5840.c | 1 +
14 files changed, 24 insertions(+)
diff --git a/hw/drivers/sensors/bma253/src/bma253.c b/hw/drivers/sensors/bma253/src/bma253.c
index 77b7a15..a75fafe 100644
--- a/hw/drivers/sensors/bma253/src/bma253.c
+++ b/hw/drivers/sensors/bma253/src/bma253.c
@@ -5349,6 +5349,7 @@ bma253_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
};
int rc;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/bme280/src/bme280.c b/hw/drivers/sensors/bme280/src/bme280.c
index 0570c3e..747117c 100644
--- a/hw/drivers/sensors/bme280/src/bme280.c
+++ b/hw/drivers/sensors/bme280/src/bme280.c
@@ -1391,6 +1391,7 @@ bme280_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
};
int rc;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -1408,6 +1409,7 @@ bme280_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
};
int rc;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/bmp280/src/bmp280.c b/hw/drivers/sensors/bmp280/src/bmp280.c
index 3f27a0f..9df27ef 100644
--- a/hw/drivers/sensors/bmp280/src/bmp280.c
+++ b/hw/drivers/sensors/bmp280/src/bmp280.c
@@ -1388,6 +1388,7 @@ bmp280_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
((struct bmp280 *)(node))->node_is_spi = false;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -1407,6 +1408,7 @@ bmp280_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
((struct bmp280 *)(node))->node_is_spi = true;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/bmp388/src/bmp388.c b/hw/drivers/sensors/bmp388/src/bmp388.c
index 60024e2..bb0d4fe 100644
--- a/hw/drivers/sensors/bmp388/src/bmp388.c
+++ b/hw/drivers/sensors/bmp388/src/bmp388.c
@@ -4088,6 +4088,7 @@ bmp388_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
dev->node_is_spi = false;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -4108,6 +4109,7 @@ bmp388_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
dev->node_is_spi = true;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/dps368/src/dps368.c b/hw/drivers/sensors/dps368/src/dps368.c
index bac6f7c..59cb347 100644
--- a/hw/drivers/sensors/dps368/src/dps368.c
+++ b/hw/drivers/sensors/dps368/src/dps368.c
@@ -1026,6 +1026,7 @@ dps368_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
};
int rc;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -1043,6 +1044,7 @@ dps368_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
};
int rc;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/kxtj3/src/kxtj3.c b/hw/drivers/sensors/kxtj3/src/kxtj3.c
index bc56405..6ed3c29 100644
--- a/hw/drivers/sensors/kxtj3/src/kxtj3.c
+++ b/hw/drivers/sensors/kxtj3/src/kxtj3.c
@@ -1590,6 +1590,7 @@ kxtj3_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
};
int rc;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/lis2de12/src/lis2de12.c b/hw/drivers/sensors/lis2de12/src/lis2de12.c
index e0ec300..8acac5f 100644
--- a/hw/drivers/sensors/lis2de12/src/lis2de12.c
+++ b/hw/drivers/sensors/lis2de12/src/lis2de12.c
@@ -3138,6 +3138,7 @@ lis2de12_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
dev->node_is_spi = false;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -3158,6 +3159,7 @@ lis2de12_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
dev->node_is_spi = true;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/lis2dh12/src/lis2dh12.c b/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
index a235a56..ce627c1 100644
--- a/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
+++ b/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
@@ -3241,6 +3241,7 @@ lis2dh12_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
dev->node_is_spi = false;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -3261,6 +3262,7 @@ lis2dh12_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
dev->node_is_spi = true;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/lis2dw12/src/lis2dw12.c b/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
index c5b7262..413ea51 100644
--- a/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
+++ b/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
@@ -3480,6 +3480,7 @@ lis2dw12_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
dev->node_is_spi = false;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -3500,6 +3501,7 @@ lis2dw12_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
dev->node_is_spi = true;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/lps33hw/src/lps33hw.c b/hw/drivers/sensors/lps33hw/src/lps33hw.c
index 13b136e..0446fe0 100644
--- a/hw/drivers/sensors/lps33hw/src/lps33hw.c
+++ b/hw/drivers/sensors/lps33hw/src/lps33hw.c
@@ -1208,6 +1208,7 @@ lps33hw_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
dev->node_is_spi = false;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -1228,6 +1229,7 @@ lps33hw_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
dev->node_is_spi = true;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/lps33thw/src/lps33thw.c b/hw/drivers/sensors/lps33thw/src/lps33thw.c
index d823c27..4b1d615 100644
--- a/hw/drivers/sensors/lps33thw/src/lps33thw.c
+++ b/hw/drivers/sensors/lps33thw/src/lps33thw.c
@@ -1202,6 +1202,7 @@ lps33thw_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
dev->node_is_spi = false;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -1222,6 +1223,7 @@ lps33thw_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
dev->node_is_spi = true;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/lsm6dso/src/lsm6dso.c b/hw/drivers/sensors/lsm6dso/src/lsm6dso.c
index 1c0a870..9e33665 100644
--- a/hw/drivers/sensors/lsm6dso/src/lsm6dso.c
+++ b/hw/drivers/sensors/lsm6dso/src/lsm6dso.c
@@ -2964,6 +2964,7 @@ lsm6dso_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
dev->node_is_spi = false;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
@@ -2984,6 +2985,7 @@ lsm6dso_create_spi_sensor_dev(struct bus_spi_node *node, const char *name,
dev->node_is_spi = true;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_spi_node_create(name, node, spi_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/ms5837/src/ms5837.c b/hw/drivers/sensors/ms5837/src/ms5837.c
index a336c30..5fce829 100644
--- a/hw/drivers/sensors/ms5837/src/ms5837.c
+++ b/hw/drivers/sensors/ms5837/src/ms5837.c
@@ -731,6 +731,7 @@ ms5837_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
};
int rc;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);
diff --git a/hw/drivers/sensors/ms5840/src/ms5840.c b/hw/drivers/sensors/ms5840/src/ms5840.c
index 0038a08..2173a6e 100644
--- a/hw/drivers/sensors/ms5840/src/ms5840.c
+++ b/hw/drivers/sensors/ms5840/src/ms5840.c
@@ -720,6 +720,7 @@ ms5840_create_i2c_sensor_dev(struct bus_i2c_node *node, const char *name,
};
int rc;
+ sensor_itf->si_dev = &node->bnode.odev;
bus_node_set_callbacks((struct os_dev *)node, &cbs);
rc = bus_i2c_node_create(name, node, i2c_cfg, sensor_itf);