X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=hw_lem1802.c;h=1be1810fa933720c3da6436b04be742d1633248e;hb=a9cc197dc14d237e6bcea74591b81688de81ad66;hp=72af16ac769cb6525560402ad4e4a29371fb4e28;hpb=0a1b4588f79e3719af9431a98da44350030df754;p=dcpu16 diff --git a/hw_lem1802.c b/hw_lem1802.c index 72af16a..1be1810 100644 --- a/hw_lem1802.c +++ b/hw_lem1802.c @@ -17,6 +17,12 @@ #include "chargen-4x8.h" #include "hw_lem1802.h" +#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_; @@ -33,11 +39,13 @@ static struct dcpu16_hw hw_ = { .data = (struct lem1802_ *)NULL }; -#define PIX_X 160 -#define PIX_Y 128 -#define PIX_BORDER 16 +#define PIX_X 160 /* pixels in display */ +#define PIX_Y 128 /* pixels in display */ +#define PIX_BORDER 16 /* border pixels from edge to first tile */ #define CELL_X_SZ 4 #define CELL_Y_SZ 8 +#define CELL_X ((PIX_X - (2 * PIX_BORDER)) / CELL_X_SZ) /* tiles in display */ +#define CELL_Y ((PIX_Y - (2 * PIX_BORDER)) / CELL_Y_SZ) /* tiles in display */ #define PALETTE_ENTRIES 16 static const DCPU16_WORD palette_default_[PALETTE_ENTRIES] = { @@ -56,7 +64,7 @@ static const DCPU16_WORD palette_default_[PALETTE_ENTRIES] = { 0x0f55, /* light red */ 0x0f5f, /* light magenta */ 0x0ff5, /* light yellow */ - 0x0fff, /* white */ + 0x0fff /* white */ }; struct pixel_ { @@ -88,16 +96,27 @@ struct lem1802_ { static inline void pixel_color_(struct pixel_ *pix, DCPU16_WORD color) { - pix->r = (color & 0x000f) | ((color & 0x000f) << 8); - pix->g = ((color & 0x00f0) >> 8) | (color & 0x00f0); - pix->b = ((color & 0x0f00) >> 8) | ((color & 0x0f00) >> 16); - pix->a = ((color & 0xf000) >> 16) | ((color & 0xf000) >> 24); + unsigned char x; + + x = (color >> 0) & 0x000f; + pix->r = x | (x << 4); + + x = (color >> 4) & 0x000f; + pix->g = x | (x << 4); + + x = (color >> 8) & 0x000f; + pix->b = x | (x << 4); + + x = (color >> 12) & 0x000f; + pix->a = x | (x << 4); } static void pixbuf_border_paint_(struct pixel_ *pixbuf, struct pixel_ *border) { size_t x, y, i; + TRACE("%s>> painted border", __func__); + /* top */ for (y = 0; y < PIX_BORDER; y++) { for (x = 0; x < PIX_X; x++) { @@ -122,6 +141,13 @@ void font_tile_paint_(struct pixel_ *p, struct pixel_ *fg, struct pixel_ *bg, DC size_t pix_x, pix_y; unsigned char *font_bitmap = (unsigned char *)tile; +#if 0 + TRACE("%s>> fg:(%u,%u,%u) bg:(%u,%u,%u) font_bitmap:%02x %02x %02x %02x", __func__, + fg->r, fg->g, fg->b, + bg->r, bg->g, bg->b, + font_bitmap[0], font_bitmap[1], font_bitmap[2], font_bitmap[3]); +#endif + for (pix_x = 0; pix_x < CELL_X_SZ; pix_x++) { for (pix_y = 0; pix_y < CELL_Y_SZ; pix_y++) { if ((font_bitmap[pix_x] >> pix_y) & 0x01) @@ -133,7 +159,7 @@ void font_tile_paint_(struct pixel_ *p, struct pixel_ *fg, struct pixel_ *bg, DC } static -void pixbuf_addr_paint_(struct pixel_ *pixbuf, DCPU16_WORD *mem, DCPU16_WORD addr, DCPU16_WORD *palette, DCPU16_WORD *tiles, unsigned int blink_state) { +void pixbuf_addr_paint_(struct pixel_ *pixbuf, DCPU16_WORD *mem, DCPU16_WORD base, DCPU16_WORD addr, DCPU16_WORD *palette, DCPU16_WORD *tiles, unsigned int blink_state) { struct pixel_ *tilestart = pixbuf; /* start of display */ unsigned int cell_x = addr % (PIX_X / CELL_X_SZ), cell_y = addr / (PIX_X / CELL_X_SZ); @@ -141,8 +167,15 @@ void pixbuf_addr_paint_(struct pixel_ *pixbuf, DCPU16_WORD *mem, DCPU16_WORD add DCPU16_WORD *font_bitmap; int blink; - cell_x = addr % (PIX_X / CELL_X_SZ); - cell_y = addr / (PIX_X / CELL_X_SZ); + cell_x = (addr - base) % CELL_X; + cell_y = (addr - base) / CELL_X; + +#if 0 + TRACE("%s>> addr:0x%04x col:%u row:%u v:%hu", + __func__, + addr, + cell_x, cell_y, mem[addr]); +#endif blink = mem[addr] & 0x0080; @@ -169,6 +202,10 @@ void lem1802_pixbuf_refresh_full_(struct lem1802_ *display, DCPU16_WORD *mem) { struct pixel_ border; size_t tile; +#if 0 + TRACE("%s>> video_base:0x%04x", __func__, display->video_base); +#endif + if (display->video_base == 0) { /* disconnected, blank display. static might be fun, too */ memset(display->pixbuf, 0, PIX_X * PIX_Y * sizeof *display->pixbuf); @@ -178,9 +215,10 @@ void lem1802_pixbuf_refresh_full_(struct lem1802_ *display, DCPU16_WORD *mem) { pixel_color_(&border, display->border_color); pixbuf_border_paint_(display->pixbuf, &border); - for (tile = 0; tile < (PIX_X / CELL_X_SZ) * (PIX_Y / CELL_Y_SZ); tile++) { + for (tile = 0; tile < CELL_X * CELL_Y; tile++) { pixbuf_addr_paint_(display->pixbuf, 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, @@ -208,14 +246,6 @@ int pixbuf_render_pnm_(void *data, struct pixel_ *pixbuf, size_t x, size_t y) { #ifdef HAVE_LIBPNG static -void pixbuf_render_png_user_warning_(png_structp png, png_const_charp msg) { - (void)png, (void)msg; -} -static -void pixbuf_render_png_user_error_(png_structp png, png_const_charp msg) { - (void)png, (void)msg; -} -static int pixbuf_render_png_(void *data, struct pixel_ *pixbuf, size_t x, size_t y) { FILE *f = (FILE *)data; int retval = 0; @@ -223,7 +253,7 @@ int pixbuf_render_png_(void *data, struct pixel_ *pixbuf, size_t x, size_t y) { png_infop info; size_t i; - png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, pixbuf_render_png_user_error_, pixbuf_render_png_user_warning_); + png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (png == NULL) { goto f_done; } @@ -258,56 +288,53 @@ f_done: #endif /* HAVE_LIBPNG */ #ifdef HAVE_LIBVNCSERVER -struct vnc_server_ { - rfbScreenInfoPtr rfbScreen; -}; - -/* create and return a new struct vnc_server_, for use as a vnc renderer's generic data */ -void *lem1802_vnc_init_data(int argc, char *argv[], struct dcpu16_hw *hw) { - struct vnc_server_ *s; - struct pixel_ *pixbuf = ((struct lem1802_ *)(hw->data))->pixbuf; +/* create and return a new screen, easiest to do here because we know the screen dimensions */ +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; int bitsPerSample = 8; int samplesPerPixel = 3; int bytesPerPixel = 4; - s = calloc(1, sizeof *s); + s = rfbGetScreen(&argc, argv, paddedWidth, height, bitsPerSample, samplesPerPixel, bytesPerPixel); if (s == NULL) return NULL; - s->rfbScreen = rfbGetScreen(&argc, argv, paddedWidth, height, bitsPerSample, samplesPerPixel, bytesPerPixel); - if (s->rfbScreen == NULL) { - free(s); - return NULL; - } - - s->rfbScreen->desktopName = "lem1802"; - s->rfbScreen->alwaysShared = TRUE; + s->alwaysShared = TRUE; #if 0 - s->rfbScreen->kbdAddEvent = HandleKey; */ - s->rfbScreen->httpDir = "../classes"; + s->httpDir = "../classes"; #endif - s->rfbScreen->frameBuffer = (char *)pixbuf; + TRACE("%s>> s:%p", __func__, s); + TRACE("%s>> s->kbdAddEvent:%p s->frameBuffer:%p", __func__, s->kbdAddEvent, s->frameBuffer); - rfbInitServer(s->rfbScreen); + return s; +} - rfbRunEventLoop(s->rfbScreen,-1,TRUE); +/* 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; - return s; + 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 int pixbuf_render_vnc_(void *data, struct pixel_ *pixbuf, size_t x, size_t y) { + rfbScreenInfoPtr s = (rfbScreenInfoPtr)data; int retval = 0; - struct vnc_server_ *s = (struct vnc_server_ *)data; (void)pixbuf; /* derp */ - rfbMarkRectAsModified(s->rfbScreen,0,0,x,y); + rfbMarkRectAsModified(s, 0, 0, x, y); + + TRACE("%s>>", __func__); return retval; } @@ -318,8 +345,9 @@ static void lem1802_reset_(struct dcpu16 *vm, void *data) { struct lem1802_ *display = (struct lem1802_ *)data; - display->cycle_activated = vm->cycle; + (void)vm; + display->cycle_activated = 0; display->video_base = 0; display->font_base = 0; display->palette_base = 0; @@ -330,6 +358,10 @@ void lem1802_reset_(struct dcpu16 *vm, void *data) { display->refresh_tally_ = 0; display->blink_tally_ = 0; display->blink_state = 0; + +#if DEBUG + vm->trace_cb_("%s>>", __func__); +#endif /* DEBUG */ } static @@ -347,20 +379,20 @@ void lem1802_cycle_(struct dcpu16 *vm, void *data) { */ display->blink_tally_++; - if (display->blink_tally_ >= display->blink_rate) + if (display->blink_tally_ >= display->blink_rate) { + display->blink_tally_ = 0; display->blink_state ^= 1; + TRACE("%s>> blink:%u (%u cycles)", __func__, display->blink_state, display->blink_rate); + } display->refresh_tally_++; if (display->refresh_tally_ >= display->refresh_rate) { display->refresh_tally_ = 0; if (display->render) + TRACE("%s>> refresh", __func__); + lem1802_pixbuf_refresh_full_(display, vm->ram); display->render(display->renderer_data, display->pixbuf, PIX_X, PIX_Y); } - - if (display->render) { - lem1802_pixbuf_refresh_full_(display, vm->ram); - display->render(display->renderer_data, display->pixbuf, PIX_X, PIX_Y); - } } static @@ -370,12 +402,16 @@ void lem1802_hwi_(struct dcpu16 *vm, void *data) { DCPU16_WORD reg_b = vm->reg[DCPU16_REG_B]; size_t i; + TRACE("%s>> A:0x%04x B:0x%04x", __func__, reg_a, reg_b); + switch (reg_a) { case 0: /* MEM_MAP_SCREEN */ if (display->cycle_activated == 0 && reg_b) { display->cycle_activated = vm->cycle; } display->video_base = reg_b; + if (reg_b == 0) + display->cycle_activated = 0; break; case 1: /* MEM_MAP_FONT */ @@ -435,6 +471,7 @@ int lem1802_renderer_set(struct dcpu16_hw *hw, const char *renderer, void *data) 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; } } @@ -488,6 +525,11 @@ struct dcpu16_hw *lem1802_new(struct dcpu16 *vm) { return NULL; } + ((struct lem1802_ *)(hw->data))->refresh_rate = 1666; + ((struct lem1802_ *)(hw->data))->blink_rate = 75000; + + hw->vm = vm; + return hw; }