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

Comparing BasiliskII/src/uae_cpu/basilisk_glue.cpp (file contents):
Revision 1.17 by gbeauche, 2005-01-30T21:42:16Z vs.
Revision 1.20 by gbeauche, 2008-01-01T09:40:35Z

# Line 1 | Line 1
1   /*
2   *  basilisk_glue.cpp - Glue UAE CPU to Basilisk II CPU engine interface
3   *
4 < *  Basilisk II (C) 1997-2005 Christian Bauer
4 > *  Basilisk II (C) 1997-2008 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 25 | Line 25
25   #include "prefs.h"
26   #include "emul_op.h"
27   #include "rom_patches.h"
28 + #include "timer.h"
29   #include "m68k.h"
30   #include "memory.h"
31   #include "readcpu.h"
# Line 67 | Line 68 | bool Init680x0(void)
68   {
69   #if REAL_ADDRESSING
70          // Mac address space = host address space
71 <        RAMBaseMac = (uint32)RAMBaseHost;
72 <        ROMBaseMac = (uint32)ROMBaseHost;
71 >        RAMBaseMac = (uintptr)RAMBaseHost;
72 >        ROMBaseMac = (uintptr)ROMBaseHost;
73   #elif DIRECT_ADDRESSING
74          // Mac address space = host address space minus constant offset (MEMBaseDiff)
75          // NOTE: MEMBaseDiff is set up in main_unix.cpp/main()
# Line 152 | Line 153 | void Start680x0(void)
153  
154   void TriggerInterrupt(void)
155   {
156 +        idle_resume();
157          SPCFLAGS_SET( SPCFLAG_INT );
158   }
159  

Diff Legend

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