projects
/
dcpu16
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor cleanups to display and callback routines
[dcpu16]
/
vm-dcpu16.c
diff --git
a/vm-dcpu16.c
b/vm-dcpu16.c
index 1e3a49656757f8e68cd90ebae13a12bd75018ed1..5f652739e6c477aa428cae2bb55a82e8d2693af3 100644
(file)
--- a/
vm-dcpu16.c
+++ b/
vm-dcpu16.c
@@
-368,31
+368,31
@@
COMMAND_HELP(run) {
COMMAND_IMPL(display) {
(void)arg_count, (void)arg_vector;
COMMAND_IMPL(display) {
(void)arg_count, (void)arg_vector;
- static D
PIX *pixbuf
= NULL;
+ static D
CPU16_DISPLAY *display
= NULL;
- if (
pixbuf
) {
+ if (
display
) {
printf("display already enabled..\n");
return 0;
}
printf("display already enabled..\n");
return 0;
}
-
pixbuf = display_init_pixbuf(
);
- if (
pixbuf
== NULL) {
+
display = display_new("dcpu16-display.pnm"
);
+ if (
display
== NULL) {
fprintf(stderr, "failed to initialize display buffer\n");
return 0;
}
fprintf(stderr, "failed to initialize display buffer\n");
return 0;
}
- if (dcpu16_acct_add(vm, DCPU16_ACCT_EV_WRITE, display_fn,
pixbuf
)) {
+ if (dcpu16_acct_add(vm, DCPU16_ACCT_EV_WRITE, display_fn,
display
)) {
fprintf(stderr, "failed to register display update callback\n");
return 0;
}
fprintf(stderr, "failed to register display update callback\n");
return 0;
}
- if (dcpu16_acct_add(vm, DCPU16_ACCT_EV_RESET, display_reset_fn,
pixbuf
)) {
+ if (dcpu16_acct_add(vm, DCPU16_ACCT_EV_RESET, display_reset_fn,
display
)) {
fprintf(stderr, "failed to register display reset callback\n");
return 0;
}
/* init display as if reset occurred */
fprintf(stderr, "failed to register display reset callback\n");
return 0;
}
/* init display as if reset occurred */
- display_reset_fn(vm, DCPU16_ACCT_EV_RESET, 0,
pixbuf
);
+ display_reset_fn(vm, DCPU16_ACCT_EV_RESET, 0,
display
);
return 0;
}
return 0;
}