[Vice-emu-commit] SF.net SVN: vice-emu: [18923] trunk/vice/src

Revision: 18923
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18923&view=rev
Author:   strik
Date:     2008-06-27 13:46:49 -0700 (Fri, 27 Jun 2008)

Log Message:
-----------
2008-06-27  Spiro Trikaliotis  <spi...@gm...>

	* src/autostart.c: Incorporated patch from iAN Coog: 1. Add
	colon (":") after "LOAD" and "RUN" lines using tostart. This is
	helpful if there is already something on the screen, to prevent
	it to provoke some error messages. 2. remember original true
	drive emulation state before using autostart. This fixes the
	problem that TDE is not re-activated after autostart.  3. Dev
	Traps set to ON always in autostart_tape() for T64s. T64 without
	VTD don't load, so it's a must to activate it always with them.
	(TAP files don't care.)

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/autostart.c

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-06-27 16:33:18 UTC (rev 18922)
+++ trunk/vice/src/ChangeLog	2008-06-27 20:46:49 UTC (rev 18923)
@@ -1,3 +1,15 @@
+2008-06-27  Spiro Trikaliotis  <spi...@gm...>
+
+	* autostart.c: Incorporated patch from iAN Coog: 1. Add colon
+	(":") after "LOAD" and "RUN" lines using tostart. This is
+	helpful if there is already something on the screen, to prevent
+	it to provoke some error messages. 2. remember original true
+	drive emulation state before using autostart. This fixes the
+	problem that TDE is not re-activated after autostart.  3. Dev
+	Traps set to ON always in autostart_tape() for T64s. T64 without
+	VTD don't load, so it's a must to activate it always with them.
+	(TAP files don't care.)
+
 2008-06-25  Spiro Trikaliotis  <spi...@gm...>
 
 	* arch/win32/vice.dsw, arch/win32/_all.dsp: New (dummy) project

Modified: trunk/vice/src/autostart.c
===================================================================
--- trunk/vice/src/autostart.c	2008-06-27 16:33:18 UTC (rev 18922)
+++ trunk/vice/src/autostart.c	2008-06-27 20:46:49 UTC (rev 18923)
@@ -91,7 +91,7 @@
 
 /* Flag: was true drive emulation turned on when we started booting the disk
    image?  */
-static int orig_drive_true_emulation_state = 0;
+static int orig_drive_true_emulation_state = -1;
 
 /* PETSCII name of the program to load. NULL if default */
 static BYTE *autostart_program_name = NULL;
@@ -292,11 +292,11 @@
       case YES:
         log_message(autostart_log, "Loading file.");
         if (autostart_program_name) {
-            tmp = util_concat("LOAD\"", autostart_program_name, "\"\r", NULL);
+            tmp = util_concat("LOAD\"", autostart_program_name, "\":\r", NULL);
             kbdbuf_feed(tmp);
             lib_free(tmp);
         } else {
-            kbdbuf_feed("LOAD\r");
+            kbdbuf_feed("LOAD:\r");
         }
         if (tape_tap_attched()) {
             autostartmode = AUTOSTART_PRESSPLAYONTAPE;
@@ -333,7 +333,7 @@
     switch (check("READY.", AUTOSTART_WAIT_BLINK)) {
       case YES:
         log_message(autostart_log, "Starting program.");
-        kbdbuf_feed("RUN\r");
+        kbdbuf_feed("RUN:\r");
         autostartmode = AUTOSTART_DONE;
         break;
       case NO:
@@ -382,7 +382,7 @@
 
         if (!traps) {
             if (autostart_run_mode == AUTOSTART_MODE_RUN)
-                kbdbuf_feed("RUN\r");
+                kbdbuf_feed("RUN:\r");
             autostartmode = AUTOSTART_DONE;
         } else {
             autostartmode = AUTOSTART_LOADINGDISK;
@@ -422,6 +422,11 @@
     if (!autostart_enabled)
         return;
 
+    if( orig_drive_true_emulation_state == -1)
+    {
+        orig_drive_true_emulation_state = get_true_drive_emulation_state();
+    }
+ 
     if (maincpu_clk < min_cycles)
     {
         autostart_wait_for_reset = 0;
@@ -542,6 +547,7 @@
                 tape_seek_start(tape_image_dev1);
             }
         }
+        resources_set_int("VirtualDevices", 1); /* Kludge: iAN CooG - for t64 images we need devtraps ON */
         reboot_for_autostart(name, AUTOSTART_HASTAPE, runmode);
         lib_free(name);
 
@@ -654,6 +660,7 @@
     /* Setup FS-based drive emulation.  */
     fsdevice_set_directory(directory ? directory : ".", 8);
     set_true_drive_emulation_mode(0);
+    orig_drive_true_emulation_state =0;
     resources_set_int("VirtualDevices", 1);
     resources_set_int("FSDevice8ConvertP00", 1);
     file_system_detach_disk(8);


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