--- uae/src/include/options.h	2018/04/24 16:47:45	1.1.1.9
+++ uae/src/include/options.h	2018/04/24 17:00:37	1.1.1.17
@@ -4,14 +4,14 @@
   * Stuff
   *
   * Copyright 1995, 1996 Ed Hanway
-  * Copyright 1995-98 Bernd Schmidt
+  * Copyright 1995-2001 Bernd Schmidt
   */
 
 #define UAEMAJOR 0
 #define UAEMINOR 8
-#define UAESUBREV 9
+#define UAESUBREV 17
 
-typedef enum { KBD_LANG_US, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
+typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
 
 extern long int version;
 
@@ -32,7 +32,6 @@ struct uae_prefs {
     int use_serial;
     int serial_demand;
     int parallel_demand;
-    int automount_uaedev;
     int use_gfxlib;
     int socket_emu;
 
@@ -48,12 +47,14 @@ struct uae_prefs {
 
     int produce_sound;
     int stereo;
+    int mixed_stereo;
     int sound_bits;
     int sound_freq;
     int sound_minbsiz;
     int sound_maxbsiz;
     int sound_pri_time;
     int sound_pri_cutoff;
+    int sound_interpol;
 
     int gfx_framerate;
     int gfx_width;
@@ -71,6 +72,8 @@ struct uae_prefs {
     int immediate_blits;
     unsigned int chipset_mask;
     int ntscmode;
+    int collision_level;
+    int fast_copper;
 
     char df[4][256];
     char romfile[256];
@@ -95,6 +98,8 @@ struct uae_prefs {
 
     struct uaedev_mount_info *mountinfo;
 
+    int nr_floppies;
+
     /* Target specific options */
     int x11_use_low_bandwidth;
     int x11_use_mitshm;
@@ -107,6 +112,7 @@ struct uae_prefs {
     int win32_logfile;
     int win32_iconified_nospeed;
     int win32_iconified_nosound;
+    int curses_reverse_video;
 };
 
 /* Contains the filename of .uaerc */
@@ -116,6 +122,8 @@ extern void save_options (FILE *, struct
 extern void default_prefs (struct uae_prefs *);
 extern void discard_prefs (struct uae_prefs *);
 
+extern int parse_cmdline_option (char, char *);
+
 extern int cfgfile_yesno (char *option, char *value, char *name, int *location);
 extern int cfgfile_intval (char *option, char *value, char *name, int *location, int scale);
 extern int cfgfile_strval (char *option, char *value, char *name, int *location, const char *table[], int more);
@@ -197,7 +205,7 @@ extern int memcmpy(void *foo, const void
  * may need some padding for the array. */
 
 #define fuzzy_memset(p, c, o, l) fuzzy_memset_1 ((p), QUADRUPLIFY (c), (o) & ~3, ((l) + 4) >> 2)
-static __inline__ void fuzzy_memset_1 (void *p, uae_u32 c, int offset, int len)
+STATIC_INLINE void fuzzy_memset_1 (void *p, uae_u32 c, int offset, int len)
 {
     uae_u32 *p2 = (uae_u32 *)((char *)p + offset);
     int a = len & 7;
@@ -240,7 +248,7 @@ static __inline__ void fuzzy_memset_1 (v
 /* This one knows it will never be asked to clear more than 32 bytes.  Make sure you call this with a
    constant for the length.  */
 #define fuzzy_memset_le32(p, c, o, l) fuzzy_memset_le32_1 ((p), QUADRUPLIFY (c), (o) & ~3, ((l) + 7) >> 2)
-static __inline__ void fuzzy_memset_le32_1 (void *p, uae_u32 c, int offset, int len)
+STATIC_INLINE void fuzzy_memset_le32_1 (void *p, uae_u32 c, int offset, int len)
 {
     uae_u32 *p2 = (uae_u32 *)((char *)p + offset);
 
@@ -262,3 +270,18 @@ static __inline__ void fuzzy_memset_le32
 #if defined(AMIGA) && defined(__GNUC__)
 #include "od-amiga/amiga-kludges.h"
 #endif
+
+/* Every Amiga hardware clock cycle takes this many "virtual" cycles.  This
+   used to be hardcoded as 1, but using higher values allows us to time some
+   stuff more precisely.
+   512 is the official value from now on - it can't change, unless we want
+   _another_ config option "finegrain2_m68k_speed".
+
+   We define this value here rather than in events.h so that gencpu.c sees
+   it.  */
+#define CYCLE_UNIT 512
+
+/* This one is used by cfgfile.c.  We could reduce the CYCLE_UNIT back to 1,
+   I'm not 100% sure this code is bug free yet.  */
+#define OFFICIAL_CYCLE_UNIT 512
+