19.05.2010

src/custom.c

@@ -3036,7 +3036,7 @@ STATIC_INLINE uae_u16 VPOSR (void)
 		vp |= lol ? 0x80 : 0;
 #if 0
 	if (M68K_GETPC < 0x00f00000 || M68K_GETPC >= 0x10000000)
-		write_log (L"VPOSR %04x at %08x\n", vp, M68K_GETPC);
+		write_log ("VPOSR %04x at %08x\n", vp, M68K_GETPC);
 #endif
 	if (currprefs.cpu_model >= 68020)
 		hsyncdelay ();
@@ -5782,7 +5782,7 @@ void customreset (int hardreset)
 		CLXCON (clxcon);
 		CLXCON2 (clxcon2);
 		calcdiw ();
-		write_log (L"CPU=%d Chipset=%s %s\n",
+		write_log ("CPU=%d Chipset=%s %s\n",
 			currprefs.cpu_model,
 			(currprefs.chipset_mask & CSMASK_AGA) ? "AGA" :
 			(currprefs.chipset_mask & CSMASK_ECS_AGNUS | CSMASK_ECS_DENISE) == (CSMASK_ECS_AGNUS | CSMASK_ECS_DENISE) ? "Full ECS" :

src/gencpu.c

@@ -3809,7 +3809,6 @@ int main (int argc, char **argv)
      * I don't dare to touch the 68k version.  */
 
     headerfile = fopen ("cputbl.h", "wb");
-
 	stblfile = fopen ("cpustbl.c", "wb");
     generate_includes (stblfile);
 

src/gfx-sdl/sdlgfx.c

@@ -123,13 +123,13 @@ static int mousegrab;
 static int mousehack;
 
 static int is_hwsurface;
-
 static int have_rawkeys;
-
 static int refresh_necessary;
-
 static int last_state = -1;
 
+int alt_pressed;
+unsigned int mouse_capture;
+
 /*
  * Set window title with some useful status info.
  */
@@ -1330,6 +1330,23 @@ void handle_events (void)
 			int keycode;
 			int ievent;
 
+			// Hack -- Alt + Tab
+/*
+			if (rEvent.key.keysym.sym == SDLK_LALT) alt_pressed = rEvent.key.type;
+			if (rEvent.key.keysym.sym == SDLK_RALT) alt_pressed = rEvent.key.type;
+			if ((rEvent.key.keysym.sym == SDLK_TAB) && (alt_pressed == SDL_KEYDOWN)) {
+				alt_pressed = SDL_KEYUP;
+
+				if (mouse_capture) {
+			                SDL_WM_GrabInput(SDL_GRAB_ON);
+			                SDL_ShowCursor(SDL_DISABLE);
+			        } else {
+			                SDL_WM_GrabInput(SDL_GRAB_OFF);
+			                SDL_ShowCursor(SDL_ENABLE);
+			        }
+				break;
+			}
+*/
 			if (currprefs.map_raw_keys) {
 			    keycode = rEvent.key.keysym.scancode;
 			    // Hack - OS4 keyup events have bit 7 set.

src/misc.c

@@ -836,3 +836,4 @@ int input_get_default_joystick_analog (struct uae_input_device *uid, int i, int
         return 0;
 }
 
+//

src/newcpu.c

@@ -4254,9 +4254,9 @@ void write_dcache030 (uaecptr addr, uae_u32 val, int size)
 #if 0
 	uaecptr a = 0x1db0c;
 	if (addr - (1 << size) + 1 <= a && addr + (1 << size) >= a) {
-		write_log (L"%08x %d %d %08x %08x %d\n", addr, aligned, size, val, tag1, lws1);
+		write_log ("%08x %d %d %08x %08x %d\n", addr, aligned, size, val, tag1, lws1);
 		if (aligned == 2)
-			write_log (L"*\n");
+			write_log ("*\n");
 	}
 #endif
 
@@ -4330,7 +4330,7 @@ uae_u32 read_dcache030 (uaecptr addr, int size)
 	} else {
 		v1 = c1->data[lws1];
 		if (get_long (addr) != v1) {
-			write_log (L"data cache mismatch %d %d %08x %08x != %08x %08x %d PC=%08x\n",
+			write_log ("data cache mismatch %d %d %08x %08x != %08x %08x %d PC=%08x\n",
 				size, aligned, addr, get_long (addr), v1, tag1, lws1, M68K_GETPC);
 			v1 = get_long (addr);
 		}
@@ -4354,7 +4354,7 @@ uae_u32 read_dcache030 (uaecptr addr, int size)
 	} else {
 		v2 = c2->data[lws2];
 		if (get_long (addr) != v2) {
-			write_log (L"data cache mismatch %d %d %08x %08x != %08x %08x %d PC=%08x\n",
+			write_log ("data cache mismatch %d %d %08x %08x != %08x %08x %d PC=%08x\n",
 				size, aligned, addr, get_long (addr), v2, tag2, lws2, M68K_GETPC);
 			v2 = get_long (addr);
 		}
@@ -4368,7 +4368,7 @@ uae_u32 read_dcache030 (uaecptr addr, int size)
 	else if (size == 2 && aligned == 3)
 		return (v1 << 24) | (v2 >> 8);
 
-	write_log (L"dcache030 weirdness!?\n");
+	write_log ("dcache030 weirdness!?\n");
 	return 0;
 }
 

src/od-macosx/Info.plist

@@ -28,8 +28,8 @@
 	<key>CFBundleName</key>
 	<string>PUAE</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 </dict>
 </plist>

src/scsidev.c

@@ -47,7 +47,7 @@ static int scsierr(SCSI *scgp)
 {
     register struct scg_cmd *cp = scgp->scmd;
 
-    if(cp->error != SCG_NO_ERROR ||
+    if (cp->error != SCG_NO_ERROR ||
 		cp->ux_errno != 0 || *(u_char *)&cp->scb != 0)
 	return -1;
     return 0;
@@ -219,8 +219,7 @@ static uae_u32 scsidev_open (void)
 #endif
 
     /* Check unit number */
-    if ((sdd = get_scsidev_data (unit)) &&
-	start_thread (sdd)) {
+    if ((sdd = get_scsidev_data (unit)) && start_thread (sdd)) {
 		opencount++;
 		put_word (m68k_areg (regs, 6)+32, get_word (m68k_areg (regs, 6)+32) + 1);
 		put_long (tmp1 + 24, unit); /* io_Unit */
@@ -320,8 +319,7 @@ static void scsidev_do_scsi (struct scsidevdata *sdd, uaecptr request)
     addrbank *bank_cmd  = &get_mem_bank (scsi_cmd);
 
     /* do transfer directly to and from Amiga memory */
-    if (!bank_data || !bank_data->check (scsi_data, scsi_len) ||
-	!bank_cmd  || !bank_cmd->check (scsi_cmd, scsi_cmd_len)) {
+    if (!bank_data || !bank_data->check (scsi_data, scsi_len) || !bank_cmd  || !bank_cmd->check (scsi_cmd, scsi_cmd_len)) {
 		put_byte (request + 31, (uae_u8)-5); /* IOERR_BADADDRESS */
 		return;
     }

src/sysconfig.h

@@ -293,7 +293,7 @@
 #define PACKAGE_NAME "PUAE"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PUAE 2.1.0"
+#define PACKAGE_STRING "PUAE 2.2.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "puae"
@@ -302,7 +302,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1.0"
+#define PACKAGE_VERSION "2.2.0"
 
 /* Define to the necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -395,7 +395,7 @@
 
 
 /* Version number of package */
-#define VERSION "2.1.0"
+#define VERSION "2.2.0"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

src/tools/config.log

@@ -445,7 +445,7 @@ configure:4344: $? = 0
 configure:4344: result: yes
 configure:4350: checking for _doprnt
 configure:4350: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccSMtDaE.o: In function `main':
+/tmp/ccduySMn.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:67: undefined reference to `_doprnt'
 collect2: ld returned 1 exit status
 configure:4350: $? = 1
@@ -533,7 +533,7 @@ configure:4364: $? = 0
 configure:4364: result: yes
 configure:4364: checking for strcmpi
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccMreunT.o: In function `main':
+/tmp/ccgpaTxE.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `strcmpi'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1
@@ -613,7 +613,7 @@ configure: failed program was:
 configure:4364: result: no
 configure:4364: checking for stricmp
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccfHXHOY.o: In function `main':
+/tmp/ccAjejvH.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `stricmp'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1

src/traps.c

@@ -227,8 +227,6 @@ static void *trap_thread (void *arg)
 {
 	TrapContext *context = (TrapContext *) arg;
 
-    uae_set_thread_priority (2);
-
     /* Wait until main thread is ready to switch to the
      * this trap context. */
     uae_sem_wait (&context->switch_to_trap_sem);

src/uaeexe.c

@@ -19,7 +19,7 @@
 static struct uae_xcmd *first = NULL;
 static struct uae_xcmd *last  = NULL;
 static TCHAR running = 0;
-static uae_u32 uaeexe_server (TrapContext *context) REGPARAM;
+static uae_u32 REGPARAM3 uaeexe_server (TrapContext *context) REGPARAM;
 
 /*
  * Install the server