projects
/
dcpu16
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modualarized 'hardware' api changes complete
[dcpu16]
/
vm-dcpu16.c
diff --git
a/vm-dcpu16.c
b/vm-dcpu16.c
index 5accf2f740ed5c76baaf0235896ff845c6860612..b8a35327b0721bc75961fa86a3746ac227b7a3e5 100644
(file)
--- a/
vm-dcpu16.c
+++ b/
vm-dcpu16.c
@@
-533,7
+533,7
@@
COMMAND_IMPL(display) {
if (arg_count == 3)
renderer_arg = arg_vector[2];
if (arg_count == 3)
renderer_arg = arg_vector[2];
- hw =
lem1802_new(vm
);
+ hw =
dcpu16_hw_new(vm, &dcpu16_hw_module_lem1802, NULL
);
if (hw == NULL) {
fprintf(stderr, "failed to initialize new display\n");
return 0;
if (hw == NULL) {
fprintf(stderr, "failed to initialize new display\n");
return 0;
@@
-542,16
+542,12
@@
COMMAND_IMPL(display) {
/* handle per-renderer setup of data.. */
/* FIXME: these are awkward */
if (strcmp(renderer, "pnm") == 0) {
/* handle per-renderer setup of data.. */
/* FIXME: these are awkward */
if (strcmp(renderer, "pnm") == 0) {
- if (renderer_arg == NULL)
- renderer_arg = display_filename_default_;
- renderer_data = (void *)renderer_arg;
+ renderer_data = (void *)(renderer_arg ? renderer_arg : display_filename_default_);
}
#ifdef HAVE_LIBPNG
if (strcmp(renderer, "png") == 0) {
}
#ifdef HAVE_LIBPNG
if (strcmp(renderer, "png") == 0) {
- if (renderer_arg == NULL)
- renderer_arg = display_filename_default_;
- renderer_data = (void *)renderer_arg;
+ renderer_data = (void *)(renderer_arg ? renderer_arg : display_filename_default_);
}
#endif /* HAVE_LIBPNG */
}
#endif /* HAVE_LIBPNG */
@@
-564,7
+560,7
@@
COMMAND_IMPL(display) {
s = rfbScreen_next_available_display_(&rfbScreens_, argc, argv);
if (s == NULL) {
fprintf(stderr, "failed to initialize vnc\n");
s = rfbScreen_next_available_display_(&rfbScreens_, argc, argv);
if (s == NULL) {
fprintf(stderr, "failed to initialize vnc\n");
-
lem1802
_del(&hw);
+
dcpu16_hw
_del(&hw);
return 0;
}
return 0;
}
@@
-577,13
+573,13
@@
COMMAND_IMPL(display) {
if (lem1802_renderer_set(hw, renderer, renderer_data)) {
fprintf(stderr, "failed to set back-end renderer for display\n");
if (lem1802_renderer_set(hw, renderer, renderer_data)) {
fprintf(stderr, "failed to set back-end renderer for display\n");
-
lem1802
_del(&hw);
+
dcpu16_hw
_del(&hw);
return 0;
}
return 0;
}
- if (dcpu16_hw_a
dd
(vm, hw)) {
+ if (dcpu16_hw_a
ttach
(vm, hw)) {
fprintf(stderr, "failed to attach new display\n");
fprintf(stderr, "failed to attach new display\n");
-
lem1802
_del(&hw);
+
dcpu16_hw
_del(&hw);
return 0;
}
return 0;
}
@@
-611,7
+607,7
@@
COMMAND_IMPL(keyboard) {
(void)arg_count, (void)arg_vector;
(void)arg_count, (void)arg_vector;
- hw =
keyboard_new(vm
);
+ hw =
dcpu16_hw_new(vm, &dcpu16_hw_module_keyboard, NULL
);
if (hw == NULL) {
fprintf(stderr, "failed to initialize new keyboard\n");
return 0;
if (hw == NULL) {
fprintf(stderr, "failed to initialize new keyboard\n");
return 0;
@@
-625,15
+621,15
@@
COMMAND_IMPL(keyboard) {
s = rfbScreen_next_available_keyboard_(&rfbScreens_, argc, argv);
if (s == NULL) {
fprintf(stderr, "failed to initialize vnc\n");
s = rfbScreen_next_available_keyboard_(&rfbScreens_, argc, argv);
if (s == NULL) {
fprintf(stderr, "failed to initialize vnc\n");
-
keyboard
_del(&hw);
+
dcpu16_hw
_del(&hw);
return 0;
}
keyboard_vnc_associate(hw, s->screen);
s->attached_keyboard = hw;
return 0;
}
keyboard_vnc_associate(hw, s->screen);
s->attached_keyboard = hw;
- if (dcpu16_hw_a
dd
(vm, hw)) {
+ if (dcpu16_hw_a
ttach
(vm, hw)) {
fprintf(stderr, "failed to attach new keyboard\n");
fprintf(stderr, "failed to attach new keyboard\n");
-
keyboard
_del(&hw);
+
dcpu16_hw
_del(&hw);
return 0;
}
#endif /* HAVE_LIBVNCSERVER */
return 0;
}
#endif /* HAVE_LIBVNCSERVER */