1 files changed, 50 insertions, 32 deletions

diff --git a/src/ppu.c b/src/ppu.c
index aa99ed8..175b2a7 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -4,7 +4,7 @@
 
 #include <linux/fb.h>
 #include <sys/ioctl.h>
-#include <sys/kd.h>
+// #include <sys/kd.h>
 #include <sys/mman.h>
 
 #include "ppu.h"
@@ -24,8 +24,9 @@
 
 static size_t screen_width = 0;
 static size_t screen_height = 0;
+static size_t bpp = 0;
 
-static u32 *framebuffer = 0;
+static u8 *framebuffer = 0;
 
 static u32 palette[16];
 static u8 *pixels_fg;
@@ -42,6 +43,14 @@ static u8 blending[5][16] = {
     {2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2, 2, 3, 1, 2},
     {1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0}};
 
+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);
+}
+
 void
 ppu_pixel(u8 *layer, u16 x, u16 y, u8 color) {
     if(x < screen_width && y < screen_height) {
@@ -101,39 +110,39 @@ set_tty(bool graphics) {
         exit(EXIT_FAILURE);
     }
 
-    if (graphics) {
-        if (ioctl(tty, KDSETMODE, KD_GRAPHICS)) {
-            fprintf(stderr,"error: setting graphics mode failed\n");
-            exit(EXIT_FAILURE);
-        }
-        struct termios t;
-        if (tcgetattr(STDIN_FILENO, &t)) {
-            fprintf(stderr, "error: couldn't disable terminal echo\n");
-            exit(EXIT_FAILURE);
-        }
-        prev_t = t;
-        t.c_lflag &= ~((tcflag_t) ECHO);
-        if (tcsetattr(STDIN_FILENO, TCSANOW, &t)) {
-            fprintf(stderr, "error: couldn't disable terminal echo\n");
-            exit(EXIT_FAILURE);
-        }
-    } else {
-        if (ioctl(tty, KDSETMODE, KD_TEXT)) {
-            fprintf(stderr,"error: setting text mode failed\n");
-            exit(EXIT_FAILURE);
-        }
-        if (tcsetattr(STDIN_FILENO, TCSANOW, &prev_t)) {
-            fprintf(stderr, "error: couldn't restore terminal attributes\n");
-            exit(EXIT_FAILURE);
-        }
-    }
+    // if (graphics) {
+    //     if (ioctl(tty, KDSETMODE, KD_GRAPHICS)) {
+    //         fprintf(stderr,"error: setting graphics mode failed\n");
+    //         exit(EXIT_FAILURE);
+    //     }
+    //     struct termios t;
+    //     if (tcgetattr(STDIN_FILENO, &t)) {
+    //         fprintf(stderr, "error: couldn't disable terminal echo\n");
+    //         exit(EXIT_FAILURE);
+    //     }
+    //     prev_t = t;
+    //     t.c_lflag &= ~((tcflag_t) ECHO);
+    //     if (tcsetattr(STDIN_FILENO, TCSANOW, &t)) {
+    //         fprintf(stderr, "error: couldn't disable terminal echo\n");
+    //         exit(EXIT_FAILURE);
+    //     }
+    // } else {
+    //     if (ioctl(tty, KDSETMODE, KD_TEXT)) {
+    //         fprintf(stderr,"error: setting text mode failed\n");
+    //         exit(EXIT_FAILURE);
+    //     }
+    //     if (tcsetattr(STDIN_FILENO, TCSANOW, &prev_t)) {
+    //         fprintf(stderr, "error: couldn't restore terminal attributes\n");
+    //         exit(EXIT_FAILURE);
+    //     }
+    // }
     close(tty);
 }
 
 int
 ppu_init(void) {
     // Open frambuffer and get the size.
-    int fb = open("/dev/fb0", O_RDWR);
+    int fb = open("/dev/graphics/fb0", O_RDWR);
     if (fb <= 0) {
         fprintf(stderr, "error: couldn't open the framebuffer\n");
         exit(EXIT_FAILURE);
@@ -147,7 +156,8 @@ ppu_init(void) {
     // Mmap the framebuffer to a buffer object.
     screen_width = info.xres;
     screen_height = info.yres;
-    size_t len = 4 * screen_width * screen_height;
+    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);
     if (framebuffer == MAP_FAILED) {
         fprintf(stderr, "error: couldn't mmap the framebuffer\n");
@@ -164,7 +174,7 @@ ppu_init(void) {
     }
 
     // Prepare TTY for graphics mode.
-    set_tty(true);
+    // set_tty(true);
 
     // Initialize default palette.
     palette[0] = 0x444444;
@@ -177,6 +187,9 @@ ppu_init(void) {
     memset(pixels_bg, 0, screen_width * screen_height);
     memset(dirty_lines, 1, screen_height);
 
+    // Clear framebuffer.
+    memset(framebuffer, 0xFF, len);
+
     // Make sure we perform an initial screen drawing.
     reqdraw = 1;
     redraw_screen();
@@ -189,11 +202,16 @@ blit_framebuffer(void) {
     if (reqdraw == 0) {
         return;
     }
+    // TODO: add some parameter to account for zoom? for example we may want to
+    // have an internal resolution smaller than the screen!
     for (size_t j = 0; j < screen_height; j++) {
         if (dirty_lines[j] != 0) {
             for (size_t i = 0; i < screen_width; i++) {
                 size_t idx = i + j * screen_width;
-                framebuffer[idx] = palette[pixels_fg[idx] << 2 | pixels_bg[idx]];
+                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?
             }
         }
         dirty_lines[j] = 0;