ViewVC Help

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

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

Comparing BasiliskII/src/Unix/video_x.cpp (file contents):
Revision 1.71 by gbeauche, 2004-06-23T14:30:48Z vs.
Revision 1.72 by gbeauche, 2004-11-08T21:07:07Z

#	Line 192 | Line 192 | static void *redraw_func(void *arg);
192		// From main_unix.cpp
193		extern char *x_display_name;
194		extern Display *x_display;
195	+	extern void *vm_acquire_mac(size_t size);
196
197		// From sys_unix.cpp
198		extern void SysMountFirstFloppy(void);
#	Line 730 | Line 731 | driver_window::driver_window(X11_monitor
731		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
732		the_host_buffer = the_buffer_copy;
733		the_buffer_size = page_extend((aligned_height + 2) * img->bytes_per_line);
734	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
734	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
735		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
736		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
737		#else
#	Line 1126 | Line 1127 | driver_fbdev::driver_fbdev(X11_monitor_d
1127		the_host_buffer = the_buffer;
1128		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1129		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1130	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1130	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1131		}
1132		#else
1133		use_vosf = false;
#	Line 1266 | Line 1267 | driver_xf86dga::driver_xf86dga(X11_monit
1267		the_host_buffer = the_buffer;
1268		the_buffer_size = page_extend((height + 2) * bytes_per_row);
1269		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
1270	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
1270	>	the_buffer = (uint8 *)vm_acquire_mac(the_buffer_size);
1271		}
1272		#else
1273		use_vosf = false;

Diff Legend

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