Integrated latest from WinUAE

theblacklotus · Feb 14, 2024 · 40fcf4e · 40fcf4e
1 parent c1e72e2
commit 40fcf4e
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 2 deletions.
diff --git 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 → uae_src/cfgfile.cpp b/cfgfile.cpp → uae_src/cfgfile.cpp
diff --git a/cia.cpp → uae_src/cia.cpp b/cia.cpp → 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 → uae_src/custom.cpp b/custom.cpp → uae_src/custom.cpp
diff --git a/disk.cpp → uae_src/disk.cpp b/disk.cpp → uae_src/disk.cpp
diff --git a/drawing.cpp → uae_src/drawing.cpp b/drawing.cpp → uae_src/drawing.cpp
diff --git a/inputdevice.cpp → uae_src/inputdevice.cpp b/inputdevice.cpp → uae_src/inputdevice.cpp
diff --git a/main.cpp → uae_src/main.cpp b/main.cpp → uae_src/main.cpp
diff --git a/memory.cpp → uae_src/memory.cpp b/memory.cpp → 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
@@ -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 → uae_src/specialmonitors.cpp b/specialmonitors.cpp → uae_src/specialmonitors.cpp
diff --git a/zfile.cpp → uae_src/zfile.cpp b/zfile.cpp → uae_src/zfile.cpp
diff --git a/zfile_archive.cpp → uae_src/zfile_archive.cpp b/zfile_archive.cpp → uae_src/zfile_archive.cpp