made a new function modexMVSetup() and made scroller use dx and dy on page[0].dx

[16.git] / src / lib / 16_vl.c

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 652ef89c2491b898bd25908b6d63c70f5bee7504..0e2bfcf064f83b93f52bd8832826c906da2d2cf9 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -213,8 +213,8 @@ modexNextPage(page_t *p) {
        page_t result;\r
 \r
        result.data = p->data + (p->pagesize);\r
-       result.dx = 0;\r
-       result.dy = 0;\r
+       result.dx = p->dx;      // not used anymore we use page[0].dx\r
+       result.dy = p->dy;      // not used anymore we use page[0].dy\r
        result.sw = p->sw;\r
        result.sh = p->sh;\r
        result.width = p->width;\r
@@ -238,8 +238,8 @@ modexNextPageFlexibleSize(page_t *p, word x, word y)
        page_t result;\r
 \r
        result.data = p->data + (p->pagesize);  /* compute the offset */\r
-       result.dx = 0;\r
-       result.dy = 0;\r
+       result.dx = 0;  // not used anymore we use page[0].dx\r
+       result.dy = 0;  // not used anymore we use page[0].dy\r
        result.sw = x;\r
        result.sh = y;\r
        result.width = x;\r
@@ -294,10 +294,10 @@ void modexHiganbanaPageSetup(video_t *video)
        video->r=1;\r
 \r
        //setup the buffersize\r
-       video->page[0].dy=video->page[0].dx=\r
-               video->page[1].dx=video->page[1].dy=TILEWH;     // 1 tile size buffer\r
+       video->page[0].dy=video->page[0].dx=TILEWH;\r
+       /*      video->page[1].dx=video->page[1].dy=TILEWH;     // 1 tile size buffer\r
        video->page[2].dx=video->page[2].dy=\r
-               video->page[3].dx=video->page[3].dy=0;          // cache pages are buffer wwww\r
+               video->page[3].dx=video->page[3].dy=0;          */// cache pages are buffer wwww\r
 }\r
 \r
 //\r
@@ -310,8 +310,8 @@ modexShowPage(page_t *page) {
 \r
        /* calculate offset */\r
        offset = (word) page->data;\r
-       offset += page->dy * (page->width >> 2 );\r
-       offset += page->dx >> 2;\r
+       offset += page[0].dy * (page->width >> 2 );\r
+       offset += page[0].dx >> 2;\r
 \r
        /* calculate crtcOffset according to virtual width */\r
        crtcOffset = page->width >> 3;\r
@@ -331,7 +331,7 @@ modexShowPage(page_t *page) {
 \r
        /* do PEL panning here */\r
        outp(AC_INDEX, 0x33);\r
-       outp(AC_INDEX, (page->dx & 0x03) << 1);\r
+       outp(AC_INDEX, (page[0].dx & 0x03) << 1);\r
 }\r
 \r
 //\r
@@ -345,8 +345,8 @@ modexShowPage_(page_t *page)
 \r
        /* calculate offset */\r
        offset = (word) page->data;\r
-       offset += page->dy * (page->width >> 2 );\r
-       offset += page->dx >> 2;\r
+       offset += page[0].dy * (page->width >> 2 );\r
+       offset += page[0].dx >> 2;\r
 \r
        /* calculate crtcOffset according to virtual width */\r
        crtcOffset = page->sw >> 3;\r
@@ -366,7 +366,7 @@ modexShowPage_(page_t *page)
 \r
        /* do PEL panning here */\r
        outp(AC_INDEX, 0x33);\r
-       outp(AC_INDEX, (page->dx & 0x03) << 1);\r
+       outp(AC_INDEX, (page[0].dx & 0x03) << 1);\r
 }\r
 \r
 void\r
@@ -376,8 +376,8 @@ modexShowPageVsync(page_t *page) {
 \r
        /* calculate offset */\r
        offset = (word) page->data;\r
-       offset += page->dy * (page->width >> 2 );\r
-       offset += page->dx >> 2;\r
+       offset += page[0].dy * (page->width >> 2 );\r
+       offset += page[0].dx >> 2;\r
 \r
        /* calculate crtcOffset according to virtual width */\r
        crtcOffset = page->width >> 3;\r
@@ -397,13 +397,13 @@ modexShowPageVsync(page_t *page) {
 \r
        /* do PEL panning here */\r
        outp(AC_INDEX, 0x33);\r
-       outp(AC_INDEX, (page->dx & 0x03) << 1);\r
+       outp(AC_INDEX, (page[0].dx & 0x03) << 1);\r
 }\r
 \r
 void\r
 modexPanPage(page_t *page, int dx, int dy) {\r
-       page->dx = dx;\r
-       page->dy = dy;\r
+       page[0].dx = dx;\r
+       page[0].dy = dy;\r
 }\r
 \r
 void\r