--- uae/src/uaelib.c	2018/04/24 16:44:55	1.1.1.5
+++ uae/src/uaelib.c	2018/04/24 17:14:28	1.1.1.11
@@ -16,11 +16,10 @@
 
 #include "config.h"
 #include "options.h"
-#include "threaddep/penguin.h"
+#include "threaddep/thread.h"
 #include "uae.h"
 #include "include/memory.h"
 #include "custom.h"
-#include "readcpu.h"
 #include "newcpu.h"
 #include "xwin.h"
 #include "autoconf.h"
@@ -42,13 +41,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;
 }
 
@@ -84,7 +83,7 @@ static uae_u32 emulib_SetFrameRate (uae_
     else if (val > 20)
 	return 0;
     else {
-	currprefs.framerate = val;
+	currprefs.gfx_framerate = val;
 	return 1;
     }
 }
@@ -94,7 +93,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) {
@@ -102,18 +101,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:
@@ -133,12 +135,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;
 
     currprefs.chipmem_size = memsize;
-    uae_reset();
+    uae_reset(0);
     return 1;
 }
 
@@ -151,12 +153,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;
     currprefs.bogomem_size = memsize;
-    uae_reset ();
+    uae_reset (0);
     return 1;
 }
 
@@ -169,11 +171,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;
 }
 
@@ -219,7 +221,7 @@ static uae_u32 emulib_GetUaeConfig (uaec
     put_long (place + 4, allocated_chipmem);
     put_long (place + 8, allocated_bogomem);
     put_long (place + 12, allocated_fastmem);
-    put_long (place + 16, currprefs.framerate);
+    put_long (place + 16, currprefs.gfx_framerate);
     put_long (place + 20, currprefs.produce_sound);
     put_long (place + 24, currprefs.jport0 | (currprefs.jport1 << 8));
     put_long (place + 28, currprefs.keyboard_lang);
@@ -406,7 +408,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);