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

Comparing BasiliskII/src/main.cpp (file contents):
Revision 1.2 by cebix, 1999-10-21T22:39:53Z vs.
Revision 1.5 by cebix, 2000-04-10T18:52:25Z

# Line 1 | Line 1
1   /*
2   *  main.cpp - Startup/shutdown code
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2000 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 41 | Line 41
41   #define DEBUG 0
42   #include "debug.h"
43  
44 + #if ENABLE_MON
45 + #include "mon.h"
46 +
47 + static uint32 mon_read_byte_b2(uint32 adr)
48 + {
49 +        return ReadMacInt8(adr);
50 + }
51 +
52 + static void mon_write_byte_b2(uint32 adr, uint32 b)
53 + {
54 +        WriteMacInt8(adr, b);
55 + }
56 + #endif
57 +
58  
59   /*
60   *  Initialize everything, returns false on error
# Line 65 | Line 79 | bool InitAll(void)
79                          TwentyFourBitAddressing = true;
80                          break;
81                  case ROM_VERSION_II:
82 <                        CPUType = 2;
82 >                        CPUType = PrefsFindInt32("cpu");
83 >                        if (CPUType < 2) CPUType = 2;
84 >                        if (CPUType > 4) CPUType = 4;
85                          FPUType = PrefsFindBool("fpu") ? 1 : 0;
86 +                        if (CPUType == 4) FPUType = 1;  // 68040 always with FPU
87                          TwentyFourBitAddressing = true;
88                          break;
89                  case ROM_VERSION_32:
90 <                        CPUType = 3;
90 >                        CPUType = PrefsFindInt32("cpu");
91 >                        if (CPUType < 2) CPUType = 2;
92 >                        if (CPUType > 4) CPUType = 4;
93                          FPUType = PrefsFindBool("fpu") ? 1 : 0;
94 +                        if (CPUType == 4) FPUType = 1;  // 68040 always with FPU
95                          TwentyFourBitAddressing = false;
96                          break;
97          }
# Line 130 | Line 150 | bool InitAll(void)
150                  ErrorAlert(GetString(STR_UNSUPPORTED_ROM_TYPE_ERR));
151                  return false;
152          }
153 +
154 + #if ENABLE_MON
155 +        // Initialize mon
156 +        mon_init();
157 +        mon_read_byte = mon_read_byte_b2;
158 +        mon_write_byte = mon_write_byte_b2;
159 + #endif
160 +
161          return true;
162   }
163  
# Line 140 | Line 168 | bool InitAll(void)
168  
169   void ExitAll(void)
170   {
171 + #if ENABLE_MON
172 +        // Deinitialize mon
173 +        mon_exit();
174 + #endif
175 +
176          // Save XPRAM
177          XPRAMExit();
178  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines