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

Removed console as Device

This commit is contained in:
neauoire 2022-04-05 09:29:06 -07:00
parent b0c840437a
commit 8ca86ea9b2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -23,4 +23,4 @@ fi
echo "Done." echo "Done."
# echo "Running.." # echo "Running.."
bin/uxn11 ~/roms/left.rom bin/uxn11 ~/roms/left.rom README.md

10
src/uxn11.c
View File

@ -44,16 +44,16 @@ console_input(Uxn *u, char c)
{ {
Device *d = &u->dev[1]; Device *d = &u->dev[1];
d->dat[0x2] = c; d->dat[0x2] = c;
return uxn_eval(u, GETVECTOR(d)); return uxn_eval(u, GETVEC(d->dat));
} }
static void static void
console_deo(Device *d, Uint8 port) console_deo(Uint8 *d, Uint8 port)
{ {
FILE *fd = port == 0x8 ? stdout : port == 0x9 ? stderr FILE *fd = port == 0x8 ? stdout : port == 0x9 ? stderr
: 0; : 0;
if(fd) { if(fd) {
fputc(d->dat[port], fd); fputc(d[port], fd);
fflush(fd); fflush(fd);
} }
} }
@ -80,7 +80,7 @@ uxn11_deo(Uxn *u, Uint8 addr, Uint8 v)
d->dat[p] = v; d->dat[p] = v;
switch(addr & 0xf0) { switch(addr & 0xf0) {
case 0x00: system_deo(d, p); break; case 0x00: system_deo(d, p); break;
case 0x10: console_deo(d, p); break; case 0x10: console_deo(d->dat, p); break;
case 0x20: screen_deo(u->ram, d->dat, p); break; case 0x20: screen_deo(u->ram, d->dat, p); break;
case 0xa0: file_deo(d, p); break; case 0xa0: file_deo(d, p); break;
case 0xb0: file_deo(d, p); break; case 0xb0: file_deo(d, p); break;
@ -193,7 +193,7 @@ start(Uxn *u, char *rom)
u->deo = uxn11_deo; u->deo = uxn11_deo;
/* system */ uxn_port(u, 0x0, nil_dei, system_deo); /* system */ uxn_port(u, 0x0, nil_dei, system_deo);
/* console */ uxn_port(u, 0x1, nil_dei, console_deo); /* console */ uxn_port(u, 0x1, nil_dei, nil_deo);
/* screen */ devscreen = uxn_port(u, 0x2, nil_dei, nil_deo); /* screen */ devscreen = uxn_port(u, 0x2, nil_dei, nil_deo);
/* empty */ uxn_port(u, 0x3, nil_dei, nil_deo); /* empty */ uxn_port(u, 0x3, nil_dei, nil_deo);
/* empty */ uxn_port(u, 0x4, nil_dei, nil_deo); /* empty */ uxn_port(u, 0x4, nil_dei, nil_deo);