ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/main_unix.cpp

Comparing BasiliskII/src/Unix/main_unix.cpp (file contents):
Revision 1.12 by cebix, 2000-07-13T13:47:10Z vs.
Revision 1.15 by cebix, 2000-07-22T16:07:20Z

#	Line 75 | Line 75 | struct sigstate {
75		# include "mon.h"
76		#endif
77
78	<	#define DEBUG 1
78	>	#define DEBUG 0
79		#include "debug.h"
80
81
#	Line 104 | Line 104 | bool TwentyFourBitAddressing;
104
105
106		// Global variables
107	<	static char *x_display_name = NULL;                                     // X11 display name
107	>	char *x_display_name = NULL;                                            // X11 display name
108		Display *x_display = NULL;                                                      // X11 display handle
109
110		static int zero_fd = -1;                                                        // FD of /dev/zero
111	–	static bool lm_area_mapped = false;                                     // Flag: Low Memory area mmap()ped
111		static uint8 last_xpram[256];                                           // Buffer for monitoring XPRAM changes
112
113		#ifdef HAVE_PTHREADS
#	Line 149 | Line 148 | static struct sigaction sigint_sa;     // si
148		static void sigint_handler(...);
149		#endif
150
151	+	#if REAL_ADDRESSING
152	+	static bool lm_area_mapped = false;     // Flag: Low Memory area mmap()ped
153	+	#endif
154	+
155		#ifdef USE_MAPPED_MEMORY
156		extern char *address_space, *good_address_map;
157		#endif
#	Line 708 | Line 711 | static void one_second(void)
711		// Pseudo Mac 1Hz interrupt, update local time
712		WriteMacInt32(0x20c, TimerDateTime());
713
714	+	SetInterruptFlag(INTFLAG_60HZ);
715	+	TriggerInterrupt();
716	+
717		#ifndef HAVE_PTHREADS
718		static int second_counter = 0;
719		if (++second_counter > 60) {

Diff Legend

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