Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [345] branches/Release-0_8_0/fuse

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 345
          http://svn.sourceforge.net/fuse-for-macosx/?rev=345&view=rev
Author:   fredm
Date:     2007-04-08 19:29:58 -0700 (Sun, 08 Apr 2007)

Log Message:
-----------
Merge up to fuse-20070404.

Modified Paths:
--------------
    branches/Release-0_8_0/fuse/compat/mkstemp.c
    branches/Release-0_8_0/fuse/hacking/ChangeLog
    branches/Release-0_8_0/fuse/joystick.c
    branches/Release-0_8_0/fuse/machines/spec_se.c
    branches/Release-0_8_0/fuse/periph.c
    branches/Release-0_8_0/fuse/printer.c

Modified: branches/Release-0_8_0/fuse/compat/mkstemp.c
===================================================================

--- branches/Release-0_8_0/fuse/compat/mkstemp.c	2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/compat/mkstemp.c	2007-04-09 02:29:58 UTC (rev 345)
@@ -95,7 +95,6 @@
       XXXXXX[5] = letters[v % 62];
 
       fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-      break;
 
       if (fd >= 0)
 	{

Modified: branches/Release-0_8_0/fuse/hacking/ChangeLog
===================================================================
--- branches/Release-0_8_0/fuse/hacking/ChangeLog	2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/hacking/ChangeLog	2007-04-09 02:29:58 UTC (rev 345)
@@ -1562,3 +1562,15 @@
 20070306 display.c: don't overrun line_times array (Release-0_8_0-branch)
 	 (Fred).
 20070310 man/fuse.1: add divide url (Release-0_8_0-branch) (Fred).
+20070311 machines/spec_se.c: fix marking Dock and EXROM banks as writable in
+         the SE (Release-0_8_0-branch) (thanks, Andrew Owen) (Fred).
+20070317 compat/mkstemp.c: remove abberant break (thanks, Marek Januszewski)
+	 (Release-0_8_0-branch).
+20070321 periph.c: when stopping RZX playback due to overrun, ensure the
+	 change is picked up in z80_do_opcodes() (thanks, Julian Wiseman)
+	 (Release-0_8_0-branch).
+20070327 joystick.c: don't prompt for joystick config changes when loading a
+         snap during RZX playback (Release-0_8_0-branch)
+	 (thanks, Julian Wiseman) (Fred).
+20070404 printer.c: don't buffer output so text is available as it is
+         printed (Release-0_8_0-branch) (Fred).

Modified: branches/Release-0_8_0/fuse/joystick.c
===================================================================
--- branches/Release-0_8_0/fuse/joystick.c	2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/joystick.c	2007-04-09 02:29:58 UTC (rev 345)
@@ -2,7 +2,7 @@
    Copyright (c) 2001-2004 Russell Marks, Philip Kendall
    Copyright (c) 2003 Darren Salt
 
-   $Id: joystick.c,v 1.25 2007/02/02 16:21:51 pak21 Exp $
+   $Id: joystick.c,v 1.25.2.1 2007/03/27 11:32:23 fredm Exp $
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
 #include "joystick.h"
 #include "keyboard.h"
 #include "periph.h"
+#include "rzx.h"
 #include "settings.h"
 #include "spectrum.h"
 #include "machine.h"
@@ -220,7 +221,8 @@
 
     if( settings_current.joystick_keyboard_output != fuse_type &&
         settings_current.joystick_1_output != fuse_type &&
-        settings_current.joystick_2_output != fuse_type ) {
+        settings_current.joystick_2_output != fuse_type &&
+        !rzx_playback ) {
       switch( ui_confirm_joystick( libspectrum_snap_joystick_list(snap,i),
                                    libspectrum_snap_joystick_inputs(snap,i)) ) {
       case UI_CONFIRM_JOYSTICK_KEYBOARD:

Modified: branches/Release-0_8_0/fuse/machines/spec_se.c
===================================================================
--- branches/Release-0_8_0/fuse/machines/spec_se.c	2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/machines/spec_se.c	2007-04-09 02:29:58 UTC (rev 345)
@@ -5,7 +5,7 @@
    Copyright (c) 1999-2002 Philip Kendall
    Copyright (c) 2002-2003 Fredrick Meunier
 
-   $Id: spec_se.c,v 1.15 2007/02/02 16:21:54 pak21 Exp $
+   $Id: spec_se.c,v 1.15.2.1 2007/03/11 01:06:42 fredm Exp $
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -202,6 +202,10 @@
   periph_setup_interface2( PERIPH_PRESENT_OPTIONAL );
   periph_update();
 
+  /* Mark as present/writeable */
+  for( i = 0; i < 34; ++i )
+    memory_map_ram[i].writable = 1;
+
   for( i = 0; i < 8; i++ ) {
 
     timex_dock[i] = memory_map_ram[ i + 18 ];
@@ -230,10 +234,6 @@
   memset( memory_map_home[4]->page, 0, MEMORY_PAGE_SIZE );
   memset( memory_map_home[5]->page, 0, MEMORY_PAGE_SIZE );
 
-  /* Mark as present/writeable */
-  for( i = 0; i < 34; ++i )
-    memory_map_ram[i].writable = 1;
-
   /* RAM pages 1, 3, 5 and 7 contended */
   for( i = 0; i < 8; i++ ) 
     memory_map_ram[ 2 * i ].contended =

Modified: branches/Release-0_8_0/fuse/periph.c
===================================================================
--- branches/Release-0_8_0/fuse/periph.c	2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/periph.c	2007-04-09 02:29:58 UTC (rev 345)
@@ -1,7 +1,7 @@
 /* periph.c: code for handling peripherals
-   Copyright (c) 2005 Philip Kendall
+   Copyright (c) 2005-2007 Philip Kendall
 
-   $Id: periph.c,v 1.20 2007/02/02 16:21:51 pak21 Exp $
+   $Id: periph.c,v 1.20.2.1 2007/03/21 16:21:54 pak21 Exp $
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 
 #include "debugger/debugger.h"
 #include "divide.h"
+#include "event.h"
 #include "if1.h"
 #include "if2.h"
 #include "joystick.h"
@@ -191,8 +192,15 @@
     libspectrum_byte value;
 
     error = libspectrum_rzx_playback( rzx, &value );
-    if( error ) { rzx_stop_playback( 1 ); return readport_internal( port ); }
+    if( error ) {
+      rzx_stop_playback( 1 );
 
+      /* Add a null event to mean we pick up the RZX state change in
+	 z80_do_opcodes() */
+      event_add( tstates, EVENT_TYPE_NULL );
+      return readport_internal( port );
+    }
+
     return value;
   }
 

Modified: branches/Release-0_8_0/fuse/printer.c
===================================================================
--- branches/Release-0_8_0/fuse/printer.c	2007-04-09 02:18:55 UTC (rev 344)
+++ branches/Release-0_8_0/fuse/printer.c	2007-04-09 02:29:58 UTC (rev 345)
@@ -1,7 +1,7 @@
 /* printer.c: Printer support
    Copyright (c) 2001-2004 Ian Collier, Russell Marks, Philip Kendall
 
-   $Id: printer.c,v 1.20 2007/02/02 16:21:51 pak21 Exp $
+   $Id: printer.c,v 1.20.2.1 2007/04/04 10:48:08 fredm Exp $
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -182,6 +182,9 @@
   return(0);
   }
 
+/* ensure users have immediate access to text file contents */
+setbuf( printer_text_file, NULL );
+
 return(1);
 }
 


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




Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [345] branches/Release-0_8_0/fuse

fuse-for-macosx-commits