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

Comparing BasiliskII/src/AmigaOS/main_amiga.cpp (file contents):
Revision 1.9 by jlachmann, 2000-08-20T14:08:41Z vs.
Revision 1.11 by gbeauche, 2000-09-22T17:22:40Z

# Line 75 | Line 75 | uint32 ROMBaseMac;             // ROM base (Mac add
75   uint8 *ROMBaseHost;             // ROM base (host address space)
76   uint32 ROMSize;                 // Size of ROM
77  
78 uint32 MacsBugFlags = 0xbff;
79
78  
79   // CPU and FPU type, addressing mode
80   int CPUType;
# Line 99 | Line 97 | struct Library *AHIBase = NULL;
97   struct Library *DiskBase = NULL;
98  
99   struct Task *MainTask;                                                  // Our task
100 < uint32 ScratchMem = NULL;                                               // Scratch memory for Mac ROM writes
100 > uint8 *ScratchMem = NULL;                                               // Scratch memory for Mac ROM writes
101   APTR OldTrapHandler = NULL;                                             // Old trap handler
102   APTR OldExceptionHandler = NULL;                                // Old exception handler
103   BYTE IRQSig = -1;                                                               // "Interrupt" signal number
# Line 230 | Line 228 | int main(void)
228          TimerBase = (struct Library *)timereq->tr_node.io_Device;
229  
230          // Allocate scratch memory
231 <        ScratchMem = (uint32)AllocMem(SCRATCH_MEM_SIZE, MEMF_PUBLIC);
231 >        ScratchMem = (uint8 *)AllocMem(SCRATCH_MEM_SIZE, MEMF_PUBLIC);
232          if (ScratchMem == NULL) {
233                  ErrorAlert(GetString(STR_NO_MEM_ERR));
234                  QuitEmulator();
# Line 245 | Line 243 | int main(void)
243                  RAMSize = 1024*1024;
244          }
245          RAMBaseHost = (uint8 *)AllocVec(RAMSize + 0x100000, MEMF_PUBLIC);
246 < //      if (RAMBaseHost == NULL) {
249 < //              ErrorAlert(GetString(STR_NO_MEM_ERR));
250 < //              QuitEmulator();
251 < //      }
252 <        if (RAMBaseHost == NULL)
253 <                {
246 >        if (RAMBaseHost == NULL) {
247                  uint32 newRAMSize = AvailMem(MEMF_LARGEST) - 0x100000;
248                  char xText[120];
249  
250                  sprintf(xText, GetString(STR_NOT_ENOUGH_MEM_WARN), RAMSize, newRAMSize);
251  
252 <                if (1 != ChoiceAlert(xText, "Use", "Quit"))
252 >                if (ChoiceAlert(xText, "Use", "Quit") != 1)
253                          QuitEmulator();
254  
255                  RAMSize = newRAMSize;
# Line 265 | Line 258 | int main(void)
258                          ErrorAlert(GetString(STR_NO_MEM_ERR));
259                          QuitEmulator();
260                  }
261 <                }
261 >        }
262          RAMBaseMac = (uint32)RAMBaseHost;
263          D(bug("Mac RAM starts at %08lx\n", RAMBaseHost));
264          ROMBaseHost = RAMBaseHost + RAMSize;
# Line 332 | Line 325 | int main(void)
325          // Set task priority to -1 so we don't use all processing time
326          SetTaskPri(MainTask, -1);
327  
328 <        WriteMacInt32(MacsBugFlags, 0);
328 >        WriteMacInt32(0xbff, 0);        // MacsBugFlags
329  
330          // Swap stack to Mac RAM area
331          stack_swap.stk_Lower = RAMBaseHost;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines