michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts_fixups: Use DT_ prefix in all defined labels not related to Kconfig

Browse source 
These changes were obtained by running a script  created by
Ulf Magnusson <Ulf.Magnusson@nordicsemi.no> for the following
specification:

1. Read the contents of all dts_fixup.h files in Zephyr
2. Check the left-hand side of the #define macros (i.e. the X in
   #define X Y)
3. Check if that name is also the name of a Kconfig option
   3.a If it is, then do nothing
   3.b If it is not, then replace CONFIG_ with DT_ or add DT_ if it
       has neither of these two prefixes
4. Replace the use of the changed #define in the code itself
   (.c, .h, .ld)

Additionally, some tweaks had to be added to this script to catch some
of the macros used in the code in a parameterized form, e.g.:
- CONFIG_GPIO_STM32_GPIO##__SUFFIX##_BASE_ADDRESS
- CONFIG_UART_##idx##_TX_PIN
- I2C_SBCON_##_num##_BASE_ADDR
and to prevent adding DT_ prefix to the following symbols:
- FLASH_START
- FLASH_SIZE
- SRAM_START
- SRAM_SIZE
- _ROM_ADDR
- _ROM_SIZE
- _RAM_ADDR
- _RAM_SIZE
which are surprisingly also defined in some dts_fixup.h files.

Finally, some manual corrections had to be done as well:
- name##_IRQ -> DT_##name##_IRQ in uart_stm32.c

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2018-11-13 15:15:23 +01:00 • committed by Kumar Gala
commit 20202902f2
304 changed files with 5118 additions and 5118 deletions
Download patch file Download diff file Expand all files Collapse all files

22
drivers/sensor/ccs811/ccs811.c
View file

@ -28,7 +28,7 @@ static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan)
/* Check data ready flag for the measurement interval of 1 seconds */
while (tries-- > 0) {
if (i2c_reg_read_byte(drv_data->i2c, CONFIG_CCS811_I2C_ADDR,
if (i2c_reg_read_byte(drv_data->i2c, DT_CCS811_I2C_ADDR,
CCS811_REG_STATUS, &status) < 0) {
LOG_ERR("Failed to read Status register");
return -EIO;
@ -46,7 +46,7 @@ static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan)
return -EIO;
}
if (i2c_burst_read(drv_data->i2c, CONFIG_CCS811_I2C_ADDR,
if (i2c_burst_read(drv_data->i2c, DT_CCS811_I2C_ADDR,
CCS811_REG_ALG_RESULT_DATA, (u8_t *)buf, 8) < 0) {
LOG_ERR("Failed to read conversion data.");
return -EIO;
@ -117,7 +117,7 @@ static int switch_to_app_mode(struct device *i2c)
LOG_DBG("Switching to Application mode...");
if (i2c_reg_read_byte(i2c, CONFIG_CCS811_I2C_ADDR,
if (i2c_reg_read_byte(i2c, DT_CCS811_I2C_ADDR,
CCS811_REG_STATUS, &status) < 0) {
LOG_ERR("Failed to read Status register");
return -EIO;
@ -131,12 +131,12 @@ static int switch_to_app_mode(struct device *i2c)
buf = CCS811_REG_APP_START;
/* Set the device to application mode */
if (i2c_write(i2c, &buf, 1, CONFIG_CCS811_I2C_ADDR) < 0) {
if (i2c_write(i2c, &buf, 1, DT_CCS811_I2C_ADDR) < 0) {
LOG_ERR("Failed to set Application mode");
return -EIO;
}
if (i2c_reg_read_byte(i2c, CONFIG_CCS811_I2C_ADDR,
if (i2c_reg_read_byte(i2c, DT_CCS811_I2C_ADDR,
CCS811_REG_STATUS, &status) < 0) {
LOG_ERR("Failed to read Status register");
return -EIO;
@ -159,10 +159,10 @@ int ccs811_init(struct device *dev)
int ret;
u8_t hw_id, status;
drv_data->i2c = device_get_binding(CONFIG_CCS811_I2C_MASTER_DEV_NAME);
drv_data->i2c = device_get_binding(DT_CCS811_I2C_MASTER_DEV_NAME);
if (drv_data->i2c == NULL) {
LOG_ERR("Failed to get pointer to %s device!",
CONFIG_CCS811_I2C_MASTER_DEV_NAME);
DT_CCS811_I2C_MASTER_DEV_NAME);
return -EINVAL;
}
@ -202,7 +202,7 @@ int ccs811_init(struct device *dev)
}
/* Check Hardware ID */
if (i2c_reg_read_byte(drv_data->i2c, CONFIG_CCS811_I2C_ADDR,
if (i2c_reg_read_byte(drv_data->i2c, DT_CCS811_I2C_ADDR,
CCS811_REG_HW_ID, &hw_id) < 0) {
LOG_ERR("Failed to read Hardware ID register");
return -EIO;
@ -214,7 +214,7 @@ int ccs811_init(struct device *dev)
}
/* Set Measurement mode for 1 second */
if (i2c_reg_write_byte(drv_data->i2c, CONFIG_CCS811_I2C_ADDR,
if (i2c_reg_write_byte(drv_data->i2c, DT_CCS811_I2C_ADDR,
CCS811_REG_MEAS_MODE,
CCS811_MODE_IAQ_1SEC) < 0) {
LOG_ERR("Failed to set Measurement mode");
@ -222,7 +222,7 @@ int ccs811_init(struct device *dev)
}
/* Check for error */
if (i2c_reg_read_byte(drv_data->i2c, CONFIG_CCS811_I2C_ADDR,
if (i2c_reg_read_byte(drv_data->i2c, DT_CCS811_I2C_ADDR,
CCS811_REG_STATUS, &status) < 0) {
LOG_ERR("Failed to read Status register");
return -EIO;
@ -238,6 +238,6 @@ int ccs811_init(struct device *dev)
static struct ccs811_data ccs811_driver;
DEVICE_AND_API_INIT(ccs811, CONFIG_CCS811_NAME, ccs811_init, &ccs811_driver,
DEVICE_AND_API_INIT(ccs811, DT_CCS811_NAME, ccs811_init, &ccs811_driver,
NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
&ccs811_driver_api);