From 7c63ce63686edda350a1d72a532238129c3c8eb1 Mon Sep 17 00:00:00 2001 From: SarahW Date: Sun, 7 May 2017 10:38:28 +0100 Subject: [PATCH] Mark video memory mappings as external. Patch from Greatpsycho. --- src/vid_cga.c | 2 +- src/vid_ega.c | 2 +- src/vid_hercules.c | 2 +- src/vid_incolor.c | 2 +- src/vid_mda.c | 2 +- src/vid_svga.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vid_cga.c b/src/vid_cga.c index 65585b6..18cd630 100644 --- a/src/vid_cga.c +++ b/src/vid_cga.c @@ -454,7 +454,7 @@ void *cga_standalone_init() cga_comp_init(cga->revision); timer_add(cga_poll, &cga->vidtime, TIMER_ALWAYS_ENABLED, cga); - mem_mapping_add(&cga->mapping, 0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL, NULL, 0, cga); + mem_mapping_add(&cga->mapping, 0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, cga); io_sethandler(0x03d0, 0x0010, cga_in, NULL, NULL, cga_out, NULL, NULL, cga); return cga; diff --git a/src/vid_ega.c b/src/vid_ega.c index bb98784..106af91 100644 --- a/src/vid_ega.c +++ b/src/vid_ega.c @@ -853,7 +853,7 @@ void *ega_standalone_init() ega_init(ega); - mem_mapping_add(&ega->mapping, 0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL, 0, ega); + mem_mapping_add(&ega->mapping, 0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, ega); timer_add(ega_poll, &ega->vidtime, TIMER_ALWAYS_ENABLED, ega); io_sethandler(0x03a0, 0x0040, ega_in, NULL, NULL, ega_out, NULL, NULL, ega); return ega; diff --git a/src/vid_hercules.c b/src/vid_hercules.c index d010baa..14750c2 100644 --- a/src/vid_hercules.c +++ b/src/vid_hercules.c @@ -312,7 +312,7 @@ void *hercules_init() hercules->vram = malloc(0x10000); timer_add(hercules_poll, &hercules->vidtime, TIMER_ALWAYS_ENABLED, hercules); - mem_mapping_add(&hercules->mapping, 0xb0000, 0x08000, hercules_read, NULL, NULL, hercules_write, NULL, NULL, NULL, 0, hercules); + mem_mapping_add(&hercules->mapping, 0xb0000, 0x08000, hercules_read, NULL, NULL, hercules_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, hercules); io_sethandler(0x03b0, 0x0010, hercules_in, NULL, NULL, hercules_out, NULL, NULL, hercules); for (c = 0; c < 256; c++) diff --git a/src/vid_incolor.c b/src/vid_incolor.c index 88df9c2..a393d3e 100644 --- a/src/vid_incolor.c +++ b/src/vid_incolor.c @@ -1007,7 +1007,7 @@ void *incolor_init() incolor->vram = malloc(0x40000); /* 4 planes of 64k */ timer_add(incolor_poll, &incolor->vidtime, TIMER_ALWAYS_ENABLED, incolor); - mem_mapping_add(&incolor->mapping, 0xb0000, 0x08000, incolor_read, NULL, NULL, incolor_write, NULL, NULL, NULL, 0, incolor); + mem_mapping_add(&incolor->mapping, 0xb0000, 0x08000, incolor_read, NULL, NULL, incolor_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, incolor); io_sethandler(0x03b0, 0x0010, incolor_in, NULL, NULL, incolor_out, NULL, NULL, incolor); for (c = 0; c < 64; c++) diff --git a/src/vid_mda.c b/src/vid_mda.c index a3a7b39..fe46ec1 100644 --- a/src/vid_mda.c +++ b/src/vid_mda.c @@ -268,7 +268,7 @@ void *mda_init() mda->vram = malloc(0x1000); timer_add(mda_poll, &mda->vidtime, TIMER_ALWAYS_ENABLED, mda); - mem_mapping_add(&mda->mapping, 0xb0000, 0x08000, mda_read, NULL, NULL, mda_write, NULL, NULL, NULL, 0, mda); + mem_mapping_add(&mda->mapping, 0xb0000, 0x08000, mda_read, NULL, NULL, mda_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, mda); io_sethandler(0x03b0, 0x0010, mda_in, NULL, NULL, mda_out, NULL, NULL, mda); for (c = 0; c < 256; c++) diff --git a/src/vid_svga.c b/src/vid_svga.c index 34ecb1e..7433072 100644 --- a/src/vid_svga.c +++ b/src/vid_svga.c @@ -738,7 +738,7 @@ int svga_init(svga_t *svga, void *p, int memsize, svga->overlay_draw = overlay_draw; // _svga_recalctimings(svga); - mem_mapping_add(&svga->mapping, 0xa0000, 0x20000, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel, NULL, 0, svga); + mem_mapping_add(&svga->mapping, 0xa0000, 0x20000, svga_read, svga_readw, svga_readl, svga_write, svga_writew, svga_writel, NULL, MEM_MAPPING_EXTERNAL, svga); timer_add(svga_poll, &svga->vidtime, TIMER_ALWAYS_ENABLED, svga);