From 967feffbc0183b507475ae1f8bc24256201c9793 Mon Sep 17 00:00:00 2001 From: TomW Date: Wed, 16 Jul 2014 20:00:34 +0100 Subject: [PATCH] Fixed memory mapping on ISA video cards - should now work on Award 430VX PCI. --- src/vid_ati18800.c | 2 +- src/vid_ati28800.c | 2 +- src/vid_cl5429.c | 2 +- src/vid_ega.c | 2 +- src/vid_et4000.c | 2 +- src/vid_oti067.c | 2 +- src/vid_paradise.c | 6 +++--- src/vid_tgui9440.c | 2 +- src/vid_tvga.c | 2 +- src/vid_vga.c | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/vid_ati18800.c b/src/vid_ati18800.c index 85eab70..f57efec 100644 --- a/src/vid_ati18800.c +++ b/src/vid_ati18800.c @@ -125,7 +125,7 @@ void *ati18800_init() 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 --git a/src/vid_ati28800.c b/src/vid_ati28800.c index e64c5dc..2cf6de2 100644 --- a/src/vid_ati28800.c +++ b/src/vid_ati28800.c @@ -146,7 +146,7 @@ void *ati28800_init() 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 --git a/src/vid_cl5429.c b/src/vid_cl5429.c index 7a661af..4130137 100644 --- a/src/vid_cl5429.c +++ b/src/vid_cl5429.c @@ -819,7 +819,7 @@ void *gd5429_init() 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 --git a/src/vid_ega.c b/src/vid_ega.c index 388f618..706c357 100644 --- a/src/vid_ega.c +++ b/src/vid_ega.c @@ -812,7 +812,7 @@ void *ega_standalone_init() 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 --git a/src/vid_et4000.c b/src/vid_et4000.c index 50c79c3..9901209 100644 --- a/src/vid_et4000.c +++ b/src/vid_et4000.c @@ -133,7 +133,7 @@ void *et4000_init() 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 --git a/src/vid_oti067.c b/src/vid_oti067.c index 3585028..3ae0b1f 100644 --- a/src/vid_oti067.c +++ b/src/vid_oti067.c @@ -126,7 +126,7 @@ void *oti067_common_init(char *bios_fn, int vram_size) 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 --git a/src/vid_paradise.c b/src/vid_paradise.c index 5ff7de0..b993a29 100644 --- a/src/vid_paradise.c +++ b/src/vid_paradise.c @@ -322,7 +322,7 @@ static void *paradise_pvga1a_pc2086_init() paradise_t *paradise = paradise_pvga1a_init(); if (paradise) - rom_init(¶dise->bios_rom, "roms/pc2086/40186.ic171", 0xc0000, 0x8000, 0x7fff, 0, 0); + rom_init(¶dise->bios_rom, "roms/pc2086/40186.ic171", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; } @@ -331,7 +331,7 @@ static void *paradise_pvga1a_pc3086_init() paradise_t *paradise = paradise_pvga1a_init(); if (paradise) - rom_init(¶dise->bios_rom, "roms/pc3086/c000.bin", 0xc0000, 0x8000, 0x7fff, 0, 0); + rom_init(¶dise->bios_rom, "roms/pc3086/c000.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; } @@ -344,7 +344,7 @@ static void *paradise_wd90c11_megapc_init() rom_init_interleaved(¶dise->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 --git a/src/vid_tgui9440.c b/src/vid_tgui9440.c index 6b9eff1..7c0b9c4 100644 --- a/src/vid_tgui9440.c +++ b/src/vid_tgui9440.c @@ -475,7 +475,7 @@ void *tgui9440_init() 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 --git a/src/vid_tvga.c b/src/vid_tvga.c index 6f37bf8..71418fe 100644 --- a/src/vid_tvga.c +++ b/src/vid_tvga.c @@ -259,7 +259,7 @@ void *tvga8900d_init() 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 --git a/src/vid_vga.c b/src/vid_vga.c index 7fb2429..b135a68 100644 --- a/src/vid_vga.c +++ b/src/vid_vga.c @@ -81,7 +81,7 @@ void *vga_init() 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,