Post-merge patches (conflict resolution)

Author: desertkun

3rdparty/libspectrum

@@ -1,5 +1,5 @@
 /* libspectrum.h: the library for dealing with ZX Spectrum emulator files
-   Copyright (c) 2001-2018 Philip Kendall, Darren Salt, Fredrick Meunier
+   Copyright (c) 2001-2023 Philip Kendall, Darren Salt, Fredrick Meunier
 
    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
@@ -272,6 +272,7 @@ typedef enum libspectrum_error {
   LIBSPECTRUM_ERROR_SIGNATURE,
   LIBSPECTRUM_ERROR_SLT,	/* .slt data found at end of a .z80 file */
   LIBSPECTRUM_ERROR_INVALID,	/* Invalid parameter supplied */
+  LIBSPECTRUM_ERROR_MISSING_ZLIB, /* Missing or not used zlib.h */
 
   LIBSPECTRUM_ERROR_LOGIC = -1,
 
@@ -453,6 +454,9 @@ typedef enum libspectrum_id_t {
 
   LIBSPECTRUM_ID_SCREEN_MLT,		/* .mlt screen file */
 
+  /* Below here, present only in FUTURE version */
+  LIBSPECTRUM_ID_SNAPSHOT_DSNAP,		/* .S snapshot (D40/D80) */
+
 } libspectrum_id_t;
 
 /* And 'classes' of file */
@@ -689,35 +693,35 @@ LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_program( libspectrum_creator *creator,
 				 const char *program );
 LIBSPECTRUM_API const char *
-libspectrum_creator_program( libspectrum_creator *creator );
+libspectrum_creator_program( const libspectrum_creator *creator );
 
 LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_major( libspectrum_creator *creator,
 			       libspectrum_word major );
 LIBSPECTRUM_API libspectrum_word
-libspectrum_creator_major( libspectrum_creator *creator );
+libspectrum_creator_major( const libspectrum_creator *creator );
 
 LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_minor( libspectrum_creator *creator,
 			       libspectrum_word minor );
 LIBSPECTRUM_API libspectrum_word
-libspectrum_creator_minor( libspectrum_creator *creator );
+libspectrum_creator_minor( const libspectrum_creator *creator );
 
 LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_competition_code( libspectrum_creator *creator,
 					  libspectrum_dword competition_code );
 LIBSPECTRUM_API libspectrum_dword
-libspectrum_creator_competition_code( libspectrum_creator *creator );
+libspectrum_creator_competition_code( const libspectrum_creator *creator );
 
 LIBSPECTRUM_API libspectrum_error
 libspectrum_creator_set_custom( libspectrum_creator *creator,
 				libspectrum_byte *data, size_t length );
 
 LIBSPECTRUM_API libspectrum_byte *
-libspectrum_creator_custom( libspectrum_creator *creator );
+libspectrum_creator_custom( const libspectrum_creator *creator );
 
 LIBSPECTRUM_API size_t
-libspectrum_creator_custom_length( libspectrum_creator *creator );
+libspectrum_creator_custom_length( const libspectrum_creator *creator );
 
 /*
  * Snap handling routines
@@ -1084,6 +1088,10 @@ WIN32_DLL libspectrum_byte * libspectrum_snap_usource_rom( libspectrum_snap *sna
 WIN32_DLL void libspectrum_snap_set_usource_rom( libspectrum_snap *snap, int idx, libspectrum_byte* usource_rom );
 WIN32_DLL size_t libspectrum_snap_usource_rom_length( libspectrum_snap *snap, int idx );
 WIN32_DLL void libspectrum_snap_set_usource_rom_length( libspectrum_snap *snap, int idx, size_t usource_rom_length );
+WIN32_DLL int libspectrum_snap_uspeech_active( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_uspeech_active( libspectrum_snap *snap, int uspeech_active );
+WIN32_DLL int libspectrum_snap_uspeech_paged( libspectrum_snap *snap );
+WIN32_DLL void libspectrum_snap_set_uspeech_paged( libspectrum_snap *snap, int uspeech_paged );
 WIN32_DLL int libspectrum_snap_disciple_active( libspectrum_snap *snap );
 WIN32_DLL void libspectrum_snap_set_disciple_active( libspectrum_snap *snap, int disciple_active );
 WIN32_DLL int libspectrum_snap_disciple_paged( libspectrum_snap *snap );

fusepb/English.lproj/InfoPlist.strings

@@ -44,6 +44,8 @@
 #include "peripherals/disk/opus.h"
 #include "peripherals/sound/uspeech.h"
 #include "peripherals/spectranet.h"
+#include "peripherals/fs/xfs.h"
+#include "peripherals/nic/spectranext_controller.h"
 #include "peripherals/ttx2000s.h"
 #include "peripherals/ula.h"
 #include "settings.h"
@@ -395,6 +397,14 @@ readbyte( libspectrum_word address )
         return spectranet_w5100_read( mapping, address );
       if( spectranet_w5100_paged_b && address >= 0x2000 && address < 0x3000 )
         return spectranet_w5100_read( mapping, address );
+      if( spectranet_xfs_paged_a && address >= 0x1000 && address < 0x2000 )
+        return spectranet_xfs_read( mapping, address );
+      if( spectranet_xfs_paged_b && address >= 0x2000 && address < 0x3000 )
+        return spectranet_xfs_read( mapping, address );
+      if( spectranet_spectranext_config_paged_a && address >= 0x1000 && address < 0x2000 )
+        return spectranet_spectranext_config_read( mapping, address );
+      if( spectranet_spectranext_config_paged_b && address >= 0x2000 && address < 0x3000 )
+        return spectranet_spectranext_config_read( mapping, address );
       if( address < 0x1000 )
         return spectranet_flash_rom_read( mapping, address );
       if( spectranet_flash_paged_a && address >= 0x1000 && address < 0x2000 )
@@ -504,6 +514,22 @@ writebyte_internal( libspectrum_word address, libspectrum_byte b )
       spectranet_w5100_write( mapping, address, b );
       return;
     }
+    if( spectranet_xfs_paged_a && address >= 0x1000 && address < 0x2000 ) {
+      spectranet_xfs_write( mapping, address, b );
+      return;
+    }
+    if( spectranet_xfs_paged_b && address >= 0x2000 && address < 0x3000 ) {
+      spectranet_xfs_write( mapping, address, b );
+      return;
+    }
+    if( spectranet_spectranext_config_paged_a && address >= 0x1000 && address < 0x2000 ) {
+      spectranet_spectranext_config_write( mapping, address, b );
+      return;
+    }
+    if( spectranet_spectranext_config_paged_b && address >= 0x2000 && address < 0x3000 ) {
+      spectranet_spectranext_config_write( mapping, address, b );
+      return;
+    }
   }
 
   if( ttx2000s_paged ) {

fusepb/FuseX.xcodeproj/project.pbxproj

@@ -32,6 +32,7 @@
 #include <unistd.h>
 
 #include "fuse.h"
+#include "utils.h"
 #include "ui/ui.h"
 #include "w5100.h"
 #include "w5100_internals.h"
@@ -101,9 +102,9 @@ w5100_io_thread( void *arg )
 
     FD_SET( selfpipe_socket, &readfds );
 
-    for( i = 0; i < 4; i++ )
-      nic_w5100_socket_add_to_sets( &self->socket[i], &readfds, &writefds,
-        &max_fd );
+      for( i = 0; i < 4; i++ )
+        nic_w5100_socket_add_to_sets( self, &self->socket[i], &readfds, &writefds,
+          &max_fd );
 
     /* Note that if a socket is closed between when we added it to the sets
        above and when we call select() below, it will cause the select to fail
@@ -124,7 +125,7 @@ w5100_io_thread( void *arg )
       }
 
       for( i = 0; i < 4; i++ )
-        nic_w5100_socket_process_io( &self->socket[i], readfds, writefds );
+        nic_w5100_socket_process_io( self, &self->socket[i], readfds, writefds );
     }
     else if( compat_socket_get_error() == compat_socket_EBADF ) {
       /* Do nothing - just loop again */
@@ -144,6 +145,8 @@ w5100_start_io_thread( nic_w5100_t *self )
 {
   int error;
 
+  utils_networking_init();
+
   if( self->io_thread_running ) return 0;
 
   self->selfpipe = compat_socket_selfpipe_alloc();