ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/sys_unix.cpp
(Generate patch)

Comparing BasiliskII/src/Unix/sys_unix.cpp (file contents):
Revision 1.20 by gbeauche, 2003-10-12T21:55:44Z vs.
Revision 1.22 by nigel, 2004-01-26T11:08:52Z

# Line 1 | Line 1
1   /*
2   *  sys_unix.cpp - System dependent routines, Unix implementation
3   *
4 < *  Basilisk II (C) 1997-2003 Christian Bauer
4 > *  Basilisk II (C) 1997-2004 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 145 | Line 145 | void SysAddFloppyPrefs(void)
145          PrefsAddString("floppy", "/dev/fd0a");
146          PrefsAddString("floppy", "/dev/fd1a");
147   #elif defined(__APPLE__) && defined(__MACH__)
148 <        // FIXME: We assume an Aqua build causes <AvailabilityMacros.h> to
149 <        // be included, thusly enabling this part of code that would cause
150 <        // Basilisk II to hang otherwise.
151 < #ifdef MAC_OS_X_VERSION_10_0
152 <        PrefsAddString("floppy", "/dev/fd/0");
153 <        PrefsAddString("floppy", "/dev/fd/1");
154 < #endif
148 >  #ifdef AQUA
149 >        extern  void DarwinAddFloppyPrefs(void);
150 >
151 >        DarwinAddFloppyPrefs();
152 >  #else
153 >        // Until I can convince the other guys that my Darwin code is useful,
154 >        // we just add something safe (a non-existant device):
155 >        PrefsAddString("floppy", "/dev/null");
156 >  #endif
157   #else
158          PrefsAddString("floppy", "/dev/fd0");
159          PrefsAddString("floppy", "/dev/fd1");
# Line 222 | Line 224 | void SysAddCDROMPrefs(void)
224                          closedir(cd_dir);
225                  }
226          }
227 < #elif defined(__APPLE__) && defined(__MACH__) && defined(MAC_OS_X_VERSION_10_0)
227 > #elif defined(__APPLE__) && defined(__MACH__)
228 >  #ifdef AQUA
229          extern  void DarwinAddCDROMPrefs(void);
230  
231          DarwinAddCDROMPrefs();
232 +  #else
233 +        // Until I can convince the other guys that my Darwin code is useful,
234 +        // we just do nothing (it is safe to have no cdrom device)
235 +  #endif
236   #elif defined(__FreeBSD__) || defined(__NetBSD__)
237          PrefsAddString("cdrom", "/dev/cd0c");
238   #endif
# Line 253 | Line 260 | void SysAddSerialPrefs(void)
260          PrefsAddString("seriala", "/dev/tty00");
261          PrefsAddString("serialb", "/dev/tty01");
262   #elif defined(__APPLE__) && defined(__MACH__)
263 <        // FIXME: We assume an Aqua build causes <AvailabilityMacros.h> to
264 <        // be included, thusly enabling this part of code that would cause
265 <        // Basilisk II to hang otherwise.
266 < #ifdef MAC_OS_X_VERSION_10_0
267 <        PrefsAddString("seriala", "/dev/ttys0");
268 <        PrefsAddString("serialb", "/dev/ttys1");
269 < #endif
270 < //      PrefsAddString("seriala", "/dev/cu.modem");
271 < //      PrefsAddString("serialb", "/dev/cu.IrDA-IrCOMMch-b");
263 >  #ifdef AQUA
264 >        extern  void DarwinAddSerialPrefs(void);
265 >
266 >        DarwinAddSerialPrefs();
267 >  #else
268 >        // Until I can convince the other guys that my Darwin code is useful,
269 >        // we just add something safe (non-existant devices):
270 >        PrefsAddString("seriala", "/dev/null");
271 >        PrefsAddString("serialb", "/dev/null");
272 >  #endif
273   #endif
274   }
275  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines