1 files changed, 24 insertions, 36 deletions

diff --git a/src/main.c b/src/main.c
index b5247af..aabf79f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,45 +1,36 @@
-#include<stdio.h>
-#include<stdlib.h>
-#include<stdint.h>
-#include<stdbool.h>
-#include<unistd.h>
-#include<fcntl.h>
-#include<linux/fb.h>
-#include<sys/ioctl.h>
-#include<sys/mman.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <linux/fb.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+
+#include "shorthand.h"
+#include "ppu.c"
+#include "uxn-fast.c"
+#include "rom.c"
+
+// static Uxn u;
+// static Device *devscreen;
+// static Device *devctrl;
+// static Device *devmouse;
+// static Device *devaudio;
 
 int
 main(void) {
-        // Open frambuffer and get the size.
-        int fb = open("/dev/fb0", O_RDWR);
-        if (fb <= 0) {
-                fprintf(stderr, "couldn't open the framebuffer\n");
-                exit(EXIT_FAILURE);
-        }
-        struct fb_var_screeninfo info;
-        if (ioctl(fb, FBIOGET_VSCREENINFO, &info) != 0) {
-                fprintf(stderr, "couldn't get the framebuffer size\n");
-                exit(EXIT_FAILURE);
-        }
-
-        // Mmap the framebuffer to a buffer object.
-        size_t width = info.xres;
-        size_t height = info.yres;
-        size_t len = 4 * width * height;
-        uint32_t *buf = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fb, 0);
-        if (buf == MAP_FAILED) {
-                fprintf(stderr, "couldn't mmap the framebuffer\n");
-                exit(EXIT_FAILURE);
-        }
+    ppu_init();
 
         // Main loop.
         uint8_t shade = 0;
         size_t counter = 0;
         size_t direction = 1;
         while (true) {
-                for (size_t j = 0; j < height; j++) {
-                        for (size_t i = 0; i < width; i++) {
-                                buf[j * width + i] = shade;
+                for (size_t j = 0; j < screen_height; j++) {
+                        for (size_t i = 0; i < screen_width; i++) {
+                                framebuffer[j * screen_width + i] = shade;
                         }
                 }
                 counter++;
@@ -54,8 +45,5 @@ main(void) {
                 }
         }
 
-        // Cleanup.
-        munmap(buf, len);
-        close(fb);
         return 0;
 }