[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4878] trunk/fuse

[<zu...@us...>]

Revision: 4878
          http://sourceforge.net/p/fuse-emulator/code/4878
Author:   zubzero
Date:     2013-02-12 00:32:49 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
Revert further changes causing regressions in Opus/+D/DISCiPLE emulation

Modified Paths:
--------------
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/peripherals/disk/disciple.c
    trunk/fuse/peripherals/disk/opus.c
    trunk/fuse/peripherals/disk/plusd.c

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2013-02-11 22:16:59 UTC (rev 4877)
+++ trunk/fuse/hacking/ChangeLog	2013-02-12 00:32:49 UTC (rev 4878)
@@ -4400,3 +4400,7 @@
          Alberto Garcia and helgrind).
 20130211 peripherals/disk/disciple.c: fix typo in comment documenting port
          decoding at the single bit level (Stuart).
+20130212 peripherals/disk/{disciple.c,opus.c,plusd.c}: revert further changes
+         made when reverting the fix to bug #273, causing the Opus Discovery
+         to be left paged in after a reset and +D/DISCiPLE to be left paged in
+         if loading of the interface's ROM fails (Stuart).

Modified: trunk/fuse/peripherals/disk/disciple.c
===================================================================
--- trunk/fuse/peripherals/disk/disciple.c	2013-02-11 22:16:59 UTC (rev 4877)
+++ trunk/fuse/peripherals/disk/disciple.c	2013-02-12 00:32:49 UTC (rev 4878)
@@ -213,11 +213,12 @@
   wd_fdc_drive *d;
   const fdd_params_t *dt;
 
+  disciple_active = 0;
+  disciple_available = 0;
+
   event_remove_type( index_event );
 
   if( !periph_is_active( PERIPH_TYPE_DISCIPLE ) ) {
-    disciple_active = 0;
-    disciple_available = 0;
     return;
   }
 

Modified: trunk/fuse/peripherals/disk/opus.c
===================================================================
--- trunk/fuse/peripherals/disk/opus.c	2013-02-11 22:16:59 UTC (rev 4877)
+++ trunk/fuse/peripherals/disk/opus.c	2013-02-12 00:32:49 UTC (rev 4878)
@@ -179,11 +179,12 @@
   wd_fdc_drive *d;
   const fdd_params_t *dt;
 
+  opus_active = 0;
+  opus_available = 0;
+
   event_remove_type( index_event );
 
   if( !periph_is_active( PERIPH_TYPE_OPUS ) ) {
-    opus_active = 0;
-    opus_available = 0;
     return;
   }
 

Modified: trunk/fuse/peripherals/disk/plusd.c
===================================================================
--- trunk/fuse/peripherals/disk/plusd.c	2013-02-11 22:16:59 UTC (rev 4877)
+++ trunk/fuse/peripherals/disk/plusd.c	2013-02-12 00:32:49 UTC (rev 4878)
@@ -182,11 +182,12 @@
   wd_fdc_drive *d;
   const fdd_params_t *dt;
 
+  plusd_active = 0;
+  plusd_available = 0;
+
   event_remove_type( index_event );
 
   if( !periph_is_active( PERIPH_TYPE_PLUSD ) ) {
-    plusd_active = 0;
-    plusd_available = 0;
     return;
   }
 

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