michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ssd1306: fix style

Browse source 
Fix style.

Signed-off-by: Johann Fischer <j.fischer@phytec.de>
This commit is contained in:
Johann Fischer 2019-09-11 15:32:59 +02:00 • committed by Maureen Helm
commit e3ffd143c1
1 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

33
drivers/display/ssd1306.c
View file

@ -4,9 +4,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(ssd1306); LOG_MODULE_REGISTER(ssd1306, CONFIG_DISPLAY_LOG_LEVEL);
#include <string.h> #include <string.h>
#include <device.h> #include <device.h>
@ -61,21 +60,24 @@ struct ssd1306_data {
static inline int ssd1306_reg_read(struct ssd1306_data *driver, static inline int ssd1306_reg_read(struct ssd1306_data *driver,
u8_t reg, u8_t * const val) u8_t reg, u8_t * const val)
{ {
return i2c_reg_read_byte(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, return i2c_reg_read_byte(driver->i2c,
DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS,
reg, val); reg, val);
} }
static inline int ssd1306_reg_write(struct ssd1306_data *driver, static inline int ssd1306_reg_write(struct ssd1306_data *driver,
u8_t reg, u8_t val) u8_t reg, u8_t val)
{ {
return i2c_reg_write_byte(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, return i2c_reg_write_byte(driver->i2c,
DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS,
reg, val); reg, val);
} }
static inline int ssd1306_reg_update(struct ssd1306_data *driver, u8_t reg, static inline int ssd1306_reg_update(struct ssd1306_data *driver, u8_t reg,
u8_t mask, u8_t val) u8_t mask, u8_t val)
{ {
return i2c_reg_update_byte(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, return i2c_reg_update_byte(driver->i2c,
DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS,
reg, mask, val); reg, mask, val);
} }
@ -219,7 +221,8 @@ int ssd1306_write_page(const struct device *dev, u8_t page, void const *data,
return -1; return -1;
} }
return i2c_burst_write(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, return i2c_burst_write(driver->i2c,
DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS,
SSD1306_CONTROL_LAST_BYTE_DATA, SSD1306_CONTROL_LAST_BYTE_DATA,
data, length); data, length);
} }
@ -276,7 +279,8 @@ int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
return -1; return -1;
} }
return i2c_burst_write(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, return i2c_burst_write(driver->i2c,
DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS,
SSD1306_CONTROL_LAST_BYTE_DATA, SSD1306_CONTROL_LAST_BYTE_DATA,
(u8_t *)buf, desc->buf_size); (u8_t *)buf, desc->buf_size);
@ -380,11 +384,14 @@ static int ssd1306_init_device(struct device *dev)
}; };
#ifdef DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER #ifdef DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER
gpio_pin_write(driver->reset, DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 1); gpio_pin_write(driver->reset,
DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 1);
k_sleep(SSD1306_RESET_DELAY); k_sleep(SSD1306_RESET_DELAY);
gpio_pin_write(driver->reset, DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 0); gpio_pin_write(driver->reset,
DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 0);
k_sleep(SSD1306_RESET_DELAY); k_sleep(SSD1306_RESET_DELAY);
gpio_pin_write(driver->reset, DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 1); gpio_pin_write(driver->reset,
DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 1);
#endif #endif
/* Turn display off */ /* Turn display off */
@ -437,14 +444,16 @@ static int ssd1306_init(struct device *dev)
} }
#ifdef DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER #ifdef DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER
driver->reset = device_get_binding(DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER); driver->reset = device_get_binding(
DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER);
if (driver->reset == NULL) { if (driver->reset == NULL) {
LOG_ERR("Failed to get pointer to %s device!", LOG_ERR("Failed to get pointer to %s device!",
DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER); DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER);
return -EINVAL; return -EINVAL;
} }
gpio_pin_configure(driver->reset, DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, gpio_pin_configure(driver->reset,
DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN,
GPIO_DIR_OUT); GPIO_DIR_OUT);
#endif #endif