X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=hw_lem1802.c;h=0b95d1180530d885e533a05b48a8d960d5d8ac0d;hb=49be905f037fbd22b6ae0275efbab2ed95d4d9b7;hp=f17ebc73287a2eff7eaa083f37fb400e6bf3548c;hpb=8b552fe61db48874f043bccfb589e5444509444c;p=dcpu16 diff --git a/hw_lem1802.c b/hw_lem1802.c index f17ebc7..0b95d11 100644 --- a/hw_lem1802.c +++ b/hw_lem1802.c @@ -18,6 +18,12 @@ #include "chargen-4x8.h" #include "hw_lem1802.h" +/* lem1802 + * + * TODO: + * multiple vnc displays + */ + #ifdef DEBUG #define TRACE(...) do { printf("[debug] "); printf(__VA_ARGS__); printf("\n"); } while (0) #else /* DEBUG */ @@ -313,7 +319,8 @@ f_done: #ifdef HAVE_LIBVNCSERVER /* create and return a new screen, easiest to do here because we know the screen dimensions */ -rfbScreenInfoPtr lem1802_rfb_new(int argc, char *argv[]) { +static +rfbScreenInfoPtr lem1802_rfb_new_(int argc, char *argv[]) { rfbScreenInfoPtr s; int paddedWidth = PIX_X + ( (PIX_X & 3) ? (4 - (PIX_X & 3)) : 0 ); int height = PIX_Y; @@ -337,15 +344,6 @@ rfbScreenInfoPtr lem1802_rfb_new(int argc, char *argv[]) { return s; } -/* set up a new screen to see our pixels */ -void lem1802_vnc_associate(struct dcpu16_hw *hw, rfbScreenInfoPtr s) { - struct lem1802_ *display = (struct lem1802_ *)hw->data; - - s->desktopName = "NYA ELEKTRISKA LEM1802"; - s->frameBuffer = (char *)display->pixbuf; - - TRACE("%s>> s:%p\n", __func__, VOIDP(s)); -} /* notify rfb server that pixels may have changed */ static @@ -512,22 +510,8 @@ static struct renderer_ { { NULL, NULL, NULL } }; -int lem1802_renderer_set(struct dcpu16_hw *hw, const char *renderer, void *data) { - struct renderer_ *r; - - for (r = lem1802_renderers_; r->renderer; r++) { - if (strcmp(renderer, r->name) == 0) { - ((struct lem1802_ *)(hw->data))->render = r->renderer; - ((struct lem1802_ *)(hw->data))->renderer_data = data; - TRACE("%s>> renderer set to %s", __func__, renderer); - return 0; - } - } - - return -1; -} - -char *lem1802_renderers_iter(void **iterp, char **name, char **args) { +static +char *lem1802_renderers_iter_(void **iterp, char **name, char **args) { struct renderer_ **r = (struct renderer_ **)iterp; if (*r == NULL) @@ -546,6 +530,7 @@ char *lem1802_renderers_iter(void **iterp, char **name, char **args) { return (*r)->name; } +static int lem1802_data_init_(struct dcpu16_hw *hw, void *data) { (void)data; @@ -569,26 +554,145 @@ int lem1802_data_init_(struct dcpu16_hw *hw, void *data) { return 0; } +static void lem1802_data_free_(struct dcpu16_hw *hw) { if (hw) { if (hw->data) { - /* FIXME: free renderer data */ - hw->vm->warn_cb_("FIXME"); - if (((struct lem1802_ *)(hw->data))->pixbuf) { free(((struct lem1802_ *)(hw->data))->pixbuf); ((struct lem1802_ *)(hw->data))->pixbuf = NULL; } - free(hw->data); hw->data = NULL; } } } +static struct dcpu16_hw_ctl_cmd ctl_[] = { + { "blink_rate", "const unsigned int *", "unsigned int *", "sets or gets cycles per blink toggle" }, + { "refresh_rate", "const unsigned int *", "unsigned int *", "sets or gets cycles per screen refresh" }, +#ifdef HAVE_LIBVNCSERVER + { "new_rfbScreen", "struct { int argc; char **argv;} *", "rfbScreenInfoPtr *", "allocates a new rfb screen" }, + { "associate_rfbScreen", "rfbScreenInfoPtr", "NULL", "associates this lem1802 instance with an rfb display" }, +#endif /* HAVE_LIBVNCSERVER */ + { "renderers_iter", "void **", "struct {char *name; char *args;} *", "returns the next renderer this module is capable of using" }, + { "renderer", "const char *", "NULL", "sets this lem1802 instance to use renderer" }, + { "renderer_data", "void *", "NULL", "sets renderer-specific data" }, + { NULL, NULL, NULL, NULL } +}; + +static +int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void *data_out) { + if (strcmp(cmd, "blink_rate") == 0) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; + const unsigned int *rate_in = (const unsigned int *)data_in; + unsigned int *rate_out = (unsigned int *)data_out; + + if (rate_out) { + *rate_out = display->blink_rate; + } + + if (rate_in) { + display->blink_rate = *rate_in; + } + + return 0; + } + + if (strcmp(cmd, "refresh_rate") == 0) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; + const unsigned int *rate_in = (const unsigned int *)data_in; + unsigned int *rate_out = (unsigned int *)data_out; + + if (rate_out) { + *rate_out = display->refresh_rate; + } + + if (rate_in) { + display->refresh_rate = *rate_in; + } + + return 0; + } + +#ifdef HAVE_LIBVNCSERVER + if (strcmp(cmd, "new_rfbScreen") == 0) { + struct args_ { int argc; char **argv;} *in = (struct args_ *)data_in; + rfbScreenInfoPtr *s_out = (rfbScreenInfoPtr *)data_out; + + if (in == NULL || s_out == NULL) + return -EFAULT; + + *s_out = lem1802_rfb_new_(in->argc, in->argv); + + return 0; + } + + if (strcmp(cmd, "associate_rfbScreen") == 0) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; + rfbScreenInfoPtr rfbScreen = (rfbScreenInfoPtr)data_in; + (void)data_out; + + if (rfbScreen == NULL) + return -EFAULT; + + rfbScreen->desktopName = "NYA ELEKTRISKA LEM1802"; + rfbScreen->frameBuffer = (char *)display->pixbuf; + + return 0; + } +#endif /* HAVE_LIBVNCSERVER */ + + if (strcmp(cmd, "renderers_iter") == 0) { + void **iterp = (void **)data_in; + struct packed_out_ { + char *name; + char *args; + } *parg = (struct packed_out_ *)data_out; + + if (iterp == NULL || parg == NULL) + return -EFAULT; + + (void)lem1802_renderers_iter_(iterp, &parg->name, &parg->args); + + return 0; + } + + if (strcmp(cmd, "renderer") == 0) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; + char *renderer = (char *)data_in; + (void)data_out; + struct renderer_ *r; + + for (r = lem1802_renderers_; r->renderer; r++) { + if (strcmp(renderer, r->name) == 0) { + display->render = r->renderer; + TRACE("%s>> renderer set to %s", __func__, renderer); + return 0; + } + } + + hw->vm->warn_cb_("unknown renderer '%s'", renderer); + + return -ENOENT; + } + + if (strcmp(cmd, "renderer_data") == 0) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; + (void)data_out; + + display->renderer_data = data_in; + + return 0; + } + + return -EINVAL; +} + -static struct dcpu16_hw hw_ = { +struct dcpu16_hw_module dcpu16_hw_module_lem1802 = { .name_ = "LEM1802 - Low Energy Monitor", + .id_l = 0xf615, .id_h = 0x7349, .ver = 0x1802, @@ -597,12 +701,10 @@ static struct dcpu16_hw hw_ = { .hwi = lem1802_hwi_, .cycle = lem1802_cycle_, .reset = lem1802_reset_, - .data = (struct lem1802_ *)NULL -}; -struct dcpu16_hw_module dcpu16_hw_module_lem1802 = { - .template = &hw_, .data_init = lem1802_data_init_, .data_free = lem1802_data_free_, + .ctl = lem1802_data_ctl_, + .ctl_cmd = ctl_, };