Commit 09249ecd authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

staging: fbtft: fb_ssd1306: Refactor write_vmem()

Refactor write_vmem() for sake of readability.

While here, fix indentation in one comment.
Acked-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95ecde0f
...@@ -84,7 +84,7 @@ static int init_display(struct fbtft_par *par) ...@@ -84,7 +84,7 @@ static int init_display(struct fbtft_par *par)
/* Vertical addressing mode */ /* Vertical addressing mode */
write_reg(par, 0x01); write_reg(par, 0x01);
/*Set Segment Re-map */ /* Set Segment Re-map */
/* column address 127 is mapped to SEG0 */ /* column address 127 is mapped to SEG0 */
write_reg(par, 0xA0 | 0x1); write_reg(par, 0xA0 | 0x1);
...@@ -183,26 +183,24 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves) ...@@ -183,26 +183,24 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
{ {
u16 *vmem16 = (u16 *)par->info->screen_buffer; u16 *vmem16 = (u16 *)par->info->screen_buffer;
u32 xres = par->info->var.xres;
u32 yres = par->info->var.yres;
u8 *buf = par->txbuf.buf; u8 *buf = par->txbuf.buf;
int x, y, i; int x, y, i;
int ret = 0; int ret = 0;
for (x = 0; x < par->info->var.xres; x++) { for (x = 0; x < xres; x++) {
for (y = 0; y < par->info->var.yres/8; y++) { for (y = 0; y < yres / 8; y++) {
*buf = 0x00; *buf = 0x00;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
*buf |= (vmem16[(y * 8 + i) * *buf |= (vmem16[(y * 8 + i) * xres + x] ? 1 : 0) << i;
par->info->var.xres + x] ?
1 : 0) << i;
buf++; buf++;
} }
} }
/* Write data */ /* Write data */
gpio_set_value(par->gpio.dc, 1); gpio_set_value(par->gpio.dc, 1);
ret = par->fbtftops.write(par, par->txbuf.buf, ret = par->fbtftops.write(par, par->txbuf.buf, xres * yres / 8);
par->info->var.xres * par->info->var.yres /
8);
if (ret < 0) if (ret < 0)
dev_err(par->info->device, "write failed and returned: %d\n", dev_err(par->info->device, "write failed and returned: %d\n",
ret); ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment