From 40fcf4e84bb8f6e3d1e609a945438962426b57c1 Mon Sep 17 00:00:00 2001 From: Daniel Collin Date: Wed, 14 Feb 2024 13:40:12 +0100 Subject: [PATCH] Integrated latest from WinUAE --- src/dummy.cpp | 2 +- cfgfile.cpp => uae_src/cfgfile.cpp | 0 cia.cpp => uae_src/cia.cpp | 2 ++ custom.cpp => uae_src/custom.cpp | 0 disk.cpp => uae_src/disk.cpp | 0 drawing.cpp => uae_src/drawing.cpp | 0 inputdevice.cpp => uae_src/inputdevice.cpp | 0 main.cpp => uae_src/main.cpp | 0 memory.cpp => uae_src/memory.cpp | 5 ++++- uae_src/savestate.cpp | 4 ++++ specialmonitors.cpp => uae_src/specialmonitors.cpp | 0 zfile.cpp => uae_src/zfile.cpp | 0 zfile_archive.cpp => uae_src/zfile_archive.cpp | 0 13 files changed, 11 insertions(+), 2 deletions(-) rename cfgfile.cpp => uae_src/cfgfile.cpp (100%) rename cia.cpp => uae_src/cia.cpp (99%) rename custom.cpp => uae_src/custom.cpp (100%) rename disk.cpp => uae_src/disk.cpp (100%) rename drawing.cpp => uae_src/drawing.cpp (100%) rename inputdevice.cpp => uae_src/inputdevice.cpp (100%) rename main.cpp => uae_src/main.cpp (100%) rename memory.cpp => uae_src/memory.cpp (99%) rename specialmonitors.cpp => uae_src/specialmonitors.cpp (100%) rename zfile.cpp => uae_src/zfile.cpp (100%) rename zfile_archive.cpp => uae_src/zfile_archive.cpp (100%) diff --git a/src/dummy.cpp b/src/dummy.cpp index 9ab110eb..793d5c3f 100644 --- a/src/dummy.cpp +++ b/src/dummy.cpp @@ -1939,7 +1939,7 @@ void target_default_options(uae_prefs*, int) { static int old_w = -1; static int old_h = -1; -bool target_graphics_buffer_update(int monid) { +bool target_graphics_buffer_update(int monid, bool force) { struct vidbuf_description* avidinfo = &adisplays[monid].gfxvidinfo; struct vidbuffer* vb = avidinfo->drawbuffer.tempbufferinuse ? &avidinfo->tempbuffer : &avidinfo->drawbuffer; diff --git a/cfgfile.cpp b/uae_src/cfgfile.cpp similarity index 100% rename from cfgfile.cpp rename to uae_src/cfgfile.cpp diff --git a/cia.cpp b/uae_src/cia.cpp similarity index 99% rename from cia.cpp rename to uae_src/cia.cpp index aa09f8e2..140b8c6e 100644 --- a/cia.cpp +++ b/uae_src/cia.cpp @@ -1949,7 +1949,9 @@ static void WriteCIAA(uae_u16 addr, uae_u8 val, uae_u32 *flags) #endif c->prb = val; dongle_cia_write(0, reg, c->drb, val); +#ifdef ARCADIA alg_parallel_port(c->drb, val); +#endif #ifdef PARALLEL_PORT if (isprinter()) { if (isprinter() > 0) { diff --git a/custom.cpp b/uae_src/custom.cpp similarity index 100% rename from custom.cpp rename to uae_src/custom.cpp diff --git a/disk.cpp b/uae_src/disk.cpp similarity index 100% rename from disk.cpp rename to uae_src/disk.cpp diff --git a/drawing.cpp b/uae_src/drawing.cpp similarity index 100% rename from drawing.cpp rename to uae_src/drawing.cpp diff --git a/inputdevice.cpp b/uae_src/inputdevice.cpp similarity index 100% rename from inputdevice.cpp rename to uae_src/inputdevice.cpp diff --git a/main.cpp b/uae_src/main.cpp similarity index 100% rename from main.cpp rename to uae_src/main.cpp diff --git a/memory.cpp b/uae_src/memory.cpp similarity index 99% rename from memory.cpp rename to uae_src/memory.cpp index 7ec10f6d..6f694a0e 100644 --- a/memory.cpp +++ b/uae_src/memory.cpp @@ -2576,9 +2576,12 @@ static void allocate_memory (void) restore_ram (a3000lmem_filepos, a3000lmem_bank.baseaddr); if (a3000hmem_bank.allocated_size > 0) restore_ram (a3000hmem_filepos, a3000hmem_bank.baseaddr); - } else { + } +#ifdef ARCADIA + else { alg_flag = 0; } +#endif #ifdef AGA chipmem_bank_ce2.baseaddr = chipmem_bank.baseaddr; #endif diff --git a/uae_src/savestate.cpp b/uae_src/savestate.cpp index fc7aa232..c44b0ff9 100644 --- a/uae_src/savestate.cpp +++ b/uae_src/savestate.cpp @@ -799,8 +799,10 @@ void restore_state (const TCHAR *filename) end = restore_gayle_ide (chunk); else if (!_tcsncmp (name, _T("CDU"), 3)) end = restore_cd (name[3] - '0', chunk); +#ifdef ARCADIA else if (!_tcsncmp(name, _T("ALG "), 4)) end = restore_alg(chunk); +#endif #ifdef A2065 else if (!_tcsncmp (name, _T("2065"), 4)) end = restore_a2065 (chunk); @@ -1119,9 +1121,11 @@ static int save_state_internal (struct zfile *f, const TCHAR *description, int c save_chunk (f, dst, len, _T("CD32"), 0); xfree (dst); #endif +#ifdef ARCADIA dst = save_alg(&len); save_chunk(f, dst, len, _T("ALG "), 0); xfree(dst); +#endif #ifdef CDTV dst = save_cdtv (&len, NULL); save_chunk (f, dst, len, _T("CDTV"), 0); diff --git a/specialmonitors.cpp b/uae_src/specialmonitors.cpp similarity index 100% rename from specialmonitors.cpp rename to uae_src/specialmonitors.cpp diff --git a/zfile.cpp b/uae_src/zfile.cpp similarity index 100% rename from zfile.cpp rename to uae_src/zfile.cpp diff --git a/zfile_archive.cpp b/uae_src/zfile_archive.cpp similarity index 100% rename from zfile_archive.cpp rename to uae_src/zfile_archive.cpp