[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[672] trunk/fuse

[<fr...@us...>]

Revision: 672
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=672&view=rev
Author:   fredm
Date:     2011-04-04 11:56:05 +0000 (Mon, 04 Apr 2011)

Log Message:
-----------
Merge in vendor revision 4234 change to handle missing peripheral ROM files
(patch #3147415).

Revision Links:
--------------
    http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=4234&view=rev

Modified Paths:
--------------
    trunk/fuse/disk/beta.c
    trunk/fuse/disk/opus.c
    trunk/fuse/disk/plusd.c
    trunk/fuse/hacking/ChangeLog
    trunk/fuse/if1.c
    trunk/fuse/if2.c

Modified: trunk/fuse/disk/beta.c
===================================================================
--- trunk/fuse/disk/beta.c	2011-04-04 11:54:04 UTC (rev 671)
+++ trunk/fuse/disk/beta.c	2011-04-04 11:56:05 UTC (rev 672)
@@ -205,9 +205,15 @@
   }
 
   if( !beta_builtin ) {
-    machine_load_rom_bank( beta_memory_map_romcs, 0, 0,
-			   settings_current.rom_beta128,
-			   settings_default.rom_beta128, 0x4000 );
+    if( machine_load_rom_bank( beta_memory_map_romcs, 0, 0,
+			       settings_current.rom_beta128,
+			       settings_default.rom_beta128, 0x4000 ) ) {
+      beta_active = 0;
+      beta_available = 0;
+      periph_beta128_active = 0;
+      settings_current.beta128 = 0;
+      return;
+    }
 
     beta_memory_map_romcs[ 0 ].writable = 0;
     beta_memory_map_romcs[ 1 ].writable = 0;

Modified: trunk/fuse/disk/opus.c
===================================================================
--- trunk/fuse/disk/opus.c	2011-04-04 11:54:04 UTC (rev 671)
+++ trunk/fuse/disk/opus.c	2011-04-04 11:56:05 UTC (rev 672)
@@ -162,9 +162,13 @@
   if( !periph_opus_active )
     return;
 
-  machine_load_rom_bank( opus_memory_map_romcs, 0, 0,
-			 settings_current.rom_opus,
-			 settings_default.rom_opus, 0x2000 );
+  if( machine_load_rom_bank( opus_memory_map_romcs, 0, 0,
+                             settings_current.rom_opus,
+                             settings_default.rom_opus, 0x2000 ) ) {
+    settings_current.opus = 0;
+    periph_opus_active = 0;
+    return;
+  }
 
   opus_memory_map_romcs[0].source = MEMORY_SOURCE_PERIPHERAL;
 

Modified: trunk/fuse/disk/plusd.c
===================================================================
--- trunk/fuse/disk/plusd.c	2011-04-04 11:54:04 UTC (rev 671)
+++ trunk/fuse/disk/plusd.c	2011-04-04 11:56:05 UTC (rev 672)
@@ -174,9 +174,13 @@
   if( !periph_plusd_active )
     return;
 
-  machine_load_rom_bank( plusd_memory_map_romcs, 0, 0,
-			 settings_current.rom_plusd,
-			 settings_default.rom_plusd, 0x2000 );
+  if( machine_load_rom_bank( plusd_memory_map_romcs, 0, 0,
+			     settings_current.rom_plusd,
+			     settings_default.rom_plusd, 0x2000 ) ) {
+    settings_current.plusd = 0;
+    periph_plusd_active = 0;
+    return;
+  }
 
   plusd_memory_map_romcs[0].source = MEMORY_SOURCE_PERIPHERAL;
 

Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog	2011-04-04 11:54:04 UTC (rev 671)
+++ trunk/fuse/hacking/ChangeLog	2011-04-04 11:56:05 UTC (rev 672)
@@ -3373,8 +3373,10 @@
          system (fixes bugs #3124787 and #3124788) (rkd77).
 20101216 ChangeLog,README,configure.in,man/fuse.1: update for 1.0.0 release.
 20101217 keysyms.pl: fix SVGAlib compilation (rkd77).
-20101229 debugger/breakpoint.c: don't free temporary breakpoint until after we have run
-         it (fixes bug #3084862) (thanks, Chris Cowley) (Fred).
+20101229 disk/{beta.c,opus.c,plusd.c},if1.c,if2.c: handle missing peripheral ROM
+         files (patch #3147415) (Alberto Garcia).
+20101229 debugger/breakpoint.c: don't free temporary breakpoint until after we
+         have run it (fixes bug #3084862) (thanks, Chris Cowley) (Fred).
 20101230 debugger/breakpoint.c: stop evaluating breakpoints when we have hit a
          temporary breakpoint (really fixes bug #3084862) (patch #3142840)
          (Sergio Baldovi).

Modified: trunk/fuse/if1.c
===================================================================
--- trunk/fuse/if1.c	2011-04-04 11:54:04 UTC (rev 671)
+++ trunk/fuse/if1.c	2011-04-04 11:56:05 UTC (rev 672)
@@ -364,10 +364,14 @@
 
   if( !periph_interface1_active ) return;
 
-  machine_load_rom_bank( if1_memory_map_romcs, 0, 0,
-			 settings_current.rom_interface_i,
-			 settings_default.rom_interface_i,
-			 MEMORY_PAGE_SIZE );
+  if( machine_load_rom_bank( if1_memory_map_romcs, 0, 0,
+			     settings_current.rom_interface_i,
+			     settings_default.rom_interface_i,
+			     MEMORY_PAGE_SIZE ) ) {
+    settings_current.interface1 = 0;
+    periph_interface1_active = 0;
+    return;
+  }
 
   if1_memory_map_romcs[0].source = MEMORY_SOURCE_PERIPHERAL;
 

Modified: trunk/fuse/if2.c
===================================================================
--- trunk/fuse/if2.c	2011-04-04 11:54:04 UTC (rev 671)
+++ trunk/fuse/if2.c	2011-04-04 11:56:05 UTC (rev 672)
@@ -121,10 +121,11 @@
 
   if ( !periph_interface2_active ) return;
 
-  machine_load_rom_bank( if2_memory_map_romcs, 0, 0,
-			 settings_current.if2_file,
-			 NULL,
-			 2 * MEMORY_PAGE_SIZE );
+  if ( machine_load_rom_bank( if2_memory_map_romcs, 0, 0,
+			      settings_current.if2_file,
+			      NULL,
+			      2 * MEMORY_PAGE_SIZE ) )
+    return;
 
   if2_memory_map_romcs[0].source =
     if2_memory_map_romcs[1].source = MEMORY_SOURCE_CARTRIDGE;


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