X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=hw_lem1802.c;h=06b0d5ac2c5d9392fb58d0b76c19995fb38d67f8;hb=94be117719b907e351bb2bf1096f6195daecd2aa;hp=e7e618393fc4e313607a24b7f9022a012656b1ae;hpb=ce296c260b229bb5c2e866db7842f3a46ea8c4b7;p=dcpu16 diff --git a/hw_lem1802.c b/hw_lem1802.c index e7e6183..06b0d5a 100644 --- a/hw_lem1802.c +++ b/hw_lem1802.c @@ -18,27 +18,25 @@ #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 */ #define TRACE(...) do {} while (0) #endif /* DEBUG */ -static dcpu16_hw_signal_t lem1802_reset_; -static dcpu16_hw_signal_t lem1802_cycle_; -static dcpu16_hw_signal_t lem1802_hwi_; -static struct dcpu16_hw hw_ = { - .name_ = "LEM1802 - Low Energy Monitor", - .id_l = 0xf615, - .id_h = 0x7349, - .ver = 0x1802, - .mfg_l = 0x8b36, - .mfg_h = 0x1c6c, - .hwi = lem1802_hwi_, - .cycle = lem1802_cycle_, - .reset = lem1802_reset_, - .data = (struct lem1802_ *)NULL -}; +#ifdef WANT_VARIADIC_VOIDP_CAST +#define VOIDP(__x__) ((void *)(__x__)) +#define VOIDFP(__x__) ((void *)(size_t)(__x__)) +#else +#define VOIDP(__x__) (__x__) +#define VOIDFP(__x__) (__x__) +#endif #define LEM1802_POWER_ON_CYCLES 100000 /* this should vary by, let us say, 10% */ @@ -252,8 +250,8 @@ void lem1802_pixbuf_refresh_full_(struct lem1802_ *display, DCPU16_WORD *mem) { mem, display->video_base, display->video_base + tile, - display->palette_base ? mem + display->palette_base : palette_default_, - display->font_base ? mem + display->font_base : (unsigned short *)chargen_4x8_glyphs, + display->palette_base ? mem + display->palette_base : (DCPU16_WORD *)palette_default_, + display->font_base ? mem + display->font_base : (DCPU16_WORD *)chargen_4x8_glyphs, display->blink_state); } } @@ -339,21 +337,12 @@ rfbScreenInfoPtr lem1802_rfb_new(int argc, char *argv[]) { s->httpDir = "../classes"; #endif - TRACE("%s>> s:%p", __func__, s); - TRACE("%s>> s->kbdAddEvent:%p s->frameBuffer:%p", __func__, s->kbdAddEvent, s->frameBuffer); + TRACE("%s>> s:%p", __func__, VOIDP(s)); + TRACE("%s>> s->kbdAddEvent:%p s->frameBuffer:%p", __func__, VOIDFP(s->kbdAddEvent), s->frameBuffer); 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__, s); -} /* notify rfb server that pixels may have changed */ static @@ -375,8 +364,8 @@ int pixbuf_render_vnc_(void *data, struct pixel_ *pixbuf, size_t x, size_t y) { static -void lem1802_reset_(struct dcpu16 *vm, void *data) { - struct lem1802_ *display = (struct lem1802_ *)data; +void lem1802_reset_(struct dcpu16 *vm, struct dcpu16_hw *hw) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; (void)vm; @@ -400,8 +389,8 @@ void lem1802_reset_(struct dcpu16 *vm, void *data) { } static -void lem1802_cycle_(struct dcpu16 *vm, void *data) { - struct lem1802_ *display = (struct lem1802_ *)data; +void lem1802_cycle_(struct dcpu16 *vm, struct dcpu16_hw *hw) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; (void)vm; /* @@ -435,7 +424,7 @@ void lem1802_cycle_(struct dcpu16 *vm, void *data) { TRACE("%s>> copy_to_ram words:%zu src:%p dst_addr:0x%04x", __func__, display->cycle_state_copy_words_, - display->cycle_state_copy_src_ptr_, + VOIDP(display->cycle_state_copy_src_ptr_), display->cycle_state_copy_dst_addr_); vm->ram[display->cycle_state_copy_dst_addr_] = *display->cycle_state_copy_src_ptr_; display->cycle_state_copy_dst_addr_++; @@ -456,8 +445,8 @@ void lem1802_cycle_(struct dcpu16 *vm, void *data) { } static -void lem1802_hwi_(struct dcpu16 *vm, void *data) { - struct lem1802_ *display = (struct lem1802_ *)data; +void lem1802_hwi_(struct dcpu16 *vm, struct dcpu16_hw *hw) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; DCPU16_WORD reg_a = vm->reg[DCPU16_REG_A]; DCPU16_WORD reg_b = vm->reg[DCPU16_REG_B]; @@ -520,20 +509,6 @@ 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) { struct renderer_ **r = (struct renderer_ **)iterp; @@ -554,54 +529,151 @@ char *lem1802_renderers_iter(void **iterp, char **name, char **args) { return (*r)->name; } -/* instantitate a new display */ -struct dcpu16_hw *lem1802_new(struct dcpu16 *vm) { - struct dcpu16_hw *hw; +int lem1802_data_init_(struct dcpu16_hw *hw, void *data) { + (void)data; - hw = calloc(1, sizeof *hw); - if (hw == NULL) { - vm->warn_cb_("%s():%s", "calloc", strerror(errno)); - return NULL; - } - - memcpy(hw, &hw_, sizeof *hw); - - hw->data = calloc(1, sizeof(struct dcpu16_hw)); + hw->data = calloc(1, sizeof(struct lem1802_)); if (hw->data == NULL) { - vm->warn_cb_("%s():%s", "calloc", strerror(errno)); - free(hw); - return NULL; + hw->vm->warn_cb_("%s():%s", "calloc", strerror(errno)); + return -1; } - ((struct lem1802_ *)(hw->data))->pixbuf = calloc(1, PIX_X * PIX_Y * sizeof *((struct lem1802_ *)(hw->data))->pixbuf); + ((struct lem1802_ *)(hw->data))->pixbuf = calloc(PIX_X * PIX_Y, sizeof *((struct lem1802_ *)(hw->data))->pixbuf); if (((struct lem1802_ *)(hw->data))->pixbuf == NULL) { - vm->warn_cb_("%s():%s", "calloc", strerror(errno)); + hw->vm->warn_cb_("%s():%s", "calloc", strerror(errno)); free(hw->data); - free(hw); - return NULL; + hw->data = NULL; + return -1; } ((struct lem1802_ *)(hw->data))->refresh_rate = 1666; ((struct lem1802_ *)(hw->data))->blink_rate = 75000; - hw->vm = vm; - - return hw; + return 0; } -void lem1802_del(struct dcpu16_hw **hw) { +void lem1802_data_free_(struct dcpu16_hw *hw) { if (hw) { - if (*hw) { - if ((*hw)->data) { - if (((struct lem1802_ *)(*hw)->data)->pixbuf) { - free(((struct lem1802_ *)(*hw)->data)->pixbuf); - ((struct lem1802_ *)(*hw)->data)->pixbuf = NULL; - } - free((*hw)->data); - (*hw)->data = NULL; + if (hw->data) { + 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 *rate", "unsigned int *rate", "sets or gets cycles per blink toggle" }, + { "refresh_rate", "const unsigned int *rate", "unsigned int *rate", "sets or gets cycles per screen refresh" }, +#ifdef HAVE_LIBVNCSERVER + { "associate_rfbScreen", "rfbScreenInfoPtr", "NULL", "associates this lem1802 instance with an rfb display" }, +#endif /* HAVE_LIBVNCSERVER */ + { "renderer", "const char *", "NULL", "sets this lem1802 instance to use renderer" }, + { "renderer_data", "void *", "NULL", "sets renderer-specific data" }, + { NULL, NULL, NULL, NULL } +}; +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, "associate_rfbScreen") == 0) { + struct lem1802_ *display = (struct lem1802_ *)hw->data; + rfbScreenInfoPtr rfbScreen = (rfbScreenInfoPtr)data_out; + (void)data_in; + + if (rfbScreen == NULL) + return -EFAULT; + + rfbScreen->desktopName = "NYA ELEKTRISKA LEM1802"; + rfbScreen->frameBuffer = (char *)display->pixbuf; + + return 0; + } +#endif /* HAVE_LIBVNCSERVER */ + + 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; } - free(*hw); } - *hw = NULL; + + 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_ = { + .name_ = "LEM1802 - Low Energy Monitor", + .id_l = 0xf615, + .id_h = 0x7349, + .ver = 0x1802, + .mfg_l = 0x8b36, + .mfg_h = 0x1c6c, + .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_, +}; +