# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1526260291 -10800
# Node ID 3c9e5962eca645d1f342c771f81e182d2ba69ed6
# Parent  f1b279ba47a84a4fa2c7f1aa0b0c87f17aaad05e
Rename DT_BITMAP to DT_BITMAP_RAM.

diff -r f1b279ba47a8 -r 3c9e5962eca6 tools/lib64fmts.c
--- a/tools/lib64fmts.c	Mon May 14 02:38:24 2018 +0300
+++ b/tools/lib64fmts.c	Mon May 14 04:11:31 2018 +0300
@@ -543,7 +543,7 @@
         NULL,
         {
             { DT_COLOR_RAM,    0x0000, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0800, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0800, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x0400, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x2740, 0,  DC_BGCOL, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
@@ -560,7 +560,7 @@
         NULL,
         {
             { DT_COLOR_RAM,    0x0000, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0800, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0800, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x0400, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x2740, 0,  DC_BGCOL, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
@@ -577,10 +577,10 @@
         NULL,
         {
             { DT_COLOR_RAM,    0x0000, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0800, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0800, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x0400, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x2740, 0,  DC_BGCOL, NULL, NULL },
-            { DT_BITMAP,       0x2800, 1,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2800, 1,  0, NULL, NULL },
             { DT_DEC_FUNCTION, 0x2742, 0,  1, fmtDrazLaceGetLaceType, NULL },
             { DT_ENC_FUNCTION, 0x2742, 0,  1, NULL, fmtDrazLaceSetLaceType },
             { DT_LAST,         0,      0,  0, NULL, NULL },
@@ -597,10 +597,10 @@
         NULL,
         {
             { DT_COLOR_RAM,    0x0000, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0800, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0800, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x0400, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x2740, 0,  DC_BGCOL, NULL, NULL },
-            { DT_BITMAP,       0x2800, 1,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2800, 1,  0, NULL, NULL },
             { DT_DEC_FUNCTION, 0x2742, 0,  1, fmtDrazLaceGetLaceType, NULL },
             { DT_ENC_FUNCTION, 0x2742, 0,  1, NULL, fmtDrazLaceSetLaceType },
             { DT_LAST,         0,      0,  0, NULL, NULL },
@@ -617,7 +617,7 @@
         NULL,
         {
             { DT_COLOR_RAM,    0x0000, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0800, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0800, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x0400, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x07e8, 0,  DC_BGCOL, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
@@ -634,7 +634,7 @@
         NULL,
         {
             { DT_COLOR_RAM,    0x0000, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0800, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0800, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x0400, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x07fe, 0,  DC_BGCOL, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
@@ -652,8 +652,8 @@
         {
             { DT_SCREEN_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x03e8, 0,  DC_BGCOL, NULL, NULL },
-            { DT_BITMAP,       0x0400, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x2400, 1,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0400, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2400, 1,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x4400, 1,  0, NULL, NULL },
             { DT_COLOR_RAM,    0x4800, 0,  0, NULL, NULL },
             { DT_DEC_FUNCTION, 0x0000, 0,  0, fmtTruePaintGetLaceType, NULL },
@@ -670,7 +670,7 @@
         NULL, NULL,
         NULL,
         {
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x1f40, 0,  0, NULL, NULL },
             { DT_COLOR_RAM,    0x2328, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x270f, 0,  DC_BGCOL, NULL, NULL },
@@ -687,7 +687,7 @@
         NULL, NULL,
         NULL,
         {
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x1f40, 0,  0, NULL, NULL },
             { DT_COLOR_RAM,    0x2328, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x270f, 0,  DC_BGCOL, NULL, NULL },
@@ -704,7 +704,7 @@
         NULL, NULL,
         NULL,
         {
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x1f40, 0,  0, NULL, NULL },
             { DT_COLOR_RAM,    0x2338, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x2329, 0,  DC_BGCOL, NULL, NULL },
@@ -722,7 +722,7 @@
         NULL,
         {
             { DT_COLOR_RAM,    0x2328, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x1f40, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x2710, 0,  DC_BGCOL, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
@@ -739,7 +739,7 @@
         NULL,
         {
             { DT_COLOR_RAM,    0x2328, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x1f40, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x2710, 0,  DC_BGCOL, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
@@ -755,7 +755,7 @@
         NULL, NULL,
         NULL,
         {
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x1f40, 0,  0, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
@@ -770,7 +770,7 @@
         NULL, NULL,
         NULL,
         {
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x1f40, 0,  0, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
@@ -785,7 +785,7 @@
         NULL, NULL,
         NULL,
         {
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x1f40, 0,  0, NULL, NULL },
             { DT_COLOR_RAM,    0x2328, 0,  0, NULL, NULL },
             { DT_COLOR_REG,    0x2710, 0,  DC_BGCOL, NULL, NULL },
@@ -803,7 +803,7 @@
         NULL,
         {
             { DT_SCREEN_RAM,   0x0000, 0,  0, NULL, NULL },
-            { DT_BITMAP,       0x0400, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0400, 0,  0, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
     },
@@ -819,9 +819,9 @@
         {
             { DT_COLOR_RAM,    0x0001, 0,  0, NULL, NULL },
             DEF_SCREEN_RAMS_8( 0x0401, 0,  0x400)
-            { DT_BITMAP,       0x2401, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2401, 0,  0, NULL, NULL },
             DEF_SCREEN_RAMS_8( 0x4401, 8,  0x400)
-            { DT_BITMAP,       0x6401 - 24*8, 1,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x6401 - 24*8, 1,  0, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
     },
@@ -839,7 +839,7 @@
             { DT_EXTRA_DATA,   0x0000, 0,  200, NULL, NULL },
             { DT_COLOR_RAM,    0x0100, 0,  0, NULL, NULL },
             DEF_SCREEN_RAMS_8( 0x0500, 0,  0x400)
-            { DT_BITMAP,       0x2500, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2500, 0,  0, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
     },
@@ -855,7 +855,7 @@
         {
             { DT_COLOR_RAM,    0x0000, 0,  0, NULL, NULL },
             DEF_SCREEN_RAMS_8( 0x0400, 0,  0x400)
-            { DT_BITMAP,       0x2400, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2400, 0,  0, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
     },
@@ -869,7 +869,7 @@
         NULL, NULL,
         NULL,
         {
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             { DT_SCREEN_RAM,   0x2000, 0,  0, NULL, NULL },
             { DT_COLOR_RAM,    0x2400, 0,  0, NULL, NULL },
             { DT_COLOR_SET,    0x00  , 0,  DC_BGCOL, NULL, NULL },
@@ -891,7 +891,7 @@
         NULL, NULL,
         NULL,
         {
-            { DT_BITMAP,       0x0000, 0,  XX2_BSIZE, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  XX2_BSIZE, NULL, NULL },
             { DT_COLOR_RAM,    XX2_BSIZE + XX2_SIZE, 0,  XX2_SIZE, NULL, NULL },
             { DT_SCREEN_RAM,   XX2_BSIZE, 0,  XX2_SIZE, NULL, NULL },
             { DT_COLOR_SET,    11,     0,  DC_BGCOL, NULL, NULL },
@@ -910,11 +910,11 @@
         fmtGetPixelFunPaint2,
         {
             DEF_SCREEN_RAMS_8( 0x0000, 0,  0x400)
-            { DT_BITMAP,       0x2000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2000, 0,  0, NULL, NULL },
             { DT_EXTRA_DATA,   0x3f40, 0,  100, NULL, NULL },
             { DT_COLOR_RAM,    0x4000, 0,  0, NULL, NULL },
             DEF_SCREEN_RAMS_8( 0x43e8, 8,  0x400)
-            { DT_BITMAP,       0x63e8, 1,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x63e8, 1,  0, NULL, NULL },
             { DT_EXTRA_DATA,   0x8328, 1,  100, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
@@ -931,11 +931,11 @@
         fmtGetPixelFunPaint2,
         {
             DEF_SCREEN_RAMS_8( 0x0000, 0,  0x400)
-            { DT_BITMAP,       0x2000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2000, 0,  0, NULL, NULL },
             { DT_EXTRA_DATA,   0x3f40, 0,  100, NULL, NULL },
             { DT_COLOR_RAM,    0x4000, 0,  0, NULL, NULL },
             DEF_SCREEN_RAMS_8( 0x43e8, 8,  0x400)
-            { DT_BITMAP,       0x63e8, 1,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x63e8, 1,  0, NULL, NULL },
             { DT_EXTRA_DATA,   0x8328, 1,  100, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
@@ -952,11 +952,11 @@
         fmtGetPixelGunPaint,
         {
             DEF_SCREEN_RAMS_8( 0x0000, 0,  0x400)
-            { DT_BITMAP,       0x2000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x2000, 0,  0, NULL, NULL },
             { DT_EXTRA_DATA,   0x3f4f, 0,  177, NULL, NULL },
             { DT_COLOR_RAM,    0x4000, 0,  0, NULL, NULL },
             DEF_SCREEN_RAMS_8( 0x4400, 8,  0x400)
-            { DT_BITMAP,       0x6400, 1,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x6400, 1,  0, NULL, NULL },
             { DT_EXTRA_DATA,   0x47e8, 1,  20, NULL, NULL },
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
@@ -972,7 +972,7 @@
         NULL, NULL,
         fmtGetPixelCHFLI,
         {
-            { DT_BITMAP,       0x0000, 0,  0, NULL, NULL },
+            { DT_BITMAP_RAM,   0x0000, 0,  0, NULL, NULL },
             DEF_SCREEN_RAMS_8( 0x2000, 0,  0x400)
             { DT_LAST,         0,      0,  0, NULL, NULL },
         }
diff -r f1b279ba47a8 -r 3c9e5962eca6 tools/lib64gfx.c
--- a/tools/lib64gfx.c	Mon May 14 02:38:24 2018 +0300
+++ b/tools/lib64gfx.c	Mon May 14 04:11:31 2018 +0300
@@ -508,7 +508,7 @@
     switch (op->type)
     {
         case DT_COLOR_RAM:
-        case DT_BITMAP:
+        case DT_BITMAP_RAM:
         case DT_SCREEN_RAM:
         case DT_CHAR_DATA:
             if (op->bank < 0 || op->bank > img->nbanks)
@@ -549,7 +549,7 @@
             *size = fmt->chHeight * fmt->chWidth;
             break;
 
-        case DT_BITMAP:
+        case DT_BITMAP_RAM:
             *size = fmt->chHeight * fmt->chWidth * 8;
             break;
 
@@ -630,7 +630,7 @@
         switch (op->type)
         {
             case DT_COLOR_RAM:   memcpy(img->color[op->bank], src, size); break;
-            case DT_BITMAP:      memcpy(img->bitmap[op->bank], src, size); break;
+            case DT_BITMAP_RAM:  memcpy(img->bitmap[op->bank], src, size); break;
             case DT_SCREEN_RAM:  memcpy(img->screen[op->bank], src, size); break;
             case DT_CHAR_DATA:   memcpy(img->charmem[op->bank], src, size); break;
             case DT_EXTRA_DATA:
@@ -791,7 +791,7 @@
         switch (op->type)
         {
             case DT_COLOR_RAM:   memcpy(dst, img->color[op->bank], size); break;
-            case DT_BITMAP:      memcpy(dst, img->bitmap[op->bank], size); break;
+            case DT_BITMAP_RAM:  memcpy(dst, img->bitmap[op->bank], size); break;
             case DT_SCREEN_RAM:  memcpy(dst, img->screen[op->bank], size); break;
             case DT_CHAR_DATA:   memcpy(dst, img->charmem[op->bank], size); break;
             case DT_EXTRA_DATA:
diff -r f1b279ba47a8 -r 3c9e5962eca6 tools/lib64gfx.h
--- a/tools/lib64gfx.h	Mon May 14 02:38:24 2018 +0300
+++ b/tools/lib64gfx.h	Mon May 14 04:11:31 2018 +0300
@@ -133,7 +133,7 @@
 enum
 {
     DT_COLOR_RAM,
-    DT_BITMAP,
+    DT_BITMAP_RAM,
     DT_SCREEN_RAM,
     DT_COLOR_REG,
     DT_COLOR_SET,