commit f0bac42

Devine Lu Linvega  ·  2024-11-27 17:33:08 +0000 UTC
parent 1c78615 
(system) Cleanup
3 files changed,  +9, -12
M src/devices/system.c
M src/devices/system.h
M src/uxn11.c
M src/devices/system.c
+3, -5 
 1@@ -63,18 +63,16 @@ system_inspect(void)
 2 int
 3 system_error(char *msg, const char *err)
 4 {
 5-	fprintf(stderr, "%s: %s\n", msg, err);
 6-	fflush(stderr);
 7+	fprintf(stderr, "%s: %s\n", msg, err), fflush(stderr);
 8 	return 0;
 9 }
10 
11 void
12-system_reboot(char *rom, int soft)
13+system_reboot(int soft)
14 {
15 	system_zero(&uxn, soft);
16 	if(system_load(&uxn.ram[PAGE_PROGRAM], boot_rom))
17-		if(uxn_eval(&uxn, PAGE_PROGRAM))
18-			boot_rom = rom;
19+		uxn_eval(&uxn, PAGE_PROGRAM);
20 }
21 
22 int
M src/devices/system.h
+1, -2 
 1@@ -11,7 +11,7 @@ WITH REGARD TO THIS SOFTWARE.
 2 
 3 #define RAM_PAGES 0x10
 4 
 5-void system_reboot(char *rom, int soft);
 6+void system_reboot(int soft);
 7 void system_inspect(void);
 8 int system_error(char *msg, const char *err);
 9 int system_boot(Uint8 *ram, char *rom);
10@@ -19,5 +19,4 @@ int system_boot(Uint8 *ram, char *rom);
11 Uint8 system_dei(Uxn *u, Uint8 addr);
12 void system_deo(Uxn *u, Uint8 addr);
13 
14-extern char *boot_rom;
15 extern Uxn bios;
M src/uxn11.c
+5, -5 
 1@@ -89,13 +89,13 @@ emu_resize(int w, int h)
 2 }
 3 
 4 static void
 5-emu_restart(char *rom, int soft)
 6+emu_restart(int soft)
 7 {
 8 	close_console();
 9 	screen_resize(WIDTH, HEIGHT, uxn_screen.scale);
10 	screen_fill(uxn_screen.bg, 0);
11 	screen_fill(uxn_screen.fg, 0);
12-	system_reboot(rom, soft);
13+	system_reboot(soft);
14 }
15 
16 static Uint8
17@@ -144,8 +144,8 @@ emu_event(void)
18 		case XK_F1: toggle_scale(); break;
19 		case XK_F2: uxn.dev[0x0e] = !uxn.dev[0x0e]; break;
20 		case XK_F3: uxn.dev[0x0f] = 0xff; break;
21-		case XK_F4: emu_restart(boot_rom, 0); break;
22-		case XK_F5: emu_restart(boot_rom, 1); break;
23+		case XK_F4: emu_restart(0); break;
24+		case XK_F5: emu_restart(1); break;
25 		}
26 		controller_down(get_button(sym));
27 		controller_key(sym < 0x80 ? sym : (Uint8)buf[0]);
28@@ -201,7 +201,7 @@ display_init(void)
29 	XSelectInput(display, window, ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ExposureMask | KeyPressMask | KeyReleaseMask);
30 	wmDelete = XInternAtom(display, "WM_DELETE_WINDOW", True);
31 	XSetWMProtocols(display, window, &wmDelete, 1);
32-	XStoreName(display, window, boot_rom);
33+	XStoreName(display, window, "uxn11");
34 	XSetClassHint(display, window, &class);
35 	XMapWindow(display, window);
36 	ximage = XCreateImage(display, visual, DefaultDepth(display, DefaultScreen(display)), ZPixmap, 0, (char *)uxn_screen.pixels, uxn_screen.width, uxn_screen.height, 32, 0);