only override the C128's C64 kernal when the C128 model is DCR _and_ the already loaded kernal is one of the stock kernals we provide. should fix #2196

git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45943 379a1393-f5fb-40a0-bcee-ef074d9b53f7

Author: mrdudz

vice/src/c128/c128rom.c

@@ -29,9 +29,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "archdep.h"
 #include "c128.h"
 #include "c128mem.h"
 #include "c128memrom.h"
+#include "c128model.h"
 #include "c128rom.h"
 #include "c64memrom.h"
 #include "c64rom.h"
@@ -278,9 +280,10 @@ int c128rom_kernal_setup(void)
     const char *resname = NULL;
     const char *rom_name = NULL;
     uint8_t *kernal = NULL;
-    static const char *last_kernal64 = NULL;
+    const char *last_kernal64 = NULL;
     char *name;
     const char *kernal64 = C128_KERNAL64_NAME;
+    int board_type = BOARD_C128;
 
     if (!rom_loaded) {
         return 0;
@@ -320,12 +323,36 @@ int c128rom_kernal_setup(void)
             return -1;
     }
 
-    log_verbose(c128rom_log, "kernal64:%s", kernal64);
-
-    if (kernal64 != last_kernal64) {
-        resources_set_string("Kernal64Name", kernal64);
+    /* HACK: In the C128DCR, C64 kernal+BASIC are combined with C128 kernal
+     * in a single chip. Since we don't have separate resources for localized
+     * C64 kernals, we load it automatically here. */
+    resources_get_int("BoardType", &board_type);
+    if (board_type == BOARD_C128D) {
+        const char *p;
+        resources_get_string("Kernal64Name", &last_kernal64);
+        /* get only the name of the file, remove the path */
+        p = strrchr(last_kernal64, ARCHDEP_DIR_SEP_CHR);
+        if (p != NULL) {
+            /* dir separator was found, move pointer behind it */
+            p++;
+        } else {
+            /* separator not found, use original string */
+            p = last_kernal64;
+        }
+        /* now check if the loaded C64 kernal is one of the stock kernals we
+         * provide, and only then replace it by another stock kernal */
+        if (!strcmp(p, C128_KERNAL64_NAME) ||
+            !strcmp(p, C128_KERNAL64_NO_NAME) ||
+            !strcmp(p, C128_KERNAL64_SE_NAME)) {
+            log_warning(c128rom_log,
+                        "On C128DCR boards the C64 kernal is in the same IC as the C128 kernal, using: %s",
+                        kernal64);
+            /* if the file changed, load the new one */
+            if (strcmp(kernal64, last_kernal64) != 0) {
+                resources_set_string("Kernal64Name", kernal64);
+            }
+        }
     }
-    last_kernal64 = kernal64;
 
     /* disable traps before loading the ROM */
     get_trapflags();

vice/src/c128/c128rom.h

@@ -75,6 +75,16 @@ int c128rom_basic64_setup(void);
 #define C128_KERNAL_DE_R01_CHECKSUM     22098 /* FIXME: 19680 ? */
 #define C128_KERNAL_CH_R01_CHECKSUM     21376
 
+
+/*
+Version        BASlo        BAShi        Kernal       C64 BASIC    C64 Kernal
+-------        -----        -----        ------       ---------    ----------
+First          318018-02    318019-02    318020-03    251913-01lo 251913-01hi
+Middle upgrade 318018-03    318019-03    318020-04    251913-01lo 251913-01hi
+Final upgrade  318018-04    318019-04    318020-05    251913-01lo 251913-01hi
+128DCR         318022-02lo  318022-02hi  318023-02hi  combined in 318023-02lo
+*/
+
 /* C128 chargen
  * CAUTION: some dumps that are circulating have the two charsets swapped.
  * The international one should be in the first half (see #2171)
@@ -99,10 +109,16 @@ int c128rom_basic64_setup(void);
 #define C128_KERNAL_NO_NAME     "kernalno"                  /* FIXME: identify */
 #define C128_KERNAL_SE_NAME     "kernal-318034-01.bin"
 
-/* C128 BASIC */
+/* C128 BASIC
+ * NOTE: in the C128DCR the two parts are combined in 318022-02
+ */
 #define C128_BASICLO_NAME       "basiclo-318018-04.bin"     /* BASIC */
 #define C128_BASICHI_NAME       "basichi-318019-04.bin"     /* Editor */
 
+/* NOTE: in the regular C128, C64 BASIC and C64 kernal are combined in 251913-01
+ * in the C128DCR, C64 BASIC, C64 kernal and C128 kernal are combined in 318023-02
+ */
+
 /* C64 BASIC */
 #define C128_BASIC64_NAME       "basic64-901226-01.bin"     /* first 8k in 318081-01 */