Fix warnings

2 files changed, 7 insertions, 61 deletions

diff --git a/src/main.c b/src/main.c
index a0a56f9..6dd4b39 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,7 +28,6 @@ typedef struct timespec Time;
 void
 halt(int stub) {
     (void)stub;
-    set_tty(false);
     exit(EXIT_SUCCESS);
 }
 
@@ -568,7 +567,6 @@ main(int argc, char *argv[]) {
     // Main loop.
     Time frame_time = time_now();
     size_t frames_update = 0;
-    size_t frames_refresh = 0;
     while (true) {
         poll_input();
         size_t elapsed = time_elapsed(frame_time);
diff --git a/src/ppu.c b/src/ppu.c
index dde934e..19d41f5 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -4,7 +4,6 @@
 
 #include <linux/fb.h>
 #include <sys/ioctl.h>
-// #include <sys/kd.h>
 #include <sys/mman.h>
 
 #include "ppu.h"
@@ -24,7 +23,7 @@
 
 // Parameters.
 static int zoom = 2;
-static int frames_per_update = 5;
+static size_t frames_per_update = 5;
 static int blits_per_refresh = 60 * 5;
 
 static size_t screen_width = 0;
@@ -32,7 +31,7 @@ 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 int frames_refresh = 0;
 
 static u8 *framebuffer = 0;
 
@@ -111,46 +110,6 @@ redraw_screen(void) {
     }
 }
 
-static struct termios prev_t;
-
-void
-set_tty(bool graphics) {
-    // Disable TTY echo and set graphics mode.
-    int tty = open("/dev/tty0", O_RDWR);
-    if (!tty) {
-        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);
-    //     }
-    // }
-    close(tty);
-}
-
 int
 ppu_init(void) {
     // Open frambuffer and get the size.
@@ -194,9 +153,6 @@ ppu_init(void) {
         exit(EXIT_FAILURE);
     }
 
-    // Prepare TTY for graphics mode.
-    // set_tty(true);
-
     // Initialize default palette.
     palette[0] = 0x444444;
     palette[1] = 0xffffff;
@@ -230,20 +186,12 @@ blit_framebuffer(void) {
         if (dirty_lines[j] != 0) {
             for (size_t i = 0; i < screen_width; i++) {
                 size_t idx = i + j * screen_width;
-                if (bpp == 16) {
-                    u16 *p = 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] = rgb565(palette[pixels_fg[idx] << 2 | pixels_bg[idx]]);
-                        }
+                u16 *p = (u16*)framebuffer;
+                for (int zz = 0; zz < zoom; zz++) {
+                    size_t fb_idx = (i * zoom + j * screen_width * zoom * zoom + zz * screen_width * zoom);
+                    for (int z = 0; z < zoom; z++) {
+                        p[fb_idx + z] = 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);
                 }
             }
         }