michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ssd1306: derive buffer length from width and height attributes

Browse source 
Derive buffer length from width and height attributes and
do not use buf_size direct.

Signed-off-by: Johann Fischer <j.fischer@phytec.de>
This commit is contained in:
Johann Fischer 2019-12-18 09:16:24 +01:00 • committed by Carles Cufí
commit d50ec79757
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/display/ssd1306.c
View file

@ -231,12 +231,15 @@ int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
const struct display_buffer_descriptor *desc, const struct display_buffer_descriptor *desc,
const void *buf) const void *buf)
{ {
size_t buf_len;
if (desc->pitch < desc->width) { if (desc->pitch < desc->width) {
LOG_ERR("Pitch is smaller then width"); LOG_ERR("Pitch is smaller then width");
return -1; return -1;
} }
if (buf == NULL || desc->buf_size == 0U) { buf_len = MIN(desc->buf_size, desc->height * desc->width / 8);
if (buf == NULL || buf_len == 0U) {
LOG_ERR("Display buffer is not available"); LOG_ERR("Display buffer is not available");
return -1; return -1;
} }
@ -282,7 +285,7 @@ int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y,
return i2c_burst_write(driver->i2c, return i2c_burst_write(driver->i2c,
DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, 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, buf_len);
#elif defined(CONFIG_SSD1306_SH1106_COMPATIBLE) #elif defined(CONFIG_SSD1306_SH1106_COMPATIBLE)
if (x != 0U && y != 0U) { if (x != 0U && y != 0U) {