d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Connecting new device ports to uxn core

This commit is contained in:
Devine Lu Linvega 2023-01-01 12:04:54 -08:00
parent d1ca328b98
commit 0fd68e96f0
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/uxn.c
View File

@ -116,7 +116,7 @@ timeout:
/* clang-format on */ /* clang-format on */
int int
uxn_boot(Uxn *u, Uint8 *ram) uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo)
{ {
Uint32 i; Uint32 i;
char *cptr = (char *)u; char *cptr = (char *)u;

7
src/uxn.h
View File

@ -49,9 +49,14 @@ typedef struct Uxn {
Uint8 *ram; Uint8 *ram;
Stack wst, rst; Stack wst, rst;
Device dev[16]; Device dev[16];
Uint8 (*dei)(struct Uxn *u, Uint8 addr);
void (*deo)(struct Uxn *u, Uint8 addr, Uint8 value);
} Uxn; } Uxn;
int uxn_boot(Uxn *u, Uint8 *ram); typedef Uint8 Dei(Uxn *u, Uint8 addr);
typedef void Deo(Uxn *u, Uint8 addr, Uint8 value);
int uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo);
int uxn_eval(Uxn *u, Uint16 pc); int uxn_eval(Uxn *u, Uint16 pc);
int uxn_interrupt(void); int uxn_interrupt(void);
int uxn_halt(Uxn *u, Uint8 error, Uint16 addr); int uxn_halt(Uxn *u, Uint8 error, Uint16 addr);

13
src/uxncli.c
View File

@ -24,6 +24,17 @@ error(char *msg, const char *err)
return 0; return 0;
} }
static Uint8
emu_dei(Uxn *u, Uint8 addr)
{
return 0;
}
static void
emu_deo(Uxn *u, Uint8 addr, Uint8 v)
{
}
void void
system_deo_special(Device *d, Uint8 port) system_deo_special(Device *d, Uint8 port)
{ {
@ -83,7 +94,7 @@ uxn_interrupt(void)
static int static int
start(Uxn *u) start(Uxn *u)
{ {
if(!uxn_boot(u, (Uint8 *)calloc(0x10000, sizeof(Uint8)))) if(!uxn_boot(u, (Uint8 *)calloc(0x10000, sizeof(Uint8)), emu_dei, emu_deo))
return error("Boot", "Failed"); return error("Boot", "Failed");
/* system */ uxn_port(u, 0x0, system_dei, system_deo); /* system */ uxn_port(u, 0x0, system_dei, system_deo);
/* console */ uxn_port(u, 0x1, nil_dei, console_deo); /* console */ uxn_port(u, 0x1, nil_dei, console_deo);

13
src/uxnemu.c
View File

@ -176,6 +176,17 @@ init(void)
#pragma mark - Devices #pragma mark - Devices
static Uint8
emu_dei(Uxn *u, Uint8 addr)
{
return 0;
}
static void
emu_deo(Uxn *u, Uint8 addr, Uint8 v)
{
}
void void
system_deo_special(Device *d, Uint8 port) system_deo_special(Device *d, Uint8 port)
{ {
@ -253,7 +264,7 @@ static int
start(Uxn *u, char *rom) start(Uxn *u, char *rom)
{ {
free(u->ram); free(u->ram);
if(!uxn_boot(u, calloc(0x10000, 1))) if(!uxn_boot(u, calloc(0x10000, 1), emu_dei, emu_deo))
return error("Boot", "Failed to start uxn."); return error("Boot", "Failed to start uxn.");
if(!load(u, rom)) if(!load(u, rom))
return error("Boot", "Failed to load rom."); return error("Boot", "Failed to load rom.");