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.10 by cebix, 2000-09-04T16:30:47Z vs.
Revision 1.11 by gbeauche, 2000-09-22T17:22:40Z

# Line 97 | 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 228 | 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();

Diff Legend

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