--- uae/src/tui.c	2018/04/24 16:48:47	1.1.1.7
+++ uae/src/tui.c	2018/04/24 17:16:43	1.1.1.13
@@ -13,9 +13,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "config.h"
 #include "options.h"
-#include "threaddep/penguin.h"
+#include "threaddep/thread.h"
 #include "uae.h"
 #include "gensound.h"
 #include "joystick.h"
@@ -53,7 +52,7 @@ static void save_settings (void)
     tui_backup_optionsfile ();
     f = fopen (optionsfile, "w");
     if (f == NULL) {
-	fprintf (stderr, "Error saving options file!\n");
+	write_log ("Error saving options file!\n");
 	return;
     }
     save_options (f, &currprefs);
@@ -153,7 +152,6 @@ static struct bstring miscmenu[] = {
 
 static struct bstring hdmenu[] = {
 /*    { "Harddisk/CDROM emulation settings", 0 },*/
-    { "Enable/Disable _harddisks/fastmem", 'H' },
     { "_Add a mounted volume", 'A' },
     { "Add a mounted _volume r/o", 'V' },
     { "Add a hard_file", 'F' },
@@ -264,7 +262,7 @@ static void print_configuration (void)
 	sprintf (tmp, "Picasso 96 %d MB", currprefs.gfxmem_size / 0x100000);
 	tui_puts(tmp);
     } else
- 	tui_puts ("Picasso 96 Off");
+	tui_puts ("Picasso 96 Off");
     y++;
 
     tui_gotoxy (OPTION_COLUMN, y++);
@@ -312,10 +310,6 @@ static void print_configuration (void)
     tui_gotoxy (OPTION_COLUMN,y++);
     tui_puts ("GAME PORT 2: "); tui_puts (gameport_state (1));
 
-    tui_gotoxy (OPTION_COLUMN,y++);
-    sprintf (tmp, "HARDDISK: (%s)", currprefs.automount_uaedev ? "enabled" : "disabled");
-    tui_puts (tmp);
-
     for (i = 0;; i++) {
 	char buf[256];
 
@@ -344,9 +338,6 @@ static void HDOptions (void)
 	    break;
 	else switch (c) {
 	 case 0:
-	    currprefs.automount_uaedev = !currprefs.automount_uaedev;
-	    break;
-	 case 1:
 	    tui_wgets (mountvol, "Enter mounted volume name", 10);
 	    if (strlen (mountvol) == 0)
 		break;
@@ -355,7 +346,7 @@ static void HDOptions (void)
 	    tui_wgets (mountdir, "Enter mounted volume path", 78);
 	    add_filesys_unit (currprefs.mountinfo, mountvol, mountdir, 0, 0, 0, 0, 0);
 	    break;
-	 case 2:
+	 case 1:
 	    tui_wgets (mountvol, "Enter mounted volume name", 10);
 	    if (strlen (mountvol) == 0)
 		break;
@@ -364,7 +355,7 @@ static void HDOptions (void)
 	    tui_wgets (mountdir, "Enter mounted volume path", 78);
 	    add_filesys_unit (currprefs.mountinfo, mountvol, mountdir, 1, 0, 0, 0, 0);
 	    break;
-	 case 3:
+	 case 2:
 	    buff = tui_filereq("*", "", "Select the hardfile to be mounted");
 	    if (buff == NULL)
 		break;
@@ -379,7 +370,7 @@ static void HDOptions (void)
 	    if (buff)
 		tui_errorbox (buff);
 	    break;
-	 case 4:
+	 case 3:
 	    tui_wgets (mountvol, "Enter number of volume to be removed (0 for UAE0:, etc.)", 2);
 	    if (kill_filesys_unit (currprefs.mountinfo, atoi (mountvol)) == -1)
 		tui_errorbox ("Volume does not exist");
@@ -614,7 +605,7 @@ static void SoundOptions (void)
 		currprefs.sound_freq = atoi (tmp);
 	    break;
 	 case 5:
-	    currprefs.stereo = !currprefs.stereo;
+	    currprefs.stereo = (currprefs.stereo + 1) % 3;
 	    break;
 	}
     }
@@ -635,7 +626,7 @@ static void OtherOptions (void)
 	 case 0:
 	    currprefs.jport0 = (currprefs.jport0 + 1) % 6;
 	    if (currprefs.jport0 == currprefs.jport1)
-	      currprefs.jport1 = (currprefs.jport1 + 5) % 6;	      
+	      currprefs.jport1 = (currprefs.jport1 + 5) % 6;
 	    break;
 	 case 1:
 	    currprefs.jport1 = (currprefs.jport1 + 1) % 6;
@@ -728,3 +719,11 @@ int gui_update (void)
 {
     return 0;
 }
+
+void gui_lock (void)
+{
+}
+
+void gui_unlock (void)
+{
+}