X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmodex16.c;h=94386cad2b154d27d6a0e60faa0ce27bfed23704;hb=f316394371b48430c9e1b375640b87f1d6f267ab;hp=2d4c00242676ffd4401578c3fb6f024599199c21;hpb=e3b220f5349f8282bd426fdca00c64c8c7e831cd;p=16.git diff --git a/src/lib/modex16.c b/src/lib/modex16.c index 2d4c0024..94386cad 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -62,7 +62,12 @@ void VGAmodeX(sword vq, boolean cmem, global_game_variables_t *gv) static void vgaSetMode(byte mode) { - int10_setmode(mode); + union REGS regs; + + regs.h.ah = SET_MODE; + regs.h.al = mode; + int86(VIDEO_INT, ®s, ®s); + //int10_setmode(mode); } //--------------------------------------------------- @@ -85,9 +90,14 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) vgaSetMode(VGA_256_COLOR_MODE); vga_enable_256color_modex(); + update_state_from_vga(); vga_read_crtc_mode(&cm); + /* reprogram the CRT controller */ + //outp(CRTC_INDEX, 0x11); /* VSync End reg contains register write prot */ + //outp(CRTC_DATA, 0x7f); /* get current write protect on varios regs */ + switch(vq) { case 1: @@ -109,7 +119,7 @@ void modexEnter(sword vq, boolean cmem, global_game_variables_t *gv) cm.horizontal_total=0x5f + 5; /* CRTC[0] -5 */ cm.horizontal_display_end=0x4f + 1; /* CRTC[1] -1 */ cm.horizontal_blank_start=0x50 + 1; /* CRTC[2] */ - cm.horizontal_blank_end=0x82 + 1; /* CRTC[3] bit 0-4 & CRTC[5] bit 7 */ +// cm.horizontal_blank_end=0x82 + 1; /* CRTC[3] bit 0-4 & CRTC[5] bit 7 *///skewing ^^; cm.horizontal_start_retrace=0x54;/* CRTC[4] */ cm.horizontal_end_retrace=0x80; /* CRTC[5] bit 0-4 */ //cm.horizontal_start_delay_after_total=0x3e; /* CRTC[3] bit 5-6 */ @@ -187,7 +197,9 @@ modexDefaultPage(page_t *p) page.tilesh=page.height/TILEWH; page.tilemidposscreenx = page.tw/2; page.tilemidposscreeny = (page.th/2)+1; - page.pagesize = (sdiword)(page.width/4)*page.height; + page.stridew=page.width/4; + page.pagesize = (word)(page.width/4)*page.height; + page.pi=page.width*4; page.id = 0; return page; @@ -203,14 +215,18 @@ modexNextPage(page_t *p) { result.data = p->data + (p->pagesize); result.dx = 0; result.dy = 0; + result.sw = p->sw; + result.sh = p->sh; result.width = p->width; result.height = p->height; result.tw = p->tw; result.th = p->th; result.tilesw = p->tilesw; result.tilesh = p->tilesh; - result.id = p->id+1; + result.stridew=p->stridew; result.pagesize = p->pagesize; + result.pi=result.width*4; + result.id = p->id+1; return result; } @@ -224,6 +240,8 @@ modexNextPageFlexibleSize(page_t *p, word x, word y) result.data = p->data + (p->pagesize); /* compute the offset */ result.dx = 0; result.dy = 0; + result.sw = x; + result.sh = y; result.width = x; result.height = y; result.tw = result.sw/TILEWH; @@ -231,7 +249,17 @@ modexNextPageFlexibleSize(page_t *p, word x, word y) result.tilesw=result.width/TILEWH; result.tilesh=result.height/TILEWH; result.id = p->id+1; - result.pagesize = (sdiword)(result.width/4)*result.height; + result.stridew=p->sw/4;//result.width/4; + result.pagesize = (word)(result.width/4)*result.height; + switch(result.id) + { + case 2: + result.pi=p->width*4; + break; + case 3: + result.pi=p->pi; + break; + } return result; } @@ -239,26 +267,31 @@ modexNextPageFlexibleSize(page_t *p, word x, word y) void modexCalcVmemRemain(video_t *video) { byte i; - //printf("\n\n 1st vmem_remain=%ld\n", video->vmem_remain); - for(i=0; i<=video->num_of_pages-1; i++) + //printf("\n\n 1st vmem_remain=%u\n", video->vmem_remain); + for(i=0; inum_of_pages; i++) { video->vmem_remain-=video->page[i].pagesize; - //printf(" [%u], video->page[i].pagesize=%ld\n", i, video->page[i].pagesize); - //printf(" [%u], vmem_remain=%ld\n", i, video->vmem_remain); + //printf(" [%u], video->page[%u].pagesize=%u\n", i, i, video->page[i].pagesize); + //printf(" [%u], vmem_remain=%u\n", i, video->vmem_remain); } } void modexHiganbanaPageSetup(video_t *video) { - video->vmem_remain=262144L; + video->vmem_remain=65535U; video->num_of_pages=0; - (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++; - //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD); + (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++; //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD); (video->page[1]) = modexNextPage(&(video->page[0])); video->num_of_pages++; - //(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, video->page[0].sh-40); video->num_of_pages++; - //(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH); video->num_of_pages++; +//0000 (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), (video->page[0]).width, TILEWH*4); video->num_of_pages++; +//0000 (video->page[3]) = (video->page[2]); video->num_of_pages++; + (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), TILEWH*4, TILEWH*4); video->num_of_pages++; +// (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].width, 176); video->num_of_pages++; + (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), video->page[0].sw, 208); video->num_of_pages++; +// (video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, 172); video->num_of_pages++; +// (video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), 72, 128); video->num_of_pages++; modexCalcVmemRemain(video); video->p=0; + video->r=1; } void @@ -280,14 +313,14 @@ modexShowPage(page_t *page) { low_address = LOW_ADDRESS | (offset << 8); /* wait for appropriate timing and then program CRTC */ - while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE)); + //while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE)); outpw(CRTC_INDEX, high_address); outpw(CRTC_INDEX, low_address); outp(CRTC_INDEX, 0x13); outp(CRTC_DATA, crtcOffset); /* wait for one retrace */ - while (!(inp(INPUT_STATUS_1) & VRETRACE)); + //while (!(inp(INPUT_STATUS_1) & VRETRACE)); /* do PEL panning here */ outp(AC_INDEX, 0x33); @@ -311,8 +344,8 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte color) { word pageOff = (word) page->data; word xoff=x/4; /* xoffset that begins each row */ word scanCount=w/4; /* number of iterations per row (excluding right clip)*/ - word poffset = pageOff + y*(page->width/4) + xoff; /* starting offset */ - word nextRow = page->width/4-scanCount-1; /* loc of next row */ + word poffset = pageOff + y*(page->stridew) + xoff; /* starting offset */ + word nextRow = page->stridew-scanCount-1; /* loc of next row */ byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08}; /* clips for rectangles not on 4s */ byte rclip[] = {0x00, 0x01, 0x03, 0x07}; byte left = lclip[x&0x03]; @@ -323,6 +356,8 @@ modexClearRegion(page_t *page, int x, int y, int w, int h, byte color) { right=0x0f; } + //printf("modexClearRegion(x=%u, y=%u, w=%u, h=%u, left=%u, right=%u)\n", x, y, w, h, left, right); + __asm { PUSHF PUSH ES @@ -388,16 +423,23 @@ modexCopyPageRegion(page_t *dest, page_t *src, word dx, word dy, word width, word height) { - word doffset = (word)dest->data + dy*(dest->width/4) + dx/4; - word soffset = (word)src->data + sy*(src->width/4) + sx/4; - word scans = vga_state.vga_stride; - word nextSrcRow = src->width/4 - scans - 1; - word nextDestRow = dest->width/4 - scans - 1; + word doffset = (word)dest->data + dy*(dest->stridew) + dx/4; + word soffset = (word)src->data + sy*(src->stridew) + sx/4; + word scans = vga_state.vga_stride; //++++0000 the quick and dirty fix of the major issue with p16 video display wwww + word nextSrcRow = src->stridew - scans - 1; + word nextDestRow = dest->stridew - scans - 1; byte lclip[] = {0x0f, 0x0e, 0x0c, 0x08}; /* clips for rectangles not on 4s */ - byte rclip[] = {0x0f, 0x01, 0x03, 0x07}; + byte rclip[] = {0x00, 0x01, 0x03, 0x07}; byte left = lclip[sx&0x03]; byte right = rclip[(sx+width)&0x03]; + /* handle the case which requires an extra group */ + if((sx & 0x03) && !((sx+width) & 0x03)) { + right=0x0f; + } + +// printf("modexCopyPageRegion(src->stridew=%u, dest->stridew=%u, sx=%u, sy=%u, dx=%u, dy=%u, width=%u, height=%u, left=%u, right=%u)\n", src->stridew, dest->stridew, sx, sy, dx, dy, width, height, left, right); + __asm { PUSHF PUSH ES @@ -818,7 +860,7 @@ modexPalUpdate0(byte *p) } void -modexPalOverscan(byte *p, word col) +modexPalOverscan(word col) { //modexWaitBorder(); vga_wait_for_vsync(); @@ -1108,38 +1150,28 @@ void modexcls(page_t *page, byte color, byte *Where) void modexWaitBorder() { - while(inp(INPUT_STATUS_1) & 8) { - // spin - } - - while(!(inp(INPUT_STATUS_1) & 8)) { + while(inp(INPUT_STATUS_1) & 8) { // spin - } -} - -void bios_cls() { - VGA_ALPHA_PTR ap; - VGA_RAM_PTR rp; - unsigned char m; - - m = int10_getmode(); - if ((rp=vga_state.vga_graphics_ram) != NULL && !(m <= 3 || m == 7)) { - unsigned int i,im; - - im = (FP_SEG(vga_state.vga_graphics_ram_fence) - FP_SEG(vga_state.vga_graphics_ram)); - if (im > 0xFFE) im = 0xFFE; - im <<= 4; - for (i=0;i < im;i++) vga_state.vga_graphics_ram[i] = 0; } - else if ((ap=vga_state.vga_alpha_ram) != NULL) { - unsigned int i,im; - im = (FP_SEG(vga_state.vga_alpha_ram_fence) - FP_SEG(vga_state.vga_alpha_ram)); - if (im > 0x7FE) im = 0x7FE; - im <<= 4 - 1; /* because ptr is type uint16_t */ - for (i=0;i < im;i++) vga_state.vga_alpha_ram[i] = 0x0720; + while(!(inp(INPUT_STATUS_1) & 8)) { + //spin } - else { - printf("WARNING: bios cls no ptr\n"); +} + +void modexprintmeminfo(video_t *v) +{ + byte i; + printf("video memory remaining: %u\n", v->vmem_remain); + printf("page "); + for(i=0; inum_of_pages;i++) + { + printf(" [%u]=", i); + printf("(%Fp)", (v->page[i].data)); + printf(" size=%u ", v->page[i].pagesize); + printf("w=%lu h=%lu ", (unsigned long)v->page[i].width, (unsigned long)v->page[i].height); + printf("sw=%lu sh=%lu ", (unsigned long)v->page[i].sw, (unsigned long)v->page[i].sh); + printf("pi=%u", v->page[i].pi); + printf("\n"); } }