puae 2.3.2

src/audio.c

@@ -1144,11 +1144,11 @@ extern unsigned int have_sound;
 extern float sampler_evtime;
 #endif
 
-void update_sound (int freq, int longframe, int linetoggle)
+void update_sound (double freq, int longframe, int linetoggle)
 {
 	static int lastfreq;
-	float lines = 0;
-	float hpos;
+	double lines = 0;
+	double hpos;
 
 	if (freq < 0)
 		freq = lastfreq;
@@ -1169,7 +1169,7 @@ void update_sound (int freq, int longframe, int linetoggle)
 	}
 	lines += maxvpos_nom;
 
-	scaled_sample_evtime = hpos * lines * freq * CYCLE_UNIT / (float)obtainedfreq;
+	scaled_sample_evtime = hpos * lines * freq * CYCLE_UNIT / (double)obtainedfreq;
 #ifdef SAMPLER
 	sampler_evtime = hpos * lines * freq * CYCLE_UNIT;
 #endif

src/blitter.c

@@ -1420,6 +1420,12 @@ void maybe_blit (int hpos, int hack)
 	if (savestate_state)
 		return;
 
+	if (dmaen (DMA_BLITTER) && (currprefs.waiting_blits || currprefs.m68k_speed < 0)) {
+		while (bltstate != BLT_done && dmaen (DMA_BLITTER)) {
+			x_do_cycles (8 * CYCLE_UNIT);
+		}
+	}
+
 	if (warned && dmaen (DMA_BLITTER) && blt_info.got_cycle) {
 		warned--;
 		write_log ("program does not wait for blitter tc=%d\n",

src/cia.c

@@ -501,7 +501,7 @@ static void do_tod_hack (int dotod)
 	}
 
 	if (currprefs.cs_ciaatod == 0)
-		rate = vblank_hz;
+		rate = (int)(vblank_hz + 0.5);
 	else if (currprefs.cs_ciaatod == 1)
 		rate = 50;
 	else

src/cpummu.c

@@ -320,8 +320,7 @@ static void mmu_bus_error(uaecptr addr, int fc, bool write, int size)
 /*
  * Update the atc line for a given address by doing a mmu lookup.
  */
-static uaecptr mmu_fill_atc_l2(uaecptr addr, bool super, bool data, bool write,
-							   struct mmu_atc_line *l)
+static uaecptr mmu_fill_atc_l2(uaecptr addr, bool super, bool data, bool write, struct mmu_atc_line *l)
 {
 	int res;
 	uae_u32 desc;

src/custom.c

@@ -170,12 +170,13 @@ int hsyncendpos, hsyncstartpos;
 static int maxvpos_total = 511;
 int minfirstline = VBLANK_ENDLINE_PAL;
 int equ_vblank_endline = EQU_ENDLINE_PAL;
-int vblank_hz = VBLANK_HZ_PAL, fake_vblank_hz, vblank_skip, doublescan;
+double vblank_hz = VBLANK_HZ_PAL, fake_vblank_hz, vblank_hz_stored;
+int vblank_skip, doublescan;
 frame_time_t syncbase;
 static int fmode;
 uae_u16 beamcon0, new_beamcon0;
 uae_u16 vtotal = MAXVPOS_PAL, htotal = MAXHPOS_PAL;
-static int maxvpos_stored, maxhpos_stored, vblank_hz_stored;
+static int maxvpos_stored, maxhpos_stored;
 static uae_u16 hsstop, hbstrt, hbstop, vsstop, vbstrt, vbstop, hsstrt, vsstrt, hcenter;
 static int ciavsyncmode;
 static int diw_hstrt, diw_hstop;
@@ -246,7 +247,7 @@ enum diw_states
 	DIW_waiting_start, DIW_waiting_stop
 };
 
-static int plffirstline, plflastline;
+int plffirstline, plflastline;
 int plffirstline_total, plflastline_total;
 static int autoscale_bordercolors;
 static int plfstrt_start, plfstrt, plfstop;
@@ -2686,7 +2687,7 @@ int vsynctime_orig;
 void compute_vsynctime (void)
 {
 	fake_vblank_hz = 0;
-	if (currprefs.chipset_refreshrate) {
+	if (abs (currprefs.chipset_refreshrate) > 0.1) {
 		vblank_hz = currprefs.chipset_refreshrate;
 		if (isvsync ()) {
 			vblank_skip = 1;
@@ -2737,7 +2738,7 @@ void init_hz (bool fullinit)
 {
 	int isntsc;
 	int odbl = doublescan, omaxvpos = maxvpos;
-	int ovblank = vblank_hz;
+	double ovblank = vblank_hz;
 	int hzc = 0;
 
 	if (fullinit)
@@ -2746,9 +2747,9 @@ void init_hz (bool fullinit)
 	if (vsync_switchmode (-1, 0))
 		currprefs.gfx_avsync = changed_prefs.gfx_avsync = vsync_switchmode (-1, 0) ? 2 : 0;
 
-	if (!isvsync () && ((currprefs.chipset_refreshrate == 50 && !currprefs.ntscmode) ||
-		(currprefs.chipset_refreshrate == 60 && currprefs.ntscmode))) {
-			currprefs.chipset_refreshrate = changed_prefs.chipset_refreshrate = 0;
+	if (!isvsync () && (DBLEQU (currprefs.chipset_refreshrate, 50) && !currprefs.ntscmode) ||
+		(DBLEQU (currprefs.chipset_refreshrate, 60) && currprefs.ntscmode)) {
+			currprefs.chipset_refreshrate = changed_prefs.chipset_refreshrate = 0.0;
 	}
 
 	doublescan = 0;
@@ -2782,7 +2783,7 @@ void init_hz (bool fullinit)
 		// we come here if vpos_count != maxvpos (someone poked VPOSW)
 		if (vpos_count < 10)
 			vpos_count = 10;
-		vblank_hz = (15600 + vpos_count - 1) / vpos_count;
+		vblank_hz = (isntsc ? 15734 : 15625.0) / vpos_count;
 		maxvpos_nom = vpos_count - (lof_current ? 1 : 0);
 		reset_drawing ();
 	}
@@ -2794,7 +2795,7 @@ void init_hz (bool fullinit)
 		if (htotal >= MAXHPOS)
 			htotal = MAXHPOS - 1;
 		maxhpos = htotal + 1;
-		vblank_hz = 227 * 312 * 50 / (maxvpos * maxhpos);
+		vblank_hz = 227.0 * 312.0 * 50.0 / (maxvpos * maxhpos);
 		minfirstline = vsstop;
 		if (minfirstline < 2)
 			minfirstline = 2;
@@ -2839,7 +2840,7 @@ void init_hz (bool fullinit)
 		interlace_seen = (bplcon0 & 4) ? 1 : 0;
 		reset_drawing ();
 	}
-	if ((vblank_hz == 50 || vblank_hz == 60) && isvsync () == 2) {
+	if ((DBLEQU (vblank_hz, 50) || DBLEQU (vblank_hz, 60)) && isvsync () == 2) {
 		if (getvsyncrate (currprefs.gfx_refreshrate) != vblank_hz)
 			vsync_switchmode (vblank_hz, currprefs.gfx_refreshrate);
 	}
@@ -2869,7 +2870,7 @@ void init_hz (bool fullinit)
 	}
 
 	//inputdevice_tablet_strobe ();
-	write_log ("%s mode%s%s V=%dHz H=%dHz (%dx%d+%d)\n",
+	write_log ("%s mode%s%s V=%.4fHz H=%0.4fHz (%dx%d+%d)\n",
 		isntsc ? "NTSC" : "PAL",
 		(bplcon0 & 4) ? " interlaced" : "",
 		doublescan > 0 ? " dblscan" : "",

src/debug.c

@@ -1784,8 +1784,6 @@ static int memwatch_func (uaecptr addr, int rwi, int size, uae_u32 *valp)
 			continue;
 		if (!(rwi & rwi2))
 			continue;
-		if (addr == 0x100)
-			write_log("*\n");
 		if (addr >= addr2 && addr < addr3)
 			brk = 1;
 		if (!brk && size == 2 && (addr + 1 >= addr2 && addr + 1 < addr3))

src/disk.c

@@ -113,6 +113,7 @@ static unsigned long dsksync_cycles;
 /* Always carried through to the next line.  */
 int disk_hpos;
 static int disk_jitter;
+static int indexdecay;
 
 static uae_u8 prev_data;
 static int prev_step;
@@ -2436,14 +2437,14 @@ static TCHAR *tobin (uae_u8 v)
 void DISK_select_set (uae_u8 data)
 {
 	prev_data = data;
-	prev_step = 0;
+	prev_step = data & 1;
 }
 
 void DISK_select (uae_u8 data)
 {
 	unsigned int step_pulse, prev_selected, dr;
-	static uae_u8 prev_data;
-	static unsigned int prev_step;
+//	static uae_u8 prev_data;
+//	static unsigned int prev_step;
 
 	prev_selected = selected;
 
@@ -2694,9 +2695,13 @@ void DISK_handler (uae_u32 data)
 		fetchnextrevolution (&floppy[3]);
 	if (flag & DISK_WORDSYNC)
 		INTREQ (0x8000 | 0x1000);
-	if (flag & DISK_INDEXSYNC)
+	if (flag & DISK_INDEXSYNC) {
+		if (!indexdecay) {
+			indexdecay = 2;
 		cia_diskindex ();
 }
+	}
+}
 
 static void disk_doupdate_write (drive * drv, int floppybits)
 {
@@ -2805,7 +2810,6 @@ static void disk_doupdate_predict (int startcycle)
 		uae_u32 tword = word;
 		int countcycle = startcycle + (drv->floppybitcounter % drv->trackspeed);
 		int mfmpos = drv->mfmpos;
-		int indexhack = drv->indexhack;
 		while (countcycle < (maxhpos << 8)) {
 			if (drv->tracktiming[0])
 				updatetrackspeed (drv, mfmpos);
@@ -2824,10 +2828,8 @@ static void disk_doupdate_predict (int startcycle)
 			mfmpos %= drv->tracklen;
 			if (mfmpos == 0)
 				diskevent_flag |= DISK_REVOLUTION << (drv - floppy);
-			if (mfmpos == drv->indexoffset) {
+			if (mfmpos == drv->indexoffset)
 				diskevent_flag |= DISK_INDEXSYNC;
-				indexhack = 0;
-			}
 			if (dskdmaen != 3 && mfmpos == drv->skipoffset) {
 				update_jitter ();
 				int skipcnt = disk_jitter;
@@ -2836,10 +2838,8 @@ static void disk_doupdate_predict (int startcycle)
 					mfmpos %= drv->tracklen;
 					if (mfmpos == 0)
 						diskevent_flag |= DISK_REVOLUTION << (drv - floppy);
-					if (mfmpos == drv->indexoffset) {
+					if (mfmpos == drv->indexoffset)
 						diskevent_flag |= DISK_INDEXSYNC;
-						indexhack = 0;
-					}
 				}
 			}
 			if (diskevent_flag)
@@ -3063,6 +3063,8 @@ void DISK_hsync (void)
 		if (drv->steplimit)
 			drv->steplimit--;
 	}
+	if (indexdecay)
+		indexdecay--;
 	if (linecounter) {
 		linecounter--;
 		if (! linecounter)

src/drawing.c

@@ -1823,6 +1823,7 @@ static void pfield_expand_dp_bplcon (void)
 		frame_res = bplres;
 	if (bplres > 0)
 		can_use_lores = 0;
+	frame_res_lace = (dp_for_drawing->bplcon0 & 4) != 0;
 
 	plf1pri = dp_for_drawing->bplcon2 & 7;
 	plf2pri = (dp_for_drawing->bplcon2 >> 3) & 7;
@@ -2775,7 +2776,6 @@ void notice_interlace_seen (void)
 	if (interlace_seen == 0)
 		frame_redraw_necessary = 2;
 	interlace_seen = 1;
-	frame_res_lace = 1;
 }
 
 void reset_drawing (void)

src/filesys.c

@@ -2318,7 +2318,6 @@ static void free_key (Unit *unit, Key *k)
 	}
 
 	struct lockrecord *lr;
-
 	for (lr = k->record; lr;) {
 		struct lockrecord *next = lr->next;
 		xfree (lr);
@@ -3164,7 +3163,6 @@ static void action_free_record (Unit *unit, dpacket packet)
 
 	struct lockrecord *prev = NULL;
 	struct lockrecord *lr;
-
 	for (lr = k->record; lr; lr = lr->next) {
 		if (lr->pos == pos && lr->len == len) {
 			if (prev)
@@ -4626,7 +4624,7 @@ static void
 	if (err == 0 && SetFileDate (a->nname, (struct DateStamp *) date) == DOSFALSE)
 		err = IoErr ();
 #else
-	ut.actime = ut.modtime = put_time (get_long (date), get_long (date + 4),get_long (date + 8));
+	ut.actime = ut.modtime = put_time (get_long (date), get_long (date + 4), get_long (date + 8));
 	a = find_aino (unit, lock, bstr (unit, name), &err);
 	if (err == 0 && utime (a->nname, &ut) == -1)
 		err = dos_errno ();
@@ -5355,7 +5353,6 @@ void filesys_free_handles (void)
 		u->keys = NULL;
 		struct lockrecord *lrnext;
 		struct lockrecord *lr;
-
 		for (lr = u->waitingrecords; lr; lr = lrnext) {
 			lrnext = lr->next;
 			xfree (lr);

src/gencpu.c

@@ -2111,9 +2111,10 @@ static void gen_opcode (unsigned long int opcode)
 	case i_RESET:
 		fill_prefetch_next ();
 		printf ("\tcpureset ();\n");
+		sync_m68k_pc ();
 		addcycles000 (128);
 		if (using_prefetch) {
-			printf ("\tregs.irc = %s (4);\n", srcwi);
+			printf ("\t%s (2);\n", prefetch_word);
 			m68k_pc_offset = 0;
 		}
 		break;

src/gfx-sdl/Makefile.am

@@ -4,6 +4,6 @@ AM_CFLAGS    = @UAE_CFLAGS@
 
 noinst_LIBRARIES = libgfxdep.a
 
-libgfxdep_a_SOURCES = sdlgfx.c sdlkeys.c rawkeys.c
+libgfxdep_a_SOURCES = sdlgfx.c sdlkeys.c sdlkeys_dik.c rawkeys.c
 
 noinst_HEADERS = gfx.h sdlgfx.h

src/gfx-sdl/sdlkeys.c

@@ -360,138 +360,9 @@ static int decode_tr (int keysym)
     }
 }
 
-int sdlk2dik (int keysym) {
-    switch (keysym) {
-	case SDLK_ESCAPE: 	return DIK_ESCAPE;
-//
-	case SDLK_1:		return DIK_1;
-	case SDLK_2:		return DIK_2;
-	case SDLK_3:		return DIK_3;
-	case SDLK_4:		return DIK_4;
-	case SDLK_5:		return DIK_5;
-	case SDLK_6:		return DIK_6;
-	case SDLK_7:		return DIK_7;
-	case SDLK_8:		return DIK_8;
-	case SDLK_9:		return DIK_9;
-	case SDLK_0:		return DIK_0;
-	case SDLK_MINUS:	return DIK_MINUS;	//?*
-	case SDLK_EQUALS:	return DIK_EQUALS;	//-_
-	case SDLK_BACKSPACE:	return DIK_BACK;
-//
-	case SDLK_TAB: 		return DIK_TAB;
-	case SDLK_q:		return DIK_Q;
-	case SDLK_w:		return DIK_W;
-	case SDLK_e:		return DIK_E;
-	case SDLK_r:		return DIK_R;
-	case SDLK_t:		return DIK_T;
-	case SDLK_y:		return DIK_Y;
-	case SDLK_u:		return DIK_U;
-	case SDLK_i:		return DIK_I;
-	case SDLK_o:		return DIK_O;
-	case SDLK_p:		return DIK_P;
-	case SDLK_LEFTBRACKET:	return DIK_LBRACKET;	//tr kbd g
-	case SDLK_RIGHTBRACKET:	return DIK_RBRACKET;	//tr kbd u
-
-	case SDLK_RETURN: 	return DIK_RETURN;
-	case SDLK_LCTRL: 	return DIK_LCONTROL;
-//
-	case SDLK_a:		return DIK_A;
-	case SDLK_s:		return DIK_S;
-	case SDLK_d:		return DIK_D;
-	case SDLK_f:		return DIK_F;
-	case SDLK_g:		return DIK_G;
-	case SDLK_h:		return DIK_H;
-	case SDLK_j:		return DIK_J;
-	case SDLK_k:		return DIK_K;
-	case SDLK_l:		return DIK_L;
-
-	case SDLK_SEMICOLON:	return DIK_SEMICOLON;	//tr kbd s
-	case SDLK_QUOTE:	return DIK_APOSTROPHE;	//tr kbd i
-//	case SDLK_		return DIK_GRAVE;	//tr kdb ;,
-	case SDLK_LSHIFT: 	return DIK_LSHIFT;
-//
-	case SDLK_z:		return DIK_Z;
-	case SDLK_x:		return DIK_X;
-	case SDLK_c:		return DIK_C;
-	case SDLK_v:		return DIK_V;
-	case SDLK_b:		return DIK_B;
-	case SDLK_n:		return DIK_N;
-	case SDLK_m:		return DIK_M;
-
-	case SDLK_COMMA:	return DIK_COMMA;	//tr kbd o
-	case SDLK_PERIOD:	return DIK_PERIOD;	//tr kbd c
-	case SDLK_SLASH:	return DIK_SLASH;	//tr kbd .
-	case SDLK_RSHIFT: 	return DIK_RSHIFT;
-	case SDLK_SPACE: 	return DIK_SPACE;
-//
-	case SDLK_F1: 		return DIK_F1;
-	case SDLK_F2: 		return DIK_F2;
-	case SDLK_F3: 		return DIK_F3;
-	case SDLK_F4: 		return DIK_F4;
-	case SDLK_F5: 		return DIK_F5;
-	case SDLK_F6: 		return DIK_F6;
-	case SDLK_F7: 		return DIK_F7;
-	case SDLK_F8: 		return DIK_F8;
-	case SDLK_F9: 		return DIK_F9;
-	case SDLK_F10: 		return DIK_F10;
-	case SDLK_F11: 		return DIK_F11;
-	case SDLK_F12: 		return DIK_F12;
-	case SDLK_F13: 		return DIK_F13;
-	case SDLK_F14: 		return DIK_F14;
-	case SDLK_F15: 		return DIK_F15;
-	case SDLK_NUMLOCK:	return DIK_NUMLOCK;
-//	case SDLK_CAPSLOCK:	return DIK_CAPSLOCK;
-	case SDLK_CAPSLOCK:	return DIK_CAPITAL;
-	case SDLK_SCROLLOCK:	return DIK_SCROLL;
-//
-	case SDLK_KP7:		return DIK_NUMPAD7;
-	case SDLK_KP8:		return DIK_NUMPAD8;
-	case SDLK_KP9:		return DIK_NUMPAD9;
-	case SDLK_KP_MINUS:	return DIK_SUBTRACT;
-	case SDLK_KP4:		return DIK_NUMPAD4;
-	case SDLK_KP5:		return DIK_NUMPAD5;
-	case SDLK_KP6:		return DIK_NUMPAD6;
-	case SDLK_KP_PLUS:	return DIK_ADD;
-	case SDLK_KP1:		return DIK_NUMPAD1;
-	case SDLK_KP2:		return DIK_NUMPAD2;
-	case SDLK_KP3:		return DIK_NUMPAD3;
-	case SDLK_KP0:		return DIK_NUMPAD0;
-	case SDLK_KP_PERIOD:	return DIK_DECIMAL;
-	case SDLK_KP_ENTER:	return DIK_NUMPADENTER;
-	case SDLK_KP_DIVIDE:	return DIK_DIVIDE;
-	case SDLK_KP_MULTIPLY:	return DIK_MULTIPLY;
-	case SDLK_KP_EQUALS:	return DIK_NUMPADEQUALS;
-
-	case SDLK_DELETE: 	return DIK_DELETE;
-	case SDLK_RCTRL: 	return DIK_RCONTROL;
-	case SDLK_LALT: 	return DIK_LMENU;
-	case SDLK_RALT: 	return DIK_RMENU;
-
-	case SDLK_INSERT: 	return DIK_INSERT;
-	case SDLK_HOME: 	return DIK_HOME;
-	case SDLK_END: 		return DIK_END;
-
-	case SDLK_UP: 		return DIK_UP;
-	case SDLK_PAGEUP:	return DIK_PRIOR;
-	case SDLK_LEFT: 	return DIK_LEFT;
-	case SDLK_RIGHT: 	return DIK_RIGHT;
-	case SDLK_DOWN: 	return DIK_DOWN;
-	case SDLK_PAGEDOWN:	return DIK_NEXT;
-
-/*	case SDLK_RSUPER:	return AK_RAMI;
-	case SDLK_LSUPER:	return AK_LAMI;*/
-	case SDLK_PAUSE: 	return DIK_PAUSE;
-//	case SDLK_PRINT: 	return AKS_SCREENSHOT_FILE;
-//here
-
-	case SDLK_LMETA:	return DIK_LWIN;	//mac LCMD
-	case SDLK_RMETA:	return DIK_RWIN;	//mac RCMD
-//	case SDLK_WORLD_0:	return 0;	//e"
-
-	default: return -1;
-    }
-}
+/*
 
+*/
 int keysym2amiga (int keysym)
 {
     int amiga_keycode = kc_decode (keysym);
@@ -519,7 +390,6 @@ int keysym2amiga (int keysym)
     return amiga_keycode;
 }
 
-
 /*
  * Default hotkeys
  *
@@ -580,8 +450,8 @@ static struct uae_hotkeyseq sdl_quartz_hotkeys[] =
 
 struct uae_hotkeyseq *get_default_cooked_hotkeys (void)
 {
-    if (get_sdlgfx_type() == SDLGFX_DRIVER_QUARTZ)
-	return sdl_quartz_hotkeys;
-    else
-	return sdl_hotkeys;
+	if (get_sdlgfx_type() == SDLGFX_DRIVER_QUARTZ)
+		return sdl_quartz_hotkeys;
+	else
+		return sdl_hotkeys;
 }

src/include/audio.h

@@ -31,7 +31,7 @@ extern void update_audio (void);
 extern void audio_evhandler (void);
 extern void audio_hsync (void);
 extern void audio_update_adkmasks (void);
-extern void update_sound (int freq, int longframe, int linetoggle);
+extern void update_sound (double freq, int longframe, int linetoggle);
 extern void led_filter_audio (void);
 extern void set_audio (void);
 extern int audio_activate (void);

src/include/custom.h

@@ -112,7 +112,8 @@ extern int maxhpos, maxhpos_short;
 extern int maxvpos, maxvpos_nom;
 extern int hsyncstartpos;
 extern int minfirstline, vblank_endline, numscrlines;
-extern int vblank_hz, fake_vblank_hz, vblank_skip, doublescan;
+extern double vblank_hz, fake_vblank_hz;
+extern int vblank_skip, doublescan;
 extern frame_time_t syncbase;
 
 #define DMA_AUD0      0x0001
@@ -137,6 +138,8 @@ extern frame_time_t syncbase;
 #define CYCLE_CPUNASTY	0x80
 
 extern unsigned long frametime, timeframes;
+extern int plffirstline, plflastline;
+//plfstrt, plfstop, ;
 extern uae_u16 htotal, vtotal, beamcon0;
 
 /* 100 words give you 1600 horizontal pixels. Should be more than enough for

src/include/inputdevice.h

@@ -69,8 +69,13 @@ struct inputevent {
 /* event flags */
 #define ID_FLAG_AUTOFIRE 1
 #define ID_FLAG_TOGGLE 2
-#define ID_FLAG_GAMEPORTSCUSTOM 4
+#define ID_FLAG_GAMEPORTSCUSTOM1 4
+#define ID_FLAG_GAMEPORTSCUSTOM2 8
+#define ID_FLAG_INVERTTOGGLE 16
+
 #define ID_FLAG_SAVE_MASK 0xff
+#define ID_FLAG_GAMEPORTSCUSTOM_MASK (ID_FLAG_GAMEPORTSCUSTOM1 | ID_FLAG_GAMEPORTSCUSTOM2)
+#define ID_FLAG_AUTOFIRE_MASK (ID_FLAG_TOGGLE | ID_FLAG_INVERTTOGGLE | ID_FLAG_AUTOFIRE)
 #define ID_FLAG_TOGGLED 0x100
 
 #define IDEV_WIDGET_NONE 0
@@ -82,7 +87,9 @@ struct inputevent {
 #define IDEV_MAPPED_AUTOFIRE_POSSIBLE 1
 #define IDEV_MAPPED_AUTOFIRE_SET 2
 #define IDEV_MAPPED_TOGGLE 4
-#define IDEV_MAPPED_GAMEPORTSCUSTOM 8
+#define IDEV_MAPPED_INVERTTOGGLE 8
+#define IDEV_MAPPED_GAMEPORTSCUSTOM1 16
+#define IDEV_MAPPED_GAMEPORTSCUSTOM2 32
 
 #define ID_BUTTON_OFFSET 0
 #define ID_BUTTON_TOTAL 32

src/include/options.h

@@ -72,6 +72,7 @@ struct jport {
 #define JPORT_CUSTOM -2
 #define JPORT_AF_NORMAL 1
 #define JPORT_AF_TOGGLE 2
+#define JPORT_AF_ALWAYS 3
 
 #define MAX_SPARE_DRIVES 20
 #define MAX_CUSTOM_MEMORY_ADDRS 2
@@ -157,6 +158,7 @@ struct uae_prefs {
 	bool serial_demand;
 	bool serial_hwctsrts;
 	bool serial_direct;
+	int serial_stopbits;
 	bool parallel_demand;
 	int parallel_matrix_emulation;
 	bool parallel_postscript_emulation;
@@ -256,10 +258,11 @@ struct uae_prefs {
 	int gfx_filter_autoscale;
 
 	bool immediate_blits;
+	bool waiting_blits;
 	unsigned int chipset_mask;
 	bool ntscmode;
 	bool genlock;
-	int chipset_refreshrate;
+	double chipset_refreshrate;
 	int collision_level;
 	int leds_on_screen;
 	struct wh osd_pos;

src/include/sysdeps.h

@@ -389,6 +389,8 @@ extern void xfree (const void*);
 
 #endif
 
+#define DBLEQU(f, i) (abs ((f) - (i)) < 0.000001)
+
 #define TCHAR char
 #define REGPARAM3
 #define uae_char char

src/inputrecord.c

@@ -945,8 +945,8 @@ void inprec_getstatus (TCHAR *title)
 	p = title + _tcslen (title);
 	int mvp = current_maxvpos ();
 	_stprintf (p, "%03d %02d:%02d:%02d/%02d:%02d:%02d", replaypos,
-		lasthsync / (vblank_hz * mvp * 60), (lasthsync / (vblank_hz * mvp) % 60), (lasthsync / mvp) % vblank_hz,
-		endhsync / (vblank_hz * mvp * 60), (endhsync / (vblank_hz * mvp) % 60), (endhsync / mvp) % vblank_hz);
+		lasthsync / (vblank_hz * mvp * 60), ((int)(lasthsync / (vblank_hz * mvp)) % 60), (lasthsync / mvp) % (int)vblank_hz,
+		endhsync / (vblank_hz * mvp * 60), ((int)(endhsync / (vblank_hz * mvp)) % 60), (endhsync / mvp) % (int)vblank_hz);
 	p += _tcslen (p);
 	_tcscat (p, "] ");
 

src/md-fpp.h

-../src/include/fpp-ieee.h
\ No newline at end of file
+.././src/include/fpp-ieee.h
\ No newline at end of file

src/memory.c

@@ -2578,8 +2578,10 @@ void memory_reset (void)
 		map_banks (&mbres_bank, 0xDE, 1, 0);
 #endif
 #ifdef CD32
-	if (currprefs.cs_cd32c2p || currprefs.cs_cd32cd || currprefs.cs_cd32nvram)
+	if (currprefs.cs_cd32c2p || currprefs.cs_cd32cd || currprefs.cs_cd32nvram) {
 		map_banks (&akiko_bank, AKIKO_BASE >> 16, 1, 0);
+		map_banks (&gayle2_bank, 0xDD, 2, 0);
+	}
 	if (currprefs.cs_cdtvcd)
 		cdtv_check_banks ();
 	if (currprefs.cs_mbdmac == 1)

src/misc.c

@@ -1065,7 +1065,7 @@ void my_kbd_handler (int keyboard, int scancode, int newstate)
                 scancode = scancode_new;
 #endif
 
-	write_log ("kbd= %d, sc_new= %d, scancode= %d (0x%02x), state= %d\n", keyboard, scancode_new, scancode, scancode, newstate);
+	//write_log ("kbd= %d, sc_new= %d, scancode= %d (0x%02x), state= %d\n", keyboard, scancode_new, scancode, scancode, newstate);
 
 	if (newstate == 0 && code == 0) {
 		switch (scancode)

src/newcpu.c

@@ -4994,7 +4994,7 @@ static void exception3f (uae_u32 opcode, uaecptr addr, int writeaccess, int inst
 	if (currprefs.cpu_model >= 68040)
 		addr &= ~1;
 	if (currprefs.cpu_model <= 68010)
-		last_addr_for_exception_3 = m68k_getpc ();
+		last_addr_for_exception_3 = m68k_getpc () + 2;
 	else
 		last_addr_for_exception_3 = regs.instruction_pc;
 	last_fault_for_exception_3 = addr;

src/serial.c

@@ -84,7 +84,6 @@ int sd = -1;
 #endif
 
 uae_u16 serper=0,serdat;
-int seriallog = 0, log_sercon = 0;
 
 void SERPER (uae_u16 w)
 {

src/sysconfig.h.in

 /* src/sysconfig.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
 /* CPU is 64bit */
 #undef CPU_64_BIT
 
@@ -171,7 +168,7 @@
 /* Define to 1 if you have the `strstr' function. */
 #undef HAVE_STRSTR
 
-/* Define to 1 if `st_blocks' is a member of `struct stat'. */
+/* Define to 1 if `st_blocks' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
 /* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
@@ -306,9 +303,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -380,62 +374,29 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* Version number of package */
 #undef VERSION
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
 
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

src/target.h

-../src/targets/t-unix.h
\ No newline at end of file
+.././src/targets/t-unix.h
\ No newline at end of file

src/tools/blitops.c

-../blitops.c
\ No newline at end of file
+./../blitops.c
\ No newline at end of file

src/tools/build68k.c

-../build68k.c
\ No newline at end of file
+./../build68k.c
\ No newline at end of file

src/tools/genblitter.c

-../genblitter.c
\ No newline at end of file
+./../genblitter.c
\ No newline at end of file

src/tools/gencomp.c

-../gencomp.c
\ No newline at end of file
+./../gencomp.c
\ No newline at end of file

src/tools/gencpu.c

-../gencpu.c
\ No newline at end of file
+./../gencpu.c
\ No newline at end of file

src/tools/genlinetoscr.c

-../genlinetoscr.c
\ No newline at end of file
+./../genlinetoscr.c
\ No newline at end of file

src/tools/missing.c

-../missing.c
\ No newline at end of file
+./../missing.c
\ No newline at end of file

src/tools/readcpu.c

-../readcpu.c
\ No newline at end of file
+./../readcpu.c
\ No newline at end of file

src/tools/writelog.c

-../writelog.c
\ No newline at end of file
+./../writelog.c
\ No newline at end of file