[Vice-emu-commit] SF.net SVN: vice-emu:[45712] trunk/vice/src/pet/pet .c

Revision: 45712
          http://sourceforge.net/p/vice-emu/code/45712
Author:   rhialto
Date:     2025-07-14 19:25:58 +0000 (Mon, 14 Jul 2025)
Log Message:
-----------
Clean up some video address mask nonsense.

Modified Paths:
--------------
    trunk/vice/src/pet/pet.c

Modified: trunk/vice/src/pet/pet.c
===================================================================
--- trunk/vice/src/pet/pet.c	2025-07-14 19:12:34 UTC (rev 45711)
+++ trunk/vice/src/pet/pet.c	2025-07-14 19:25:58 UTC (rev 45712)
@@ -931,17 +931,15 @@
     /* mem_initialize_memory(); */
 
     if (!cols) {
+        /* FIXME this guesswork should never be needed!
+         * petmem_check_info() already does something like this. */
         cols = petres.rom_video;
         if (!cols) {
             cols = PET_COLS;
         }
-        vmask = (cols == 40) ? 0x3ff : 0x7ff;
+        vmask = (petres.map == PET_MAP_8296) ? 0x0fff : 0x3ff;
     }
 
-    /* when switching 8296 to 40 columns, CRTC ends up at $9000 otherwise...*/
-    if (cols == 40) {
-        vmask = 0x3ff;
-    }
 /*
     log_message(pet_mem_log, "set_screen(vmask=%04x, cols=%d, crtc=%d)",
                 vmask, cols, petres.model.crtc);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.