folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AltairZ80: Remove MetroWerks support for Macintosh OS 9

Browse source
This commit is contained in:
Peter Schorn 2023-04-05 16:15:41 +02:00
parent 75e79a4da8
commit cc23adf6fd
4 changed files with 19 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AltairZ80/altairz80_defs.h
View file

@ -87,10 +87,6 @@ typedef enum {
#define ADDRESS_FORMAT "[0x%08x]" #define ADDRESS_FORMAT "[0x%08x]"
#if (defined (__MWERKS__) && defined (macintosh)) || defined(__DECC)
#define __FUNCTION__ __FILE__
#endif
typedef struct { typedef struct {
uint32 mem_base; /* Memory Base Address */ uint32 mem_base; /* Memory Base Address */
uint32 mem_size; /* Memory Address space requirement */ uint32 mem_size; /* Memory Address space requirement */

13
AltairZ80/altairz80_sio.c
View file

@ -200,13 +200,7 @@ static uint32 stopWatchDelta = 0; /* stores elapsed time of stop w
static int32 getStopWatchDeltaPos = 0; /* determines the state for receiving stopWatchDelta */ static int32 getStopWatchDeltaPos = 0; /* determines the state for receiving stopWatchDelta */
static uint32 stopWatchNow = 0; /* stores starting time of stop watch */ static uint32 stopWatchNow = 0; /* stores starting time of stop watch */
static int32 markTimeSP = 0; /* stack pointer for timer stack */ static int32 markTimeSP = 0; /* stack pointer for timer stack */
uint32 SIMHSleep = 1; /* default time in milliseconds to sleep for SIMHSleepCmd is 1 */
/* default time in milliseconds to sleep for SIMHSleepCmd */
#if defined (__MWERKS__) && defined (macintosh)
uint32 SIMHSleep = 0; /* no sleep on Macintosh OS9 */
#else
uint32 SIMHSleep = 1; /* default value is one millisecond */
#endif
static uint32 sleepAllowedCounter = 0; /* only sleep on no character available when == 0 */ static uint32 sleepAllowedCounter = 0; /* only sleep on no character available when == 0 */
static uint32 sleepAllowedStart = SLEEP_ALLOWED_START_DEFAULT; /* default start for above counter */ static uint32 sleepAllowedStart = SLEEP_ALLOWED_START_DEFAULT; /* default start for above counter */
@ -229,10 +223,7 @@ static int32 FCBAddress = CPM_FCB_ADDRESS; /* FCB Address
/* support for wild card file expansion */ /* support for wild card file expansion */
#if defined (__MWERKS__) && defined (macintosh) #if defined (_WIN32)
const static char hostPathSeparator = ':'; /* colon on Macintosh OS 9 */
const static char hostPathSeparatorAlt = ':'; /* no alternative */
#elif defined (_WIN32)
const static char hostPathSeparator = '\\'; /* back slash in Windows */ const static char hostPathSeparator = '\\'; /* back slash in Windows */
const static char hostPathSeparatorAlt = '/'; /* '/' is an alternative */ const static char hostPathSeparatorAlt = '/'; /* '/' is an alternative */
#else #else

5
AltairZ80/i86.h
View file

@ -44,8 +44,7 @@ Priority 1: If LOWFIRST is defined, use it. LOWFIRST must be 1 if the
lower part of a 16 bit quantity comes first in memory, otherwise lower part of a 16 bit quantity comes first in memory, otherwise
LOWFIRST must be 0 LOWFIRST must be 0
Priority 2: If __BIG_ENDIAN__ is defined, use it to define LOWFIRST accordingly Priority 2: If __BIG_ENDIAN__ is defined, use it to define LOWFIRST accordingly
Priority 3: OS 9 on Macintosh needs LOWFIRST 0 Priority 3: Use LOWFIRST 1 as default
Priority 4: Use LOWFIRST 1 as default
*/ */
#ifndef LOWFIRST #ifndef LOWFIRST
@ -55,8 +54,6 @@ Priority 4: Use LOWFIRST 1 as default
#else #else
#define LOWFIRST 1 #define LOWFIRST 1
#endif #endif
#elif defined (__MWERKS__) && defined (macintosh)
#define LOWFIRST 0
#else #else
#define LOWFIRST 1 #define LOWFIRST 1
#endif #endif

2
sim_defs.h
View file

@ -163,7 +163,7 @@ extern int sim_vax_snprintf(char *buf, size_t buf_size, const char *fmt, ...);
#define USE_REGEX 1 #define USE_REGEX 1
#endif #endif
#if (defined (__MWERKS__) && defined (macintosh)) || defined(__DECC) #if defined(__DECC)
#define __FUNCTION__ __FILE__ #define __FUNCTION__ __FILE__
#endif #endif