commit 4792b31
Devine Lu Linvega
·
2024-11-26 23:04:22 +0000 UTC
parent 04e8cd2
Improved initialization
1 files changed,
+11,
-14
+11,
-14
1@@ -80,27 +80,24 @@ system_reboot(char *rom, int soft)
2 int
3 system_boot(Uint8 *ram, char *boot)
4 {
5- if(!system_load(&ram[BIOS_PAGE + PAGE_PROGRAM], "bios.rom")) {
6- size_t i, bios_len = sizeof(bios_rom) / sizeof(bios_rom[0]);
7- for(i = 0; i < bios_len; i++)
8- ram[BIOS_PAGE + PAGE_PROGRAM + i] = bios_rom[i];
9- }
10 /* Load rom(bios) */
11 bios.ram = ram + BIOS_PAGE;
12 bios.dev = bios.ram + 0x8300;
13 bios.wst.dat = bios.ram + 0x8400;
14 bios.rst.dat = bios.ram + 0x8500;
15 bios.dev[0xe] = 0xff;
16- /* Load rom(main) */
17- if(system_load(&ram[PAGE_PROGRAM], boot)) {
18- uxn.ram = ram;
19- uxn.dev = bios.ram + 0x8000;
20- uxn.wst.dat = bios.ram + 0x8100;
21- uxn.rst.dat = bios.ram + 0x8200;
22- boot_rom = boot;
23- return 1;
24+ if(!system_load(bios.ram + PAGE_PROGRAM, "bios.rom")) {
25+ size_t i, bios_len = sizeof(bios_rom) / sizeof(bios_rom[0]);
26+ for(i = 0; i < bios_len; i++)
27+ bios.ram[PAGE_PROGRAM + i] = bios_rom[i];
28 }
29- return 0;
30+ /* Load rom(main) */
31+ uxn.ram = ram;
32+ uxn.dev = bios.ram + 0x8000;
33+ uxn.wst.dat = bios.ram + 0x8100;
34+ uxn.rst.dat = bios.ram + 0x8200;
35+ boot_rom = boot;
36+ return system_load(uxn.ram + PAGE_PROGRAM, boot);
37 }
38
39 /* IO */