You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/07/12 00:46:36 UTC
[GitHub] ccollins476ad closed pull request #1261: hw/drivers: Fix build
errors due to bad c+p
ccollins476ad closed pull request #1261: hw/drivers: Fix build errors due to bad c+p
URL: https://github.com/apache/mynewt-core/pull/1261
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/drivers/drv2605/src/drv2605.c b/hw/drivers/drv2605/src/drv2605.c
index 6b4d845985..d3efc13da1 100644
--- a/hw/drivers/drv2605/src/drv2605.c
+++ b/hw/drivers/drv2605/src/drv2605.c
@@ -50,6 +50,7 @@ STATS_NAME_END(drv2605_stat_section)
STATS_SECT_DECL(drv2605_stat_section) g_drv2605stats;
#endif
+#if MYNEWT_VAL(DRV2605_LOG)
#define DRV2605_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(DRV2605_LOG_MODULE), __VA_ARGS__)
#else
diff --git a/hw/drivers/led/lp5523/src/lp5523.c b/hw/drivers/led/lp5523/src/lp5523.c
index c156db8271..6ca603b79d 100644
--- a/hw/drivers/led/lp5523/src/lp5523.c
+++ b/hw/drivers/led/lp5523/src/lp5523.c
@@ -47,9 +47,6 @@ STATS_SECT_DECL(lp5523_stat_section) g_lp5523stats;
#define LP5523_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(LP5523_LOG_MODULE), __VA_ARGS__)
-#else
-#define LP5523_LOG(lvl_, ...)
-#endif
int
lp5523_set_reg(struct led_itf *itf, enum lp5523_registers addr,
diff --git a/hw/drivers/sensors/adxl345/src/adxl345.c b/hw/drivers/sensors/adxl345/src/adxl345.c
index ecf8daac9c..813c12d5fb 100644
--- a/hw/drivers/sensors/adxl345/src/adxl345.c
+++ b/hw/drivers/sensors/adxl345/src/adxl345.c
@@ -59,9 +59,6 @@ STATS_SECT_DECL(adxl345_stat_section) g_adxl345stats;
#define ADXL345_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(ADXL345_LOG_MODULE), __VA_ARGS__)
-#else
-#define ADXL345_LOG(lvl_, ...)
-#endif
#define ADXL345_NOTIFY_MASK 0x01
#define ADXL345_READ_MASK 0x02
diff --git a/hw/drivers/sensors/bme280/src/bme280.c b/hw/drivers/sensors/bme280/src/bme280.c
index 0d7c9c6736..67a0adee0a 100644
--- a/hw/drivers/sensors/bme280/src/bme280.c
+++ b/hw/drivers/sensors/bme280/src/bme280.c
@@ -64,9 +64,6 @@ STATS_SECT_DECL(bme280_stat_section) g_bme280stats;
#define BME280_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(BME280_LOG_MODULE), __VA_ARGS__)
-#else
-#define BME280_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int bme280_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/bmp280/src/bmp280.c b/hw/drivers/sensors/bmp280/src/bmp280.c
index ca707ef3b5..5670a72380 100644
--- a/hw/drivers/sensors/bmp280/src/bmp280.c
+++ b/hw/drivers/sensors/bmp280/src/bmp280.c
@@ -65,9 +65,6 @@ STATS_SECT_DECL(bmp280_stat_section) g_bmp280stats;
#define BMP280_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(BMP280_LOG_MODULE), __VA_ARGS__)
-#else
-#define BMP280_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int bmp280_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/bno055/src/bno055.c b/hw/drivers/sensors/bno055/src/bno055.c
index 9be19aa639..66fed6a3aa 100644
--- a/hw/drivers/sensors/bno055/src/bno055.c
+++ b/hw/drivers/sensors/bno055/src/bno055.c
@@ -51,9 +51,6 @@ STATS_SECT_DECL(bno055_stat_section) g_bno055stats;
#define BNO055_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(BNO055_LOG_MODULE), __VA_ARGS__)
-#else
-#define BNO055_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API.*/
static int bno055_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/lis2dh12/src/lis2dh12.c b/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
index b85554516e..709b920bab 100644
--- a/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
+++ b/hw/drivers/sensors/lis2dh12/src/lis2dh12.c
@@ -58,9 +58,6 @@ STATS_SECT_DECL(lis2dh12_stat_section) g_lis2dh12stats;
#define LIS2DH12_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(LIS2DH12_LOG_MODULE), __VA_ARGS__)
-#else
-#define LIS2DH12_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int lis2dh12_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/lis2ds12/src/lis2ds12.c b/hw/drivers/sensors/lis2ds12/src/lis2ds12.c
index 2ccc8852af..897e0ef872 100644
--- a/hw/drivers/sensors/lis2ds12/src/lis2ds12.c
+++ b/hw/drivers/sensors/lis2ds12/src/lis2ds12.c
@@ -83,9 +83,6 @@ STATS_SECT_DECL(lis2ds12_stat_section) g_lis2ds12stats;
#define LIS2DS12_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(LIS2DS12_LOG_MODULE), __VA_ARGS__)
-#else
-#define LIS2DS12_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int lis2ds12_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/lis2dw12/src/lis2dw12.c b/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
index a891ada703..8c1aa3089e 100644
--- a/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
+++ b/hw/drivers/sensors/lis2dw12/src/lis2dw12.c
@@ -150,9 +150,6 @@ STATS_SECT_DECL(lis2dw12_stat_section) g_lis2dw12stats;
#define LIS2DW12_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(LIS2DW12_LOG_MODULE), __VA_ARGS__)
-#else
-#define LIS2DW12_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int lis2dw12_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/lps33hw/src/lps33hw.c b/hw/drivers/sensors/lps33hw/src/lps33hw.c
index d19aff53c2..815cff675b 100644
--- a/hw/drivers/sensors/lps33hw/src/lps33hw.c
+++ b/hw/drivers/sensors/lps33hw/src/lps33hw.c
@@ -59,9 +59,6 @@ STATS_SECT_DECL(lps33hw_stat_section) g_lps33hwstats;
#define LPS33HW_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(LPS33HW_LOG_MODULE), __VA_ARGS__)
-#else
-#define LPS33HW_LOG(lvl_, ...)
-#endif
#define LPS33HW_PRESS_OUT_DIV (40.96)
#define LPS33HW_TEMP_OUT_DIV (100.0)
diff --git a/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c b/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c
index 431ef93608..d6bf72c62c 100644
--- a/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c
+++ b/hw/drivers/sensors/lsm303dlhc/src/lsm303dlhc.c
@@ -68,9 +68,6 @@ STATS_SECT_DECL(lsm303dlhc_stat_section) g_lsm303dlhcstats;
#define LSM303DLHC_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(LSM303DLHC_LOG_MODULE), __VA_ARGS__)
-#else
-#define LSM303DLHC_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int lsm303dlhc_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/mpu6050/src/mpu6050.c b/hw/drivers/sensors/mpu6050/src/mpu6050.c
index 07b2221a13..c236f5f0ca 100644
--- a/hw/drivers/sensors/mpu6050/src/mpu6050.c
+++ b/hw/drivers/sensors/mpu6050/src/mpu6050.c
@@ -49,9 +49,6 @@ STATS_SECT_DECL(mpu6050_stat_section) g_mpu6050stats;
#define MPU6050_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(MPU6050_LOG_MODULE), __VA_ARGS__)
-#else
-#define MPU6050_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int mpu6050_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/ms5837/src/ms5837.c b/hw/drivers/sensors/ms5837/src/ms5837.c
index 5691fb8cc2..37089b9f13 100644
--- a/hw/drivers/sensors/ms5837/src/ms5837.c
+++ b/hw/drivers/sensors/ms5837/src/ms5837.c
@@ -62,9 +62,6 @@ STATS_SECT_DECL(ms5837_stat_section) g_ms5837stats;
#define MS5837_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(MS5837_LOG_MODULE), __VA_ARGS__)
-#else
-#define MS5837_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int ms5837_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/ms5837/syscfg.yml b/hw/drivers/sensors/ms5837/syscfg.yml
index b9272cb0ac..2cacb293d6 100644
--- a/hw/drivers/sensors/ms5837/syscfg.yml
+++ b/hw/drivers/sensors/ms5837/syscfg.yml
@@ -16,6 +16,7 @@
# under the License.
#
+syscfg.defs:
MS5837_ITF_LOCK_TMO:
description: 'MS5837 interface lock timeout in milliseconds'
value: 1000
diff --git a/hw/drivers/sensors/ms5840/src/ms5840.c b/hw/drivers/sensors/ms5840/src/ms5840.c
index b15f3740bb..3a8bf90415 100644
--- a/hw/drivers/sensors/ms5840/src/ms5840.c
+++ b/hw/drivers/sensors/ms5840/src/ms5840.c
@@ -65,9 +65,6 @@ STATS_SECT_DECL(ms5840_stat_section) g_ms5840stats;
#define MS5840_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(MS5840_LOG_MODULE), __VA_ARGS__)
-#else
-#define MS5840_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int ms5840_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/tcs34725/src/tcs34725.c b/hw/drivers/sensors/tcs34725/src/tcs34725.c
index 399dd77d2e..98b964102f 100644
--- a/hw/drivers/sensors/tcs34725/src/tcs34725.c
+++ b/hw/drivers/sensors/tcs34725/src/tcs34725.c
@@ -60,9 +60,6 @@ STATS_SECT_DECL(tcs34725_stat_section) g_tcs34725stats;
#define TCS34725_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(TCS34725_LOG_MODULE), __VA_ARGS__)
-#else
-#define TCS34725_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int tcs34725_sensor_read(struct sensor *, sensor_type_t,
diff --git a/hw/drivers/sensors/tsl2561/src/tsl2561.c b/hw/drivers/sensors/tsl2561/src/tsl2561.c
index 797153fe68..c934552d48 100644
--- a/hw/drivers/sensors/tsl2561/src/tsl2561.c
+++ b/hw/drivers/sensors/tsl2561/src/tsl2561.c
@@ -66,9 +66,6 @@ STATS_SECT_DECL(tsl2561_stat_section) g_tsl2561stats;
#define TSL2561_LOG(lvl_, ...) \
MODLOG_ ## lvl_(MYNEWT_VAL(TSL2561_LOG_MODULE), __VA_ARGS__)
-#else
-#define TSL2561_LOG(lvl_, ...)
-#endif
/* Exports for the sensor API */
static int tsl2561_sensor_read(struct sensor *, sensor_type_t,
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services