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

Added the missing device initializers

This commit is contained in:
neauoire 2022-04-04 20:04:32 -07:00
parent e5492665c0
commit dbd430026d
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/uxn.c
View File

@ -111,7 +111,6 @@ uxn_boot(Uxn *u, Uint8 *ram)
u->ram = ram; u->ram = ram;
u->wst = (Stack*)(ram + 0x10000); u->wst = (Stack*)(ram + 0x10000);
u->rst = (Stack*)(ram + 0x10100); u->rst = (Stack*)(ram + 0x10100);
u->dev2 = (Uint8*)(ram + 0x10200);
return 1; return 1;
} }

2
src/uxn.h
View File

@ -37,7 +37,7 @@ typedef struct Device {
} Device; } Device;
typedef struct Uxn { typedef struct Uxn {
Uint8 *ram, *dev2; Uint8 *ram;
Stack *wst, *rst; Stack *wst, *rst;
Uint8 (*dei)(struct Uxn *u, Uint8 address); Uint8 (*dei)(struct Uxn *u, Uint8 address);
void (*deo)(struct Uxn *u, Uint8 address, Uint8 value); void (*deo)(struct Uxn *u, Uint8 address, Uint8 value);

31
src/uxn11.c
View File

@ -168,6 +168,19 @@ processEvent(void)
} }
} }
static Uint8
nil_dei(Device *d, Uint8 port)
{
return d->dat[port];
}
static void
nil_deo(Device *d, Uint8 port)
{
(void)d;
(void)port;
}
static int static int
start(Uxn *u, char *rom) start(Uxn *u, char *rom)
{ {
@ -178,6 +191,24 @@ start(Uxn *u, char *rom)
fprintf(stderr, "Loaded %s\n", rom); fprintf(stderr, "Loaded %s\n", rom);
u->dei = uxn11_dei; u->dei = uxn11_dei;
u->deo = uxn11_deo; u->deo = uxn11_deo;
/* system */ uxn_port(u, 0x0, nil_dei, system_deo);
/* console */ uxn_port(u, 0x1, nil_dei, console_deo);
/* screen */ devscreen = uxn_port(u, 0x2, screen_dei, screen_deo);
/* empty */ uxn_port(u, 0x3, nil_dei, nil_deo);
/* empty */ uxn_port(u, 0x4, nil_dei, nil_deo);
/* empty */ uxn_port(u, 0x5, nil_dei, nil_deo);
/* empty */ uxn_port(u, 0x6, nil_dei, nil_deo);
/* empty */ uxn_port(u, 0x7, nil_dei, nil_deo);
/* control */ devctrl = uxn_port(u, 0x8, nil_dei, nil_deo);
/* mouse */ devmouse = uxn_port(u, 0x9, nil_dei, nil_deo);
/* file0 */ uxn_port(u, 0xa, file_dei, file_deo);
/* file1 */ uxn_port(u, 0xb, file_dei, file_deo);
/* datetime */ uxn_port(u, 0xc, datetime_dei, nil_deo);
/* empty */ uxn_port(u, 0xd, nil_dei, nil_deo);
/* reserved */ uxn_port(u, 0xe, nil_dei, nil_deo);
/* reserved */ uxn_port(u, 0xf, nil_dei, nil_deo);
screen_resize(&uxn_screen, WIDTH, HEIGHT); screen_resize(&uxn_screen, WIDTH, HEIGHT);
if(!uxn_eval(u, PAGE_PROGRAM)) if(!uxn_eval(u, PAGE_PROGRAM))
return error("Boot", "Failed to start rom."); return error("Boot", "Failed to start rom.");