commit bc2ede8

Devine Lu Linvega  ·  2025-01-19 19:56:47 +0000 UTC
parent 1c7c37f 
Housekeeping
4 files changed,  +17, -18
M src/devices/screen.c
M src/devices/screen.h
M src/devices/system.c
M src/devices/system.h
M src/devices/screen.c
+0, -1 
1@@ -1,5 +1,4 @@
2 #include <stdlib.h>
3-#include <stdio.h>
4 
5 #include "../uxn.h"
6 #include "screen.h"
M src/devices/screen.h
+1, -1 
1@@ -20,7 +20,7 @@ extern int emu_resize(int width, int height);
2 int screen_changed(void);
3 void screen_palette(void);
4 void screen_resize(Uint16 width, Uint16 height, int scale);
5-void screen_redraw();
6+void screen_redraw(void);
7 
8 Uint8 screen_dei(Uint8 addr);
9 void screen_deo(Uint8 addr);
M src/devices/system.c
+14, -14 
 1@@ -27,13 +27,6 @@ system_print(Stack *s)
 2 	fprintf(stderr, "< \n");
 3 }
 4 
 5-int
 6-system_error(char *msg, const char *err)
 7-{
 8-	fprintf(stderr, "%s: %s\n", msg, err), fflush(stderr);
 9-	return 0;
10-}
11-
12 static int
13 system_load(Uint8 *ram, char *rom_path)
14 {
15@@ -47,6 +40,20 @@ system_load(Uint8 *ram, char *rom_path)
16 	return !!f;
17 }
18 
19+int
20+system_error(char *msg, const char *err)
21+{
22+	fprintf(stderr, "%s: %s\n", msg, err), fflush(stderr);
23+	return 0;
24+}
25+
26+int
27+system_boot(Uint8 *ram, char *rom_path)
28+{
29+	uxn.ram = ram, boot_path = rom_path;
30+	return system_load(uxn.ram + PAGE_PROGRAM, rom_path);
31+}
32+
33 void
34 system_reboot(int soft)
35 {
36@@ -58,13 +65,6 @@ system_reboot(int soft)
37 		uxn_eval(PAGE_PROGRAM);
38 }
39 
40-int
41-system_boot(Uint8 *ram, char *rom_path)
42-{
43-	uxn.ram = ram, boot_path = rom_path;
44-	return system_load(uxn.ram + PAGE_PROGRAM, rom_path);
45-}
46-
47 /* IO */
48 
49 Uint8
M src/devices/system.h
+2, -2 
 1@@ -11,9 +11,9 @@ WITH REGARD TO THIS SOFTWARE.
 2 
 3 #define RAM_PAGES 0x10
 4 
 5-void system_reboot(int soft);
 6 int system_error(char *msg, const char *err);
 7-int system_boot(Uint8 *ram, char *rompath);
 8+int system_boot(Uint8 *ram, char *rom_path);
 9+void system_reboot(int soft);
10 
11 Uint8 system_dei(Uint8 addr);
12 void system_deo(Uint8 addr);