--- hatari/src/includes/configuration.h	2019/04/01 07:12:15	1.1.1.6
+++ hatari/src/includes/configuration.h	2019/04/01 07:12:40	1.1.1.7
@@ -68,36 +68,36 @@ typedef struct
 } CNF_KEYBOARD;
 
 
-/* Memory configuration */
-typedef enum
-{
-  MEMORY_SIZE_512Kb,
-  MEMORY_SIZE_1Mb,
-  MEMORY_SIZE_2Mb,
-  MEMORY_SIZE_4Mb
-} MEMORY_SIZE;
-
 typedef struct
 {
-  MEMORY_SIZE nMemorySize;
+  int nMemorySize;
   char szMemoryCaptureFileName[FILENAME_MAX];
 } CNF_MEMORY;
 
 
 /* Joystick configuration */
+typedef enum
+{
+  JOYSTICK_DISABLED,
+  JOYSTICK_REALSTICK,
+  JOYSTICK_KEYBOARD
+} JOYSTICKMODE;
+
 typedef struct
 {
-  BOOL bCursorEmulation;
+  JOYSTICKMODE nJoystickMode;
   BOOL bEnableAutoFire;
+  int nJoyId;
+  int nKeyCodeUp, nKeyCodeDown, nKeyCodeLeft, nKeyCodeRight, nKeyCodeFire;
 } JOYSTICK;
 
 typedef struct
 {
-  JOYSTICK Joy[2];
+  JOYSTICK Joy[6];
 } CNF_JOYSTICKS;
 
 
-/* Discimage configuration */
+/* Disk image configuration */
 
 typedef enum
 {
@@ -108,24 +108,14 @@ typedef enum
 
 typedef struct
 {
-  BOOL bAutoInsertDiscB;
+  BOOL bAutoInsertDiskB;
   WRITEPROTECTION nWriteProtection;
-  char szDiscImageDirectory[FILENAME_MAX];
-} CNF_DISCIMAGE;
+  char szDiskImageDirectory[FILENAME_MAX];
+} CNF_DISKIMAGE;
 
 
-/* Hard discs configuration */
+/* Hard drives configuration */
 #define MAX_HARDDRIVES  1
-#define DRIVELIST_TO_DRIVE_INDEX(DriveList)  (DriveList+1)
-
-typedef enum
-{
-  DRIVELIST_NONE,
-  DRIVELIST_C,
-  DRIVELIST_CD,
-  DRIVELIST_CDE,
-  DRIVELIST_CDEF
-} DRIVELIST;
 
 typedef enum
 {
@@ -137,14 +127,13 @@ typedef enum
 
 typedef struct
 {
-  int nDriveList;
-  BOOL bBootFromHardDisc;
-  int nHardDiscDir;
-  BOOL bUseHardDiscDirectories;
-  BOOL bUseHardDiscImage;
-  char szHardDiscDirectories[MAX_HARDDRIVES][FILENAME_MAX];
-  char szHardDiscImage[FILENAME_MAX];
-} CNF_HARDDISC;
+  BOOL bBootFromHardDisk;
+  int nHardDiskDir;
+  BOOL bUseHardDiskDirectories;
+  BOOL bUseHardDiskImage;
+  char szHardDiskDirectories[MAX_HARDDRIVES][FILENAME_MAX];
+  char szHardDiskImage[FILENAME_MAX];
+} CNF_HARDDISK;
 
 
 /* Screen configuration */
@@ -223,8 +212,8 @@ typedef struct
   CNF_KEYBOARD Keyboard;
   CNF_SOUND Sound;
   CNF_MEMORY Memory;
-  CNF_DISCIMAGE DiscImage;
-  CNF_HARDDISC HardDisc;
+  CNF_DISKIMAGE DiskImage;
+  CNF_HARDDISK HardDisk;
   CNF_ROM Rom;
   CNF_RS232 RS232;
   CNF_PRINTER Printer;