1 files changed, 40 insertions, 52 deletions

diff --git a/src/ppu.c b/src/ppu.c
index dde934e..4da3dd6 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"
@@ -23,16 +23,12 @@
    */
 
 // Parameters.
-static int zoom = 2;
-static int frames_per_update = 5;
-static int blits_per_refresh = 60 * 5;
+static size_t zoom = 4;
 
 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 frames_refresh = 0;
 
 static u8 *framebuffer = 0;
 
@@ -121,51 +117,45 @@ set_tty(bool graphics) {
         fprintf(stderr,"error: couldn't open tty\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);
-    //     }
-    // }
+    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.
-    fb_file = open("/dev/graphics/fb0", O_RDWR);
+    // TODO: Pass as macro or input parameter
+    fb_file = open("/dev/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_file, FBIOGET_VSCREENINFO, &info) != 0) {
         fprintf(stderr, "error: couldn't get the framebuffer size\n");
@@ -195,7 +185,7 @@ ppu_init(void) {
     }
 
     // Prepare TTY for graphics mode.
-    // set_tty(true);
+    set_tty(true);
 
     // Initialize default palette.
     palette[0] = 0x444444;
@@ -210,11 +200,11 @@ ppu_init(void) {
 
     // Clear framebuffer.
     memset(framebuffer, 0xFF, len);
-    write(refresh_file, "1", 1);
 
     // Make sure we perform an initial screen drawing.
     reqdraw = 1;
     redraw_screen();
+    close(fb_file);
 
     return 1;
 }
@@ -231,7 +221,7 @@ blit_framebuffer(void) {
             for (size_t i = 0; i < screen_width; i++) {
                 size_t idx = i + j * screen_width;
                 if (bpp == 16) {
-                    u16 *p = framebuffer;
+                    u16 *p = (u16*)framebuffer;
                     for (size_t zz = 0; zz < zoom; zz++) {
                         size_t fb_idx = (i * zoom + j * screen_width * zoom * zoom + zz * screen_width * zoom);
                         for (size_t z = 0; z < zoom; z++) {
@@ -239,8 +229,13 @@ blit_framebuffer(void) {
                         }
                     }
                 } else if (bpp == 32) {
-                    u32 *p = framebuffer;
-                    p[idx] = palette[pixels_fg[idx] << 2 | pixels_bg[idx]];
+                    u32 *p = (u32*)framebuffer;
+                    for (size_t zz = 0; zz < zoom; zz++) {
+                        size_t fb_idx = (i * zoom + j * screen_width * zoom * zoom + zz * screen_width * zoom);
+                        for (size_t z = 0; z < zoom; z++) {
+                            p[fb_idx + z] = palette[pixels_fg[idx] << 2 | pixels_bg[idx]];
+                        }
+                    }
                 } else {
                     fprintf(stderr, "error: wrong bits per pixel (expected 16 or 32)\n");
                     exit(EXIT_FAILURE);
@@ -249,12 +244,5 @@ blit_framebuffer(void) {
         }
         dirty_lines[j] = 0;
     }
-    // NOTE: Maybe this should happen on blit_framebuffer depending on
-    // the number of actual updates (uxn applications that don't modify
-    // the framebuffer shouldn't have to blink).
-    if (++frames_refresh > blits_per_refresh) {
-        write(refresh_file, "1", 1);
-        frames_refresh = 0;
-    }
     reqdraw = 0;
 }