projects
/
dcpu16
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
further reorg of module abstraction and control interface
[dcpu16]
/
vm-dcpu16.c
diff --git
a/vm-dcpu16.c
b/vm-dcpu16.c
index 5accf2f740ed5c76baaf0235896ff845c6860612..a6dc67dac2ca2f2212eac09ffe2836e46e913fc1 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,32
+560,38
@@
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;
}
- lem1802_vnc_associate(hw, s->screen);
+ if (dcpu16_hw_ctl(hw, "associate_rfbScreen", s->screen, NULL)) {
+ fprintf(stderr, "failed to configure display/vnc");
+ dcpu16_hw_del(&hw);
+ return 0;
+ }
s->attached_display = hw;
rfbScreen_start(s->screen);
renderer_data = s->screen;
}
#endif /* HAVE_LIBVNCSERVER */
s->attached_display = hw;
rfbScreen_start(s->screen);
renderer_data = s->screen;
}
#endif /* HAVE_LIBVNCSERVER */
- if (lem1802_renderer_set(hw, renderer, renderer_data)) {
- fprintf(stderr, "failed to set back-end renderer for display\n");
- lem1802_del(&hw);
- return 0;
- }
+ dcpu16_hw_ctl(hw, "renderer", (char *)renderer, NULL);
+ dcpu16_hw_ctl(hw, "renderer_data", renderer_data, NULL);
- 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;
}
COMMAND_HELP(display) {
return 0;
}
return 0;
}
COMMAND_HELP(display) {
+ struct renderer_ {
+ char *name;
+ char *args;
+ int (*renderer)(void *, void *, size_t, size_t);
+ } *r;
char *name, *args;
void *iter;
char *name, *args;
void *iter;
@@
-600,6
+602,16
@@
COMMAND_HELP(display) {
);
fprintf(f, "Supported renderers:\n");
);
fprintf(f, "Supported renderers:\n");
+
+ if (dcpu16_hw_module_lem1802.ctl(NULL, "get_renderers", NULL, &r)) {
+ fprintf(stderr, "error fetching list of renderers\n");
+ return;
+ }
+
+ while (r->name) {
+ fprintf(f, "name:%s args:%s\n", r->name, r->args);
+ }
+
iter = NULL;
while ( (lem1802_renderers_iter(&iter, &name, &args)) ) {
fprintf(f, "\t%s %s\n", name, args);
iter = NULL;
while ( (lem1802_renderers_iter(&iter, &name, &args)) ) {
fprintf(f, "\t%s %s\n", name, args);
@@
-611,7
+623,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
+637,19
@@
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;
+ }
+ if (dcpu16_hw_ctl(hw, "associate_rfbScreen", s->screen, NULL)) {
+ fprintf(stderr, "failed to configure keyboard/vnc\n");
+ dcpu16_hw_del(&hw);
return 0;
}
return 0;
}
- keyboard_vnc_associate(hw, s->screen);
s->attached_keyboard = hw;
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 */