1 files changed, 32 insertions, 14 deletions

diff --git a/src/ppu.c b/src/ppu.c
index 175b2a7..3afa533 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -25,6 +25,8 @@
 static size_t screen_width = 0;
 static size_t screen_height = 0;
 static size_t bpp = 0;
+static int fb_file = 0;
+static int refresh_file = 0;
 
 static u8 *framebuffer = 0;
 
@@ -45,10 +47,13 @@ static u8 blending[5][16] = {
 
 u16
 rgb565(u32 rgba) {
-    u16 r = rgba >> 16  & 0xFF;
-    u16 g = rgba >> 8   & 0xFF;
-    u16 b = rgba >> 0   & 0xFF;
-    return (r << 8) | (g << 3) | (b >> 3);
+    u16 r = (rgba >> 16  & 0xFF);
+    u16 g = (rgba >> 8   & 0xFF);
+    u16 b = (rgba >> 0   & 0xFF);
+    r = r >> 3;
+    g = g >> 2;
+    b = b >> 3;
+    return (r << 11) | (g << 5) | b;
 }
 
 void
@@ -142,13 +147,20 @@ set_tty(bool graphics) {
 int
 ppu_init(void) {
     // Open frambuffer and get the size.
-    int fb = open("/dev/graphics/fb0", O_RDWR);
-    if (fb <= 0) {
+    fb_file = open("/dev/graphics/fb0", O_RDWR);
+    if (fb_file <= 0) {
         fprintf(stderr, "error: couldn't open the framebuffer\n");
         exit(EXIT_FAILURE);
     }
+
+    refresh_file = open("/sys/class/graphics/fb0/epd_refresh", O_RDWR);
+    if (refresh_file == 0) {
+        fprintf(stderr, "error: couldn't open the refresh file\n");
+        exit(EXIT_FAILURE);
+    }
+
     struct fb_var_screeninfo info;
-    if (ioctl(fb, FBIOGET_VSCREENINFO, &info) != 0) {
+    if (ioctl(fb_file, FBIOGET_VSCREENINFO, &info) != 0) {
         fprintf(stderr, "error: couldn't get the framebuffer size\n");
         exit(EXIT_FAILURE);
     }
@@ -156,9 +168,9 @@ ppu_init(void) {
     // Mmap the framebuffer to a buffer object.
     screen_width = info.xres;
     screen_height = info.yres;
-    bpp = info.bits_per_pixel / 8;
-    size_t len = bpp * screen_width * screen_height;
-    framebuffer = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fb, 0);
+    bpp = info.bits_per_pixel;
+    size_t len = bpp / 8 * screen_width * screen_height;
+    framebuffer = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_file, 0);
     if (framebuffer == MAP_FAILED) {
         fprintf(stderr, "error: couldn't mmap the framebuffer\n");
         exit(EXIT_FAILURE);
@@ -208,10 +220,16 @@ blit_framebuffer(void) {
         if (dirty_lines[j] != 0) {
             for (size_t i = 0; i < screen_width; i++) {
                 size_t idx = i + j * screen_width;
-                u16 *p = framebuffer;
-                p[idx] = rgb565(palette[pixels_fg[idx] << 2 | pixels_bg[idx]]);
-                // FIXME: can we generalize this to use bpp instead of having
-                // a version for 32/16 bit color?
+                if (bpp == 16) {
+                    u16 *p = framebuffer;
+                    p[idx] = rgb565(palette[pixels_fg[idx] << 2 | pixels_bg[idx]]);
+                } else if (bpp == 32) {
+                    u32 *p = framebuffer;
+                    p[idx] = palette[pixels_fg[idx] << 2 | pixels_bg[idx]];
+                } else {
+                    fprintf(stderr, "error: wrong bits per pixel (expected 16 or 32)\n");
+                    exit(EXIT_FAILURE);
+                }
             }
         }
         dirty_lines[j] = 0;