You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2018/11/23 16:16:58 UTC
[mynewt-core] 26/26: hw/bus: Fix node debug
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 3a2a4db51f79e4e65809a456113f47cff6943d16
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Mon Nov 19 17:43:37 2018 +0100
hw/bus: Fix node debug
---
hw/bus/i2c/include/bus/i2c.h | 4 ++--
hw/bus/i2c/src/i2c.c | 8 ++++----
hw/bus/include/bus/bus_debug.h | 2 +-
hw/bus/include/bus/bus_driver.h | 4 ++--
hw/bus/spi/include/bus/spi.h | 4 ++--
hw/bus/spi/src/spi.c | 8 ++++----
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/hw/bus/i2c/include/bus/i2c.h b/hw/bus/i2c/include/bus/i2c.h
index d7a3530..3053da5 100644
--- a/hw/bus/i2c/include/bus/i2c.h
+++ b/hw/bus/i2c/include/bus/i2c.h
@@ -67,7 +67,7 @@ struct bus_i2c_dev {
struct bus_dev bdev;
struct bus_i2c_dev_cfg cfg;
-#if MYNEWT_VAL(BUS_DEBUG)
+#if MYNEWT_VAL(BUS_DEBUG_OS_DEV)
uint32_t devmagic;
#endif
};
@@ -84,7 +84,7 @@ struct bus_i2c_node {
uint16_t quirks;
uint8_t addr;
-#if MYNEWT_VAL(BUS_DEBUG)
+#if MYNEWT_VAL(BUS_DEBUG_OS_DEV)
uint32_t nodemagic;
#endif
};
diff --git a/hw/bus/i2c/src/i2c.c b/hw/bus/i2c/src/i2c.c
index 8065c1d..d9170b7 100644
--- a/hw/bus/i2c/src/i2c.c
+++ b/hw/bus/i2c/src/i2c.c
@@ -166,11 +166,11 @@ bus_i2c_dev_init_func(struct os_dev *odev, void *arg)
return SYS_EINVAL;
}
+ BUS_DEBUG_POISON_DEV(dev);
+
rc = bus_dev_init_func(odev, (void*)&bus_i2c_ops);
assert(rc == 0);
- BUS_DEBUG_POISON_DEV(dev);
-
dev->cfg = *cfg;
rc = hal_i2c_enable(dev->cfg.i2c_num);
@@ -187,13 +187,13 @@ bus_i2c_node_init_func(struct os_dev *odev, void *arg)
struct bus_node_cfg *node_cfg = &cfg->node_cfg;
int rc;
+ BUS_DEBUG_POISON_NODE(node);
+
rc = bus_node_init_func(odev, node_cfg);
if (rc) {
return rc;
}
- BUS_DEBUG_POISON_NODE(node);
-
node->freq = cfg->freq;
node->addr = cfg->addr;
node->quirks = cfg->quirks;
diff --git a/hw/bus/include/bus/bus_debug.h b/hw/bus/include/bus/bus_debug.h
index 034eec5..1ab9899 100644
--- a/hw/bus/include/bus/bus_debug.h
+++ b/hw/bus/include/bus/bus_debug.h
@@ -26,7 +26,7 @@
extern "C" {
#endif
-#if MYNEWT_VAL(BUS_DEBUG)
+#if MYNEWT_VAL(BUS_DEBUG_OS_DEV)
#define BUS_DEBUG_MAGIC_DEV 0xABADBABE
#define BUS_DEBUG_MAGIC_NODE 0xABADCAFE
#define BUS_DEBUG_POISON_DEV(_dev) do { (_dev)->devmagic = (BUS_DEBUG_MAGIC_DEV); } while (0)
diff --git a/hw/bus/include/bus/bus_driver.h b/hw/bus/include/bus/bus_driver.h
index df6f8aa..04306e5 100644
--- a/hw/bus/include/bus/bus_driver.h
+++ b/hw/bus/include/bus/bus_driver.h
@@ -88,7 +88,7 @@ struct bus_dev {
struct os_mutex lock;
struct bus_node *configured_for;
-#if MYNEWT_VAL(BUS_DEBUG)
+#if MYNEWT_VAL(BUS_DEBUG_OS_DEV)
uint32_t devmagic;
#endif
};
@@ -112,7 +112,7 @@ struct bus_node {
void *init_arg;
};
-#if MYNEWT_VAL(BUS_DEBUG)
+#if MYNEWT_VAL(BUS_DEBUG_OS_DEV)
uint32_t nodemagic;
#endif
};
diff --git a/hw/bus/spi/include/bus/spi.h b/hw/bus/spi/include/bus/spi.h
index da8d1ed..c2ea042 100644
--- a/hw/bus/spi/include/bus/spi.h
+++ b/hw/bus/spi/include/bus/spi.h
@@ -42,7 +42,7 @@ struct bus_spi_dev {
struct bus_dev bdev;
struct bus_spi_dev_cfg cfg;
-#if MYNEWT_VAL(BUS_DEBUG)
+#if MYNEWT_VAL(BUS_DEBUG_OS_DEV)
uint32_t devmagic;
#endif
};
@@ -78,7 +78,7 @@ struct bus_spi_node {
uint16_t freq;
uint16_t quirks;
-#if MYNEWT_VAL(BUS_DEBUG)
+#if MYNEWT_VAL(BUS_DEBUG_OS_DEV)
uint32_t nodemagic;
#endif
};
diff --git a/hw/bus/spi/src/spi.c b/hw/bus/spi/src/spi.c
index 4ec30ee..dec2926 100644
--- a/hw/bus/spi/src/spi.c
+++ b/hw/bus/spi/src/spi.c
@@ -185,11 +185,11 @@ bus_spi_dev_init_func(struct os_dev *odev, void *arg)
return SYS_EINVAL;
}
+ BUS_DEBUG_POISON_DEV(dev);
+
rc = bus_dev_init_func(odev, (void*)&bus_spi_ops);
assert(rc == 0);
- BUS_DEBUG_POISON_DEV(dev);
-
dev->cfg = *cfg;
rc = hal_spi_enable(dev->cfg.spi_num);
@@ -206,13 +206,13 @@ bus_spi_node_init_func(struct os_dev *odev, void *arg)
struct bus_node_cfg *node_cfg = &cfg->node_cfg;
int rc;
+ BUS_DEBUG_POISON_NODE(node);
+
rc = bus_node_init_func(odev, node_cfg);
if (rc) {
return rc;
}
- BUS_DEBUG_POISON_NODE(node);
-
node->pin_cs = cfg->pin_cs;
node->mode = cfg->mode;
node->data_order = cfg->data_order;