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

Comparing BasiliskII/src/powerrom_cpu/powerrom_cpu.cpp (file contents):
Revision 1.1.1.1 by cebix, 1999-10-03T14:16:26Z vs.
Revision 1.11 by gbeauche, 2008-01-01T09:40:35Z

# Line 1 | Line 1
1   /*
2 < *  pwoerrom_cpu.cpp - Using the 680x0 emulator in PowerMac ROMs for Basilisk II
2 > *  powerrom_cpu.cpp - Using the 680x0 emulator in PowerMac ROMs for Basilisk II
3   *
4 < *  Basilisk II (C) 1997-1999 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
8 > *  the Free Software Foundation; either version 2 of the License, or
9 > *  (at your option) any later version.
10 > *
11 > *  This program is distributed in the hope that it will be useful,
12 > *  but WITHOUT ANY WARRANTY; without even the implied warranty of
13 > *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 > *  GNU General Public License for more details.
15 > *
16 > *  You should have received a copy of the GNU General Public License
17 > *  along with this program; if not, write to the Free Software
18 > *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19   */
20  
21   #include <unistd.h>
# Line 17 | Line 31
31   #include "main.h"
32   #include "emul_op.h"
33   #include "prefs.h"
34 + #include "timer.h"
35   #include "user_strings.h"
36  
37   #include "sheep_driver.h"
# Line 794 | Line 809 | bool Init680x0(void)
809          try {
810                  load_rom();
811          } catch (file_open_error) {
812 <                ErrorAlert(GetString(STR_NO_ROM_FILE_ERR));
812 >                ErrorAlert(STR_NO_ROM_FILE_ERR);
813                  return false;
814          } catch (file_read_error) {
815 <                ErrorAlert(GetString(STR_ROM_FILE_READ_ERR));
815 >                ErrorAlert(STR_ROM_FILE_READ_ERR);
816                  return false;
817          } catch (rom_size_error) {
818 <                ErrorAlert(GetString(STR_ROM_SIZE_ERR));
818 >                ErrorAlert(STR_ROM_SIZE_ERR);
819                  return false;
820          }
821  
# Line 1224 | Line 1239 | void Start680x0(void)
1239  
1240   void TriggerInterrupt(void)
1241   {
1242 +        idle_resume();
1243          if (emul_thread > 0 && ReadyForSignals)
1244                  send_signal(emul_thread, SIGUSR1);
1245   }
1246  
1247 + void TriggerNMI(void)
1248 + {
1249 +        //!! not implemented yet
1250 + }
1251 +
1252  
1253   /*
1254   *  Execute 68k subroutine

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines