--- uae/src/uaelib.c	2018/04/24 16:56:48	1.1.1.7
+++ uae/src/uaelib.c	2018/04/24 17:16:44	1.1.1.12
@@ -14,9 +14,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "config.h"
 #include "options.h"
-#include "threaddep/penguin.h"
+#include "threaddep/thread.h"
 #include "uae.h"
 #include "include/memory.h"
 #include "custom.h"
@@ -28,12 +27,16 @@
 #include "gensound.h"
 #include "picasso96.h"
 
+/* We don't get a numerical version from autoconf, but this is the only place
+   that wants it, and it doesn't matter - so cheat.  */
+#define UAEVERSION 0x0826
+
 /*
  * Returns UAE Version
  */
 static uae_u32 emulib_GetVersion (void)
 {
-    return version;
+    return UAEVERSION;
 }
 
 /*
@@ -41,13 +44,13 @@ static uae_u32 emulib_GetVersion (void)
  */
 static uae_u32 emulib_HardReset (void)
 {
-    uae_reset();
+    uae_reset(1);
     return 0;
 }
 
 static uae_u32 emulib_Reset (void)
 {
-    uae_reset();
+    uae_reset(0);
     return 0;
 }
 
@@ -93,7 +96,7 @@ static uae_u32 emulib_SetFrameRate (uae_
  */
 static uae_u32 emulib_ChangeLanguage (uae_u32 which)
 {
-    if (which > 5)
+    if (which > 6)
 	return 0;
     else {
 	switch (which) {
@@ -101,18 +104,21 @@ static uae_u32 emulib_ChangeLanguage (ua
 	    currprefs.keyboard_lang = KBD_LANG_US;
 	    break;
 	 case 1:
-	    currprefs.keyboard_lang = KBD_LANG_DE;
+	    currprefs.keyboard_lang = KBD_LANG_DK;
 	    break;
 	 case 2:
-	    currprefs.keyboard_lang = KBD_LANG_SE;
+	    currprefs.keyboard_lang = KBD_LANG_DE;
 	    break;
 	 case 3:
-	    currprefs.keyboard_lang = KBD_LANG_FR;
+	    currprefs.keyboard_lang = KBD_LANG_SE;
 	    break;
 	 case 4:
-	    currprefs.keyboard_lang = KBD_LANG_IT;
+	    currprefs.keyboard_lang = KBD_LANG_FR;
 	    break;
 	 case 5:
+	    currprefs.keyboard_lang = KBD_LANG_IT;
+	    break;
+	 case 6:
 	    currprefs.keyboard_lang = KBD_LANG_ES;
 	    break;
 	 default:
@@ -132,12 +138,12 @@ static uae_u32 emulib_ChgCMemSize (uae_u
     if (memsize != 0x80000 && memsize != 0x100000 &&
 	memsize != 0x200000) {
 	memsize = 0x200000;
-	fprintf (stderr, "Unsupported chipmem size!\n");
+	write_log ("Unsupported chipmem size!\n");
     }
-    m68k_dreg(regs, 0) = 0;
+    m68k_dreg (regs, 0) = 0;
 
     currprefs.chipmem_size = memsize;
-    uae_reset();
+    uae_reset(0);
     return 1;
 }
 
@@ -150,12 +156,12 @@ static uae_u32 emulib_ChgSMemSize (uae_u
     if (memsize != 0x80000 && memsize != 0x100000 &&
 	memsize != 0x180000 && memsize != 0x1C0000) {
 	memsize = 0;
-	fprintf (stderr, "Unsupported bogomem size!\n");
+	write_log ("Unsupported bogomem size!\n");
     }
 
-    m68k_dreg(regs, 0) = 0;
+    m68k_dreg (regs, 0) = 0;
     currprefs.bogomem_size = memsize;
-    uae_reset ();
+    uae_reset (0);
     return 1;
 }
 
@@ -168,11 +174,11 @@ static uae_u32 emulib_ChgFMemSize (uae_u
     if (memsize != 0x100000 && memsize != 0x200000 &&
 	memsize != 0x400000 && memsize != 0x800000) {
 	memsize = 0;
-	fprintf (stderr, "Unsupported fastmem size!\n");
+	write_log ("Unsupported fastmem size!\n");
     }
     m68k_dreg(regs, 0) = 0;
     currprefs.fastmem_size = memsize;
-    uae_reset ();
+    uae_reset (0);
     return 0;
 }
 
@@ -214,7 +220,7 @@ static uae_u32 emulib_GetUaeConfig (uaec
 {
     int i,j;
 
-    put_long (place, version);
+    put_long (place, UAEVERSION);
     put_long (place + 4, allocated_chipmem);
     put_long (place + 8, allocated_bogomem);
     put_long (place + 12, allocated_fastmem);
@@ -315,20 +321,20 @@ static uae_u32 FindFunctionInObject (uae
 static uae_u32 emulib_ExecuteNativeCode (void)
 {
 #if 0
-    uaecptr object_AAM = m68k_areg( regs, 0 );
-    uae_u32 d1 = m68k_dreg( regs, 1 );
-    uae_u32 d2 = m68k_dreg( regs, 2 );
-    uae_u32 d3 = m68k_dreg( regs, 3 );
-    uae_u32 d4 = m68k_dreg( regs, 4 );
-    uae_u32 d5 = m68k_dreg( regs, 5 );
-    uae_u32 d6 = m68k_dreg( regs, 6 );
-    uae_u32 d7 = m68k_dreg( regs, 7 );
-    uae_u32 a1 = m68k_areg( regs, 1 );
-    uae_u32 a2 = m68k_areg( regs, 2 );
-    uae_u32 a3 = m68k_areg( regs, 3 );
-    uae_u32 a4 = m68k_areg( regs, 4 );
-    uae_u32 a5 = m68k_areg( regs, 5 );
-    uae_u32 a6 = m68k_areg( regs, 6 );
+    uaecptr object_AAM = m68k_areg (regs, 0);
+    uae_u32 d1 = m68k_dreg (regs, 1);
+    uae_u32 d2 = m68k_dreg (regs, 2);
+    uae_u32 d3 = m68k_dreg (regs, 3);
+    uae_u32 d4 = m68k_dreg (regs, 4);
+    uae_u32 d5 = m68k_dreg (regs, 5);
+    uae_u32 d6 = m68k_dreg (regs, 6);
+    uae_u32 d7 = m68k_dreg (regs, 7);
+    uae_u32 a1 = m68k_areg (regs, 1);
+    uae_u32 a2 = m68k_areg (regs, 2);
+    uae_u32 a3 = m68k_areg (regs, 3);
+    uae_u32 a4 = m68k_areg (regs, 4);
+    uae_u32 a5 = m68k_areg (regs, 5);
+    uae_u32 a6 = m68k_areg (regs, 6);
 
     uae_u8* object_UAM = NULL;
     CREATE_NATIVE_FUNC_PTR;
@@ -405,7 +411,7 @@ static uae_u32 uaelib_demux (void)
 void emulib_install (void)
 {
     uaecptr a = here ();
-    org (0xF0FF60);
+    org (RTAREA_BASE + 0xFF60);
     calltrap (deftrap (uaelib_demux));
     dw (RTS);
     org (a);