Add XEGS emulation and Start Core without content (#105)

- Add emulation for the Atari XE Game System console.
- Add support for starting the core without content.

Author: jfroco

atari800/src/atari.c

@@ -824,6 +824,8 @@ SYSROM_FindInDir("fs:/vol/external01/retroarch/cores/system/atari800", TRUE);
 	/* Auto-start files left on the command line */
 	j = 1; /* diskno */
 	for (i = 1; i < *argc; i++) {
+		if (strcmp(argv[i], "") == 0)	// Core started with no content
+			break;
 		if (j > 8) {
 			/* The remaining arguments are not necessary disk images, but ignore them... */
 			Log_print("Too many disk image filenames on the command line (max. 8).");

libretro/libretro-core.c

@@ -111,6 +111,7 @@ int autorunCartridge = 0;
 int atari_joyhack = 0;
 int paddle_mode = 0;
 int paddle_speed = 3;
+int atarixegs_keyboard_detached = 0;
 
 extern int INPUT_joy_5200_center;
 extern int INPUT_joy_5200_min;
@@ -514,6 +515,9 @@ void retro_set_environment(retro_environment_t cb)
     libretro_set_core_options(environ_cb, &option_cats_supported);
 
     cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports);
+
+    bool no_content = true;
+    cb(RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME, &no_content);
 }
 
 static void update_variables(void)
@@ -525,7 +529,9 @@ static void update_variables(void)
     var.value = NULL;
 
     /* Moved here for better consistency and when system options that require EMU reset to occur */
-    if (HandleExtension((char*)RPATH, "a52") || HandleExtension((char*)RPATH, "A52"))
+    if (strcmp(RPATH, "") == 0)  // Start core with no content
+        autorunCartridge = 0;
+    else if (HandleExtension((char*)RPATH, "a52") || HandleExtension((char*)RPATH, "A52"))
         autorunCartridge = 1;
     else if (HandleExtension((char*)RPATH, "bin") || HandleExtension((char*)RPATH, "BIN")
             || HandleExtension((char*)RPATH, "rom") || HandleExtension((char*)RPATH, "ROM"))
@@ -665,6 +671,17 @@ static void update_variables(void)
             Atari800_builtin_game = FALSE;
             Atari800_keyboard_detached = FALSE;
         }
+        else if (strcmp(var.value, "XEGS") == 0)
+        {
+            Atari800_machine_type = Atari800_MACHINE_XLXE;
+            MEMORY_ram_size = 64;
+            Atari800_builtin_basic = TRUE;
+            Atari800_keyboard_leds = FALSE;
+            Atari800_f_keys = FALSE;
+            Atari800_jumper = FALSE;
+            Atari800_builtin_game = TRUE;
+            Atari800_keyboard_detached = atarixegs_keyboard_detached;
+        } 
 
         if (!libretro_runloop_active || (strcmp(var.value, old_Atari800_machine_type) != 0 ))
         {
@@ -845,6 +862,21 @@ static void update_variables(void)
         }
     }
 
+    var.key = "atarixegs_keyboard_detached";
+    var.value = NULL;
+
+    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+    {
+        if (strcmp(var.value, "attached") == 0)
+        {
+            atarixegs_keyboard_detached = 0;
+        }
+        else if (strcmp(var.value, "detached") == 0)
+        {
+            atarixegs_keyboard_detached = 1;
+        }
+    }
+
     /* Digital Joystick/Paddle Sensitivity */
     var.key = "pot_digital_sensitivity";
     var.value = NULL;
@@ -1232,54 +1264,55 @@ static void keyboard_cb(bool down, unsigned keycode,
 
 bool retro_load_game(const struct retro_game_info* info)
 {
-    const char* full_path;
-    bool media_is_disk_tape = TRUE;
-
-    (void)info;
-
     struct retro_keyboard_callback cb = { keyboard_cb };
+    environ_cb(RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK, &cb);    
 
-    environ_cb(RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK, &cb);
+    if (info!=NULL) {
+        const char* full_path;
+        bool media_is_disk_tape = TRUE;
 
-    full_path = info->path;
+        (void)info;
 
-    // If it's a m3u file
-    if (strendswith(full_path, "M3U"))
-    {
-        // Parse the m3u file
-        dc_parse_m3u(dc, full_path);
-
-        // Some debugging
-        //log_cb(RETRO_LOG_INFO, "m3u file parsed, %d file(s) found\n", dc->count);
-        //for (unsigned i = 0; i < dc->count; i++)
-        //{
-        //    fprintf(fp, "file %d: %s\n", i + 1, dc->files[i]);
-        //    log_cb(RETRO_LOG_INFO, "file %d: %s\n", i + 1, dc->files[i]);
-        //}
-    }
-    else if (strendswith(full_path, "XFD") ||
-             strendswith(full_path, "ATR") ||
-             strendswith(full_path, "DCM") ||
-             strendswith(full_path, "ATX") ||
-             strendswith(full_path, "CAS"))
-    {
-        // Add the file to disk control context
-        // Maybe, in a later version of retroarch, we could add disk on the fly (didn't find how to do this)
-        dc_add_file(dc, full_path);
-    }
-    else
-        media_is_disk_tape = FALSE;
+        full_path = info->path;
 
-    if (media_is_disk_tape)
-    {
-        // Init first disk
-        dc->index = 0;
-        dc->eject_state = false;
-        log_cb(RETRO_LOG_INFO, "Disk/Cassette (%d) inserted into drive 1 : %s\n", dc->index + 1, dc->files[dc->index]);
-        strcpy(RPATH, dc->files[0]);
+        // If it's a m3u file
+        if (strendswith(full_path, "M3U"))
+        {
+            // Parse the m3u file
+            dc_parse_m3u(dc, full_path);
+
+            // Some debugging
+            //log_cb(RETRO_LOG_INFO, "m3u file parsed, %d file(s) found\n", dc->count);
+            //for (unsigned i = 0; i < dc->count; i++)
+            //{
+            //    fprintf(fp, "file %d: %s\n", i + 1, dc->files[i]);
+            //    log_cb(RETRO_LOG_INFO, "file %d: %s\n", i + 1, dc->files[i]);
+            //}
+        }
+        else if (strendswith(full_path, "XFD") ||
+                strendswith(full_path, "ATR") ||
+                strendswith(full_path, "DCM") ||
+                strendswith(full_path, "ATX") ||
+                strendswith(full_path, "CAS"))
+        {
+            // Add the file to disk control context
+            // Maybe, in a later version of retroarch, we could add disk on the fly (didn't find how to do this)
+            dc_add_file(dc, full_path);
+        }
+        else
+            media_is_disk_tape = FALSE;
+
+        if (media_is_disk_tape)
+        {
+            // Init first disk
+            dc->index = 0;
+            dc->eject_state = false;
+            log_cb(RETRO_LOG_INFO, "Disk/Cassette (%d) inserted into drive 1 : %s\n", dc->index + 1, dc->files[dc->index]);
+            strcpy(RPATH, dc->files[0]);
+        }
+        else
+            strcpy(RPATH, full_path);
     }
-    else
-        strcpy(RPATH, full_path);
 
     update_variables();
 
@@ -1333,10 +1366,6 @@ size_t retro_serialize_size(void)
     size = Retro_SaveAtariState(data_, A800_SAVE_STATE_SIZE, 1);
     free(data_);
 
-    //FILE* fp1 = fopen("E:\\debugme.txt", "a");
-    //fprintf(fp1, "Estimated savestate size %i\n", size);
-    //fclose(fp1);
-
     return size;
 }
 
@@ -1346,10 +1375,6 @@ bool retro_serialize(void* data_, size_t size)
 
     returned_size = Retro_SaveAtariState(data_, size, 1);
 
-    //FILE* fp1 = fopen("E:\\debugme.txt", "a");
-    //fprintf(fp1, "Actual savestate size %i\n", returned_size);
-    //fclose(fp1);
-
     return returned_size;
 }
 
@@ -1359,10 +1384,6 @@ bool retro_unserialize(const void* data_, size_t size)
 
     returned_size = Retro_ReadAtariState(data_, size);
 
-    //FILE* fp1 = fopen("E:\\debugme.txt", "a");
-    //fprintf(fp1, "Savestate size read in %i\nFor game %s\n", returned_size,RPATH);
-    //fclose(fp1);
-
     return returned_size;
 }
 

libretro/libretro_core_options.h

@@ -269,6 +269,20 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       },
       "poll"
    },
+   {
+      "atarixegs_keyboard_detached",
+      "Atari XEGS keyboard",
+      NULL,
+      "Set whether the Atari XEGS keyboard is attached or detached. If 'Internal BASIC' is enabled and the keyboard is attached, it will boot to BASIC. If 'Internal BASIC' is enabled and the keyboard is detached it will boot to the in-built game (Missile Command). If 'Internal BASIC' is disabled, it will boot to the Self Test screen",
+      NULL,
+      "input",
+      {
+         { "attached", NULL },
+         { "detached",  NULL },
+         { NULL, NULL },
+      },
+      "attached"
+   },
    {
       "keyboard_defines",
       "Atari Keyboard Defines",
@@ -286,7 +300,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       "atari800_system",
       "Atari System",
       NULL,
-      "Select system emulated.  Atari 5200 for Atari 5200 console games.  400/800 (OS B) for <48K games or ones that require OS/B.  800XL (64K) works for most content.  130XE (128K), Modern XL/XE(320K Compy Shop),  Modern XL/XE(576K), Modern XL/XE(1088K) for content that needs more than 64K.",
+      "Select system emulated.  Atari 5200 for Atari 5200 console games.  400/800 (OS B) for <48K games or ones that require OS/B.  800XL (64K) works for most content.  130XE (128K), Modern XL/XE(320K Compy Shop),  Modern XL/XE(576K), Modern XL/XE(1088K) for content that needs more than 64K.  Atari XE Game System for the Atari XE Game System or XEGS console games.",
       NULL,
       NULL,
       {
@@ -296,6 +310,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
          { "Modern XL/XE(320K CS)", "Modern Atari XL/XE(320K Compy Shop)" },
          { "Modern XL/XE(576K)", "Modern Atari XL/XE(576K)" },
          { "Modern XL/XE(1088K)", "Modern Atari XL/XE(1088K)" },
+         { "XEGS", "Atari XE Game System"},
          { "5200", "Atari 5200 Super System" },
          { NULL, NULL },
       },