Attachment #87201 for bug #133958

View | Details | Raw Unified | Return to bug 133958
Collapse All | Expand All

Lines 267-273 Link Here

(-)e-uae-0.8.27-orig/src/autoconf.c (-1 / +1 lines)
267		267
268	/* ROM tag area memory access */	268	/* ROM tag area memory access */
269		269
270	static uae_u8 *rtarea;	270	uae_u8 *rtarea;
271		271
272	static uae_u32 rtarea_lget (uaecptr) REGPARAM;	272	static uae_u32 rtarea_lget (uaecptr) REGPARAM;
273	static uae_u32 rtarea_wget (uaecptr) REGPARAM;	273	static uae_u32 rtarea_wget (uaecptr) REGPARAM;

Lines 14-20 Link Here

(-)e-uae-0.8.27-orig/src/blkdev.c (-1 / +1 lines)
14		14
15	#include "blkdev.h"	15	#include "blkdev.h"
16		16
17	static struct device_functions *device_func[2];	17	struct device_functions *device_func[2];
18	static int have_ioctl;	18	static int have_ioctl;
19		19
20	#ifdef WIN32	20	#ifdef WIN32




static unsigned int clock_control_e = 0;
static unsigned int clock_control_f = RTC_F_24_12;

unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;
unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;

/* Values of the CIA timers.  */
unsigned long ciaata, ciaatb, ciabta, ciabtb;
/* Computed by compute_passed_time.  */
unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed;

unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;
int ciaatlatch, ciabtlatch;
static int oldled, oldovl;

unsigned int ciabpra;

Lines 172-178 Link Here

(-)e-uae-0.8.27-orig/src/custom.c (-2 / +2 lines)
172	#endif	172	#endif
173	static int sprite_last_drawn_at[MAX_SPRITES];	173	static int sprite_last_drawn_at[MAX_SPRITES];
174	static int last_sprite_point, nr_armed;	174	static int last_sprite_point, nr_armed;
175	static int sprite_width, sprres, sprite_buffer_res;	175	int sprite_width, sprres, sprite_buffer_res;
176		176
177	#ifdef CPUEMU_6	177	#ifdef CPUEMU_6
178	uae_u8 cycle_line[256];	178	uae_u8 cycle_line[256];
Lines 332-338 Link Here
332	struct draw_info line_drawinfo[2][2 * (MAXVPOS + 1) + 1];	332	struct draw_info line_drawinfo[2][2 * (MAXVPOS + 1) + 1];
333	struct color_entry color_tables[2][(MAXVPOS + 1) * 2];	333	struct color_entry color_tables[2][(MAXVPOS + 1) * 2];
334		334
335	static int next_sprite_entry = 0;	335	int next_sprite_entry = 0;
336	static int prev_next_sprite_entry;	336	static int prev_next_sprite_entry;
337	static int next_sprite_forced = 1;	337	static int next_sprite_forced = 1;
338		338

Lines 9-14 Link Here

(-)e-uae-0.8.27-orig/src/include/hotkeys.h (+4 lines)
9	* in x11win.c and sdlgfx.c	9	* in x11win.c and sdlgfx.c
10	*/	10	*/
11		11
		12	#ifndef _GCC41_FIX_HOTKEYS_H
		13	#define _GCC41_FIX_HOTKEYS_H
12		14
13	/* Maximum number of keys in a sequence */	15	/* Maximum number of keys in a sequence */
14	#define HOTKEYSEQ_MAXKEYS 4	16	#define HOTKEYSEQ_MAXKEYS 4
Lines 37-39 Link Here
37	{	39	{
38	handle_input_event (event, state, 0, 0);	40	handle_input_event (event, state, 0, 0);
39	}	41	}
		42
		43	#endif

Lines 1779-1785 Link Here

(-)e-uae-0.8.27-orig/src/inputdevice.c (-1 / +1 lines)
1779	return 0;	1779	return 0;
1780	}	1780	}
1781		1781
1782	static struct inputdevice_functions idev[3];	1782	struct inputdevice_functions idev[3];
1783		1783
1784	void inputdevice_init (void)	1784	void inputdevice_init (void)
1785	{	1785	{

Lines 6-10 Link Here

(-)e-uae-0.8.27-orig/src/keymap/beos_rawkeys.h (+2 lines)
6	* Copyright 2004 Richard Drummond	6	* Copyright 2004 Richard Drummond
7	*/	7	*/
8		8
		9	#include "hotkeys.h"
		10
9	extern const struct uaekey_hostmap beos_keymap[];	11	extern const struct uaekey_hostmap beos_keymap[];
10	extern struct uae_hotkeyseq beos_hotkeys[];	12	extern struct uae_hotkeyseq beos_hotkeys[];

Lines 7-12 Link Here

(-)e-uae-0.8.27-orig/src/keymap/x11pc_rawkeys.h (+2 lines)
7	* Copyright 2004 Richard Drummond	7	* Copyright 2004 Richard Drummond
8	*/	8	*/
9		9
		10	#include "hotkeys.h"
		11
10	extern const struct uaekey_hostmap x11pc_keymap[];	12	extern const struct uaekey_hostmap x11pc_keymap[];
11	extern struct uae_hotkeyseq x11pc_hotkeys[];	13	extern struct uae_hotkeyseq x11pc_hotkeys[];
12	#if 0	14	#if 0




#ifdef JIT
int        have_done_picasso       = 0;         /* For the JIT compiler */
# ifdef PICASSO96
int picasso_is_special      = PIC_WRITE; /* ditto */
int picasso_is_special_read = PIC_READ;  /* ditto */
# endif
#endif

#ifdef PICASSO96

int p96syncrate;
int p96hsync_counter;

int p96hack_vpos, p96hack_vpos2, p96refresh_active;

Return to bug 133958

Lines 47-60 Link Here

(-)e-uae-0.8.27-orig/src/picasso96.c (-3 / +3 lines)
47	#ifdef JIT	47	#ifdef JIT
48	int have_done_picasso = 0; /* For the JIT compiler */	48	int have_done_picasso = 0; /* For the JIT compiler */
49	# ifdef PICASSO96	49	# ifdef PICASSO96
50	static int picasso_is_special = PIC_WRITE; /* ditto */	50	int picasso_is_special = PIC_WRITE; /* ditto */
51	static int picasso_is_special_read = PIC_READ; /* ditto */	51	int picasso_is_special_read = PIC_READ; /* ditto */
52	# endif	52	# endif
53	#endif	53	#endif
54		54
55	#ifdef PICASSO96	55	#ifdef PICASSO96
56		56
57	static int p96syncrate;	57	int p96syncrate;
58	int p96hsync_counter;	58	int p96hsync_counter;
59		59
60	int p96hack_vpos, p96hack_vpos2, p96refresh_active;	60	int p96hack_vpos, p96hack_vpos2, p96refresh_active;

Lines 58-73 Link Here

(-)e-uae-0.8.27-orig/src/cia.c (-6 / +6 lines)
58	static unsigned int clock_control_e = 0;	58	static unsigned int clock_control_e = 0;
59	static unsigned int clock_control_f = RTC_F_24_12;	59	static unsigned int clock_control_f = RTC_F_24_12;
60		60
61	static unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;	61	unsigned int ciaaicr, ciaaimask, ciabicr, ciabimask;
62	static unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;	62	unsigned int ciaacra, ciaacrb, ciabcra, ciabcrb;
63		63
64	/* Values of the CIA timers. */	64	/* Values of the CIA timers. */
65	static unsigned long ciaata, ciaatb, ciabta, ciabtb;	65	unsigned long ciaata, ciaatb, ciabta, ciabtb;
66	/* Computed by compute_passed_time. */	66	/* Computed by compute_passed_time. */
67	static unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed;	67	unsigned long ciaata_passed, ciaatb_passed, ciabta_passed, ciabtb_passed;
68		68
69	static unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;	69	unsigned long ciaatod, ciabtod, ciaatol, ciabtol, ciaaalarm, ciabalarm;
70	static int ciaatlatch, ciabtlatch;	70	int ciaatlatch, ciabtlatch;
71	static int oldled, oldovl;	71	static int oldled, oldovl;
72		72
73	unsigned int ciabpra;	73	unsigned int ciabpra;