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.5 by jlachmann, 2000-08-20T14:08:44Z vs.
Revision 1.10 by cebix, 2001-07-09T11:22:01Z

# 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 + // Mutexes (non-recursive)
55 + struct B2_mutex;
56 + extern B2_mutex *B2_create_mutex(void);
57 + extern void B2_lock_mutex(B2_mutex *mutex);
58 + extern void B2_unlock_mutex(B2_mutex *mutex);
59 + extern void B2_delete_mutex(B2_mutex *mutex);
60 +
61   // Interrupt flags
62   enum {
63          INTFLAG_60HZ = 1,       // 60.15Hz VBL
# Line 57 | Line 66 | enum {
66          INTFLAG_ETHER = 8,      // Ethernet driver
67          INTFLAG_AUDIO = 16,     // Audio block read
68          INTFLAG_TIMER = 32,     // Time Manager
69 <        INTFLAG_NMI = 64        // NMI
69 >        INTFLAG_ADB = 64,       // ADB
70 >        INTFLAG_NMI = 128       // NMI
71   };
72  
73   extern uint32 InterruptFlags;                                                                   // Currently pending interrupts
74   extern void SetInterruptFlag(uint32 flag);                                              // Set/clear interrupt flags
75   extern void ClearInterruptFlag(uint32 flag);
66 extern void TriggerNMI(void);
76  
77   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines