diff options
author | Bad Diode <bd@badd10de.dev> | 2022-05-16 17:09:47 +0200 |
---|---|---|
committer | Bad Diode <bd@badd10de.dev> | 2022-05-16 17:09:47 +0200 |
commit | 0e7a4d7ab72237fcc1c88565d4ff14b14171ad1b (patch) | |
tree | 0313d37da7eee5d97a3b598b6ca29e54ddf356e1 | |
parent | 31b867f9ef43f3d4f37efcce9bd32da32d7674dc (diff) | |
download | uxnfb-0e7a4d7ab72237fcc1c88565d4ff14b14171ad1b.tar.gz uxnfb-0e7a4d7ab72237fcc1c88565d4ff14b14171ad1b.zip |
Update to latest core with multiple file devices
-rw-r--r-- | src/main.c | 15 | ||||
m--------- | src/uxn | 0 |
2 files changed, 10 insertions, 5 deletions
@@ -32,6 +32,11 @@ halt(int stub) { | |||
32 | exit(EXIT_SUCCESS); | 32 | exit(EXIT_SUCCESS); |
33 | } | 33 | } |
34 | 34 | ||
35 | int | ||
36 | uxn_interrupt(void) { | ||
37 | return 1; | ||
38 | } | ||
39 | |||
35 | Time | 40 | Time |
36 | time_now(){ | 41 | time_now(){ |
37 | struct timespec t; | 42 | struct timespec t; |
@@ -434,7 +439,7 @@ system_deo_special(Device *d, u8 port) { | |||
434 | } | 439 | } |
435 | 440 | ||
436 | void | 441 | void |
437 | load_rom(char *file_name) { | 442 | load_uxn_rom(char *file_name) { |
438 | FILE *file = fopen(file_name, "r"); | 443 | FILE *file = fopen(file_name, "r"); |
439 | if (!file) { | 444 | if (!file) { |
440 | fprintf(stderr, "error: couldn't open file: %s\n", file_name); | 445 | fprintf(stderr, "error: couldn't open file: %s\n", file_name); |
@@ -460,7 +465,7 @@ init_uxn(Uxn *u, char *file_name) { | |||
460 | uxn_boot(u, calloc(0x10000, sizeof(u8))); | 465 | uxn_boot(u, calloc(0x10000, sizeof(u8))); |
461 | 466 | ||
462 | // Copy rom to VM. | 467 | // Copy rom to VM. |
463 | load_rom(file_name); | 468 | load_uxn_rom(file_name); |
464 | 469 | ||
465 | // Initialize framebuffer. | 470 | // Initialize framebuffer. |
466 | ppu_init(); | 471 | ppu_init(); |
@@ -484,9 +489,9 @@ init_uxn(Uxn *u, char *file_name) { | |||
484 | /* unused */ uxn_port(u, 0x7, nil_dei, nil_deo); | 489 | /* unused */ uxn_port(u, 0x7, nil_dei, nil_deo); |
485 | /* control */ devctrl = uxn_port(u, 0x8, nil_dei, nil_deo); | 490 | /* control */ devctrl = uxn_port(u, 0x8, nil_dei, nil_deo); |
486 | /* mouse */ devmouse = uxn_port(u, 0x9, nil_dei, nil_deo); | 491 | /* mouse */ devmouse = uxn_port(u, 0x9, nil_dei, nil_deo); |
487 | /* file */ uxn_port(u, 0xa, nil_dei, file_deo); | 492 | /* file0 */ uxn_port(u, 0xa, file_dei, file_deo); |
488 | /* datetime */ uxn_port(u, 0xb, datetime_dei, nil_deo); | 493 | /* file1 */ uxn_port(u, 0xb, file_dei, file_deo); |
489 | /* unused */ uxn_port(u, 0xc, nil_dei, nil_deo); | 494 | /* datetime */ uxn_port(u, 0xc, datetime_dei, nil_deo); |
490 | /* unused */ uxn_port(u, 0xd, nil_dei, nil_deo); | 495 | /* unused */ uxn_port(u, 0xd, nil_dei, nil_deo); |
491 | /* unused */ uxn_port(u, 0xe, nil_dei, nil_deo); | 496 | /* unused */ uxn_port(u, 0xe, nil_dei, nil_deo); |
492 | /* unused */ uxn_port(u, 0xf, nil_dei, nil_deo); | 497 | /* unused */ uxn_port(u, 0xf, nil_dei, nil_deo); |
diff --git a/src/uxn b/src/uxn | |||
Subproject 5057dd160a8a1672f25d6fc73eeb2379b87b86e | Subproject e00e74b9d043fef03a3692251fb792eabfcb4cd | ||