# HG changeset patch
# User TomW
# Date 1405537234 -3600
# Node ID f22b6152c221bcdb2282f9bd8ec2f78a97e51b58
# Parent  a10f75a7a7013343bfed2dc1854251fab1b9b144
Fixed memory mapping on ISA video cards - should now work on Award 430VX PCI.

diff -r a10f75a7a701 -r f22b6152c221 src/vid_ati18800.c
--- a/src/vid_ati18800.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_ati18800.c	Wed Jul 16 20:00:34 2014 +0100
@@ -125,7 +125,7 @@
         ati18800_t *ati18800 = malloc(sizeof(ati18800_t));
         memset(ati18800, 0, sizeof(ati18800_t));
         
-        rom_init(&ati18800->bios_rom, "roms/vgaedge16.vbi", 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&ati18800->bios_rom, "roms/vgaedge16.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
         
         svga_init(&ati18800->svga, ati18800, 1 << 19, /*512kb*/
                    NULL,
diff -r a10f75a7a701 -r f22b6152c221 src/vid_ati28800.c
--- a/src/vid_ati28800.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_ati28800.c	Wed Jul 16 20:00:34 2014 +0100
@@ -146,7 +146,7 @@
         ati28800_t *ati28800 = malloc(sizeof(ati28800_t));
         memset(ati28800, 0, sizeof(ati28800_t));
         
-        rom_init(&ati28800->bios_rom, "roms/bios.bin", 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&ati28800->bios_rom, "roms/bios.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
         
         svga_init(&ati28800->svga, ati28800, 1 << 19, /*512kb*/
                    ati28800_recalctimings,
diff -r a10f75a7a701 -r f22b6152c221 src/vid_cl5429.c
--- a/src/vid_cl5429.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_cl5429.c	Wed Jul 16 20:00:34 2014 +0100
@@ -819,7 +819,7 @@
         svga_t *svga = &gd5429->svga;
         memset(gd5429, 0, sizeof(gd5429_t));
 
-        rom_init(&gd5429->bios_rom, "roms/5429.vbi", 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&gd5429->bios_rom, "roms/5429.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
         
         svga_init(&gd5429->svga, gd5429, 1 << 21, /*2mb*/
                    gd5429_recalctimings,
diff -r a10f75a7a701 -r f22b6152c221 src/vid_ega.c
--- a/src/vid_ega.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_ega.c	Wed Jul 16 20:00:34 2014 +0100
@@ -812,7 +812,7 @@
         ega_t *ega = malloc(sizeof(ega_t));
         memset(ega, 0, sizeof(ega_t));
         
-        rom_init(&ega->bios_rom, "roms/ibm_6277356_ega_card_u44_27128.bin", 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&ega->bios_rom, "roms/ibm_6277356_ega_card_u44_27128.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
         if (ega->bios_rom.rom[0x3ffe] == 0xaa && ega->bios_rom.rom[0x3fff] == 0x55)
         {
diff -r a10f75a7a701 -r f22b6152c221 src/vid_et4000.c
--- a/src/vid_et4000.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_et4000.c	Wed Jul 16 20:00:34 2014 +0100
@@ -133,7 +133,7 @@
         et4000_t *et4000 = malloc(sizeof(et4000_t));
         memset(et4000, 0, sizeof(et4000_t));
 
-        rom_init(&et4000->bios_rom, "roms/et4000.bin", 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&et4000->bios_rom, "roms/et4000.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
                 
         io_sethandler(0x03c0, 0x0020, et4000_in, NULL, NULL, et4000_out, NULL, NULL, et4000);
 
diff -r a10f75a7a701 -r f22b6152c221 src/vid_oti067.c
--- a/src/vid_oti067.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_oti067.c	Wed Jul 16 20:00:34 2014 +0100
@@ -126,7 +126,7 @@
         oti067_t *oti067 = malloc(sizeof(oti067_t));
         memset(oti067, 0, sizeof(oti067_t));
         
-        rom_init(&oti067->bios_rom, bios_fn, 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&oti067->bios_rom, bios_fn, 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
         oti067->vram_size = vram_size;
         oti067->vram_mask = (vram_size << 10) - 1;
diff -r a10f75a7a701 -r f22b6152c221 src/vid_paradise.c
--- a/src/vid_paradise.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_paradise.c	Wed Jul 16 20:00:34 2014 +0100
@@ -322,7 +322,7 @@
         paradise_t *paradise = paradise_pvga1a_init();
         
         if (paradise)
-                rom_init(&paradise->bios_rom, "roms/pc2086/40186.ic171", 0xc0000, 0x8000, 0x7fff, 0, 0);
+                rom_init(&paradise->bios_rom, "roms/pc2086/40186.ic171", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
                 
         return paradise;
 }
@@ -331,7 +331,7 @@
         paradise_t *paradise = paradise_pvga1a_init();
 
         if (paradise)
-                rom_init(&paradise->bios_rom, "roms/pc3086/c000.bin", 0xc0000, 0x8000, 0x7fff, 0, 0);
+                rom_init(&paradise->bios_rom, "roms/pc3086/c000.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
                 
         return paradise;
 }
@@ -344,7 +344,7 @@
                 rom_init_interleaved(&paradise->bios_rom,
                                      "roms/megapc/41651-bios lo.u18",
                                      "roms/megapc/211253-bios hi.u19",
-                                     0xc0000, 0x8000, 0x7fff, 0, 0);
+                                     0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
         
         return paradise;
 }
diff -r a10f75a7a701 -r f22b6152c221 src/vid_tgui9440.c
--- a/src/vid_tgui9440.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_tgui9440.c	Wed Jul 16 20:00:34 2014 +0100
@@ -475,7 +475,7 @@
         tgui->vram_size = device_get_config_int("memory") << 20;
         tgui->vram_mask = tgui->vram_size - 1;
 
-        rom_init(&tgui->bios_rom, "roms/9440.vbi", 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&tgui->bios_rom, "roms/9440.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
         svga_init(&tgui->svga, tgui, tgui->vram_size,
                    tgui_recalctimings,
diff -r a10f75a7a701 -r f22b6152c221 src/vid_tvga.c
--- a/src/vid_tvga.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_tvga.c	Wed Jul 16 20:00:34 2014 +0100
@@ -259,7 +259,7 @@
         tvga->vram_size = device_get_config_int("memory") << 10;
         tvga->vram_mask = tvga->vram_size - 1;
         
-        rom_init(&tvga->bios_rom, "roms/trident.bin", 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&tvga->bios_rom, "roms/trident.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
         
         svga_init(&tvga->svga, tvga, tvga->vram_size,
                    tvga_recalctimings,
diff -r a10f75a7a701 -r f22b6152c221 src/vid_vga.c
--- a/src/vid_vga.c	Tue Jul 15 20:42:48 2014 +0100
+++ b/src/vid_vga.c	Wed Jul 16 20:00:34 2014 +0100
@@ -81,7 +81,7 @@
         vga_t *vga = malloc(sizeof(vga_t));
         memset(vga, 0, sizeof(vga_t));
 
-        rom_init(&vga->bios_rom, "roms/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0, 0);
+        rom_init(&vga->bios_rom, "roms/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL);
 
         svga_init(&vga->svga, vga, 1 << 18, /*256kb*/
                    NULL,