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

Comparing BasiliskII/src/include/main.h (file contents):
Revision 1.3 by cebix, 2000-04-10T18:53:33Z vs.
Revision 1.8 by cebix, 2001-06-30T17:21:55Z

# Line 1 | Line 1
1   /*
2   *  main.h - General definitions
3   *
4 < *  Basilisk II (C) 1997-2000 Christian Bauer
4 > *  Basilisk II (C) 1997-2001 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 46 | Line 46 | extern void ExitAll(void);
46   extern void FlushCodeCache(void *start, uint32 size);   // Code was patched, flush caches if neccessary
47   extern void QuitEmulator(void);                                                 // Quit emulator
48   extern void ErrorAlert(const char *text);                               // Display error alert
49 + extern void ErrorAlert(int string_id);
50   extern void WarningAlert(const char *text);                             // Display warning alert
51 + extern void WarningAlert(int string_id);
52   extern bool ChoiceAlert(const char *text, const char *pos, const char *neg);    // Display choice alert
53  
54   // Interrupt flags
55   enum {
56 <        INTFLAG_60HZ = 1,       // 60Hz VBL
57 <        INTFLAG_SERIAL = 2,     // Serial driver
58 <        INTFLAG_ETHER = 4,      // Ethernet driver
59 <        INTFLAG_AUDIO = 8,      // Audio block read
60 <        INTFLAG_TIMER = 16      // Time Manager
56 >        INTFLAG_60HZ = 1,       // 60.15Hz VBL
57 >        INTFLAG_1HZ = 2,        // ~1Hz interrupt
58 >        INTFLAG_SERIAL = 4,     // Serial driver
59 >        INTFLAG_ETHER = 8,      // Ethernet driver
60 >        INTFLAG_AUDIO = 16,     // Audio block read
61 >        INTFLAG_TIMER = 32,     // Time Manager
62 >        INTFLAG_NMI = 64        // NMI
63   };
64  
65   extern uint32 InterruptFlags;                                                                   // Currently pending interrupts

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines