More conditional compiling

Author: stefan.haubenthal

6551_modem.c

@@ -614,7 +614,7 @@ static int socket_bind(int sock, int port, int domain)
 #endif
 
 
-  #if defined(__LINUX__) || defined(__APPLE__) || defined(__amigaos4__)
+  #if defined(__LINUX__) || defined(__APPLE__) || defined(__amigaos4__) || defined(__MORPHOS__)
     fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
   #endif
 
@@ -647,7 +647,7 @@ static int socket_accept(int sock, int* sck)
     return 0;
   else
   {
-    #if defined(__LINUX__) || defined(__amigaos4__)
+    #if defined(__LINUX__) || defined(__amigaos4__) || defined(__MORPHOS__)
     fcntl(*sck, F_SETFL, fcntl(*sck, F_GETFL, 0) | O_NONBLOCK);
     #endif
 
@@ -744,7 +744,7 @@ static int socket_connect(int sock, const char* host, int port, int domain)
 	}
 #endif
 
-  #if defined(__LINUX__) || defined(__APPLE__) || defined(__amigaos4__)
+  #if defined(__LINUX__) || defined(__APPLE__) || defined(__amigaos4__) || defined(__MORPHOS__)
     fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
   #endif
 

Oricutron.guide

@@ -2,11 +2,11 @@
 @author "ReadMe2Guide"
 @node Main "Main"
 @toc Contents
-@$VER: Oricutron 1.1.0 (07.12.13)
+@$VER: Oricutron 1.2.0 (08.11.14)
 Oricutron 1.2
 -------------
 
-(c)2009-2014 Peter Gordon ([email protected])
+(c)2009-2014 Peter Gordon (pete\@petergordon.org.uk)
 
 This is a work in progress.
 
@@ -56,6 +56,12 @@ Credits
   Peter Gordon
 
 
+  BeOS/Haiku port
+  ---------------
+
+  Francois Revol
+
+
   MacOS X port
   ------------
 
@@ -331,14 +337,14 @@ bsm $0c00 rwc      <-- Break just before the CPU accesses $0c00, or just after i
 
 
 @endnode
-@node InternationalKeyboards "International Keyboards under Linux and Mac OS X"
+@node InternationalKeyboardsunderLinuxandMacOSX "International Keyboards under Linux and Mac OS X"
 @toc Contents
 International Keyboards under Linux and Mac OS X
 ================================================
 
 There are lots of problems with some international keyboards under Linux and Mac OS X.
 The best way to cope with them is to install an UK or US keyboard definition and to
-switch to it *before* starting oricutron.
+switch to it @{b}before@{ub} starting oricutron.
 
 Under Mac OS X you can do that in the "System Preferences", "Keyboard", "Input sources".
 Click on the + and search for the UK or US keyboard.
@@ -351,7 +357,7 @@ For a better solution look under "Visual Keyboard" down here.
 
 
 @endnode
-@node Visualkeyboard "Visual Keyboard"
+@node VisualKeyboard "Visual Keyboard"
 @toc Contents
 Visual Keyboard
 ===============
@@ -381,7 +387,7 @@ sticky_mod_keys = yes
 
 
 @endnode
-@node Serialcard "Serial card (ACIA) emulation"
+@node Serialcard(ACIA)emulation "Serial card (ACIA) emulation"
 @toc Contents
 Serial card (ACIA) emulation
 ============================
@@ -416,7 +422,7 @@ ATD ip:port - connects as client to ip:port. 'ip' can be any host name (ex.:loca
 
 
 @endnode
-@node Rompatchfiles "ROM patch files"
+@node ROMpatchfiles "ROM patch files"
 @toc Contents
 ROM patch files
 ===============
@@ -441,8 +447,8 @@ where XXXX,YYYY,ZZZZ - are hex addresses relative to ROM start address
 @{"Keys" link Keys}
 @{"Monitor instructions" link Monitorinstructions}
 @{"Breakpoints" link Breakpoints}
-@{"International Keyboards under Linux and Mac OS X" link InternationalKeyboards}
-@{"Visual Keyboard" link Visualkeyboard}
-@{"Serial card (ACIA) emulation" link Serialcard}
-@{"ROM patch files" link Rompatchfiles}
+@{"International Keyboards under Linux and Mac OS X" link InternationalKeyboardsunderLinuxandMacOSX}
+@{"Visual Keyboard" link VisualKeyboard}
+@{"Serial card (ACIA) emulation" link Serialcard(ACIA)emulation}
+@{"ROM patch files" link ROMpatchfiles}
 @endnode

ReadMe.txt

@@ -45,6 +45,12 @@ Credits
   Peter Gordon
 
 
+  BeOS/Haiku port
+  ---------------
+
+  Francois Revol
+
+
   MacOS X port
   ------------
 

main.c

@@ -432,6 +432,7 @@ static void load_config( struct start_opts *sto, struct machine *oric )
         oric->aciabackendcfg = oric->aciabackend = ACIA_TYPE_LOOPBACK;
       else if(!strncasecmp("modem", oric->aciabackendname, 5))
       {
+#ifdef BACKEND_MODEM
         char* p = strchr(oric->aciabackendname, ':');
         oric->aciabackendcfg = oric->aciabackend = ACIA_TYPE_MODEM;
         oric->aciabackendcfgport = 0;
@@ -451,10 +452,13 @@ static void load_config( struct start_opts *sto, struct machine *oric )
         }
         if(oric->aciabackendcfgport <= 0)
           oric->aciabackendcfgport = ACIA_TYPE_MODEM_DEFAULT_PORT;
+#endif
       }
       else
       {
+#ifdef BACKEND_COM
         oric->aciabackendcfg = oric->aciabackend = ACIA_TYPE_COM;
+#endif
       }
       continue;
     }
@@ -695,6 +699,7 @@ SDL_bool init( struct machine *oric, int argc, char *argv[] )
               oric->aciabackendcfg = oric->aciabackend = ACIA_TYPE_LOOPBACK;
             else if(!strncasecmp("modem", opt_arg, 5))
             {
+#ifdef BACKEND_MODEM
               char* p = strchr(opt_arg, ':');
               oric->aciabackendcfg = oric->aciabackend = ACIA_TYPE_MODEM;
               oric->aciabackendcfgport = 0;
@@ -714,11 +719,14 @@ SDL_bool init( struct machine *oric, int argc, char *argv[] )
               }
               if(oric->aciabackendcfgport <= 0)
                 oric->aciabackendcfgport = ACIA_TYPE_MODEM_DEFAULT_PORT;
+#endif
             }
             else
             {
+#ifdef BACKEND_COM
               strncpy(oric->aciabackendname, opt_arg, ACIA_BACKEND_NAME_LEN);
               oric->aciabackendcfg = oric->aciabackend = ACIA_TYPE_COM;
+#endif
             }
           }