--- hatari/src/includes/configuration.h	2019/04/09 08:58:10	1.1.1.21
+++ hatari/src/includes/configuration.h	2019/04/09 08:59:26	1.1.1.22
@@ -68,8 +68,11 @@ typedef struct
 typedef struct
 {
   bool bEnableRS232;
+  bool bEnableSccB;
   char szOutFileName[FILENAME_MAX];
   char szInFileName[FILENAME_MAX];
+  char sSccBInFileName[FILENAME_MAX];
+  char sSccBOutFileName[FILENAME_MAX];
 } CNF_RS232;
 
 
@@ -211,28 +214,42 @@ typedef struct
 {
   int nGemdosDrive;
   bool bUseHardDiskDirectories;
-  bool bUseIdeMasterHardDiskImage;
-  bool bUseIdeSlaveHardDiskImage;
   WRITEPROTECTION nWriteProtection;
   GEMDOS_CHR_CONV nGemdosCase;
   bool bFilenameConversion;
   bool bGemdosHostTime;
   bool bBootFromHardDisk;
   char szHardDiskDirectories[MAX_HARDDRIVES][FILENAME_MAX];
-  char szIdeMasterHardDiskImage[FILENAME_MAX];
-  char szIdeSlaveHardDiskImage[FILENAME_MAX];
 } CNF_HARDDISK;
 
-/* SCSI/ACSI configuration */
+/* SCSI/ACSI/IDE configuration */
 #define MAX_ACSI_DEVS 8
 #define MAX_SCSI_DEVS 8
+#define MAX_IDE_DEVS 2
 
 typedef struct
 {
   bool bUseDevice;
   char sDeviceFile[FILENAME_MAX];
+  int nBlockSize;
 } CNF_SCSIDEV;
 
+typedef enum
+{
+  BYTESWAP_OFF,
+  BYTESWAP_ON,
+  BYTESWAP_AUTO
+} BYTESWAPPING;
+
+typedef struct
+{
+  bool bUseDevice;
+  BYTESWAPPING nByteSwap;
+  char sDeviceFile[FILENAME_MAX];
+  int nBlockSize;
+  int nDeviceType;
+} CNF_IDEDEV;
+
 /* Falcon register $FFFF8006 bits 6 & 7 (mirrored in $FFFF82C0 bits 0 & 1):
  * 00 Monochrome
  * 01 RGB - Colormonitor
@@ -391,6 +408,7 @@ typedef struct
   CNF_HARDDISK HardDisk;
   CNF_SCSIDEV Acsi[MAX_ACSI_DEVS];
   CNF_SCSIDEV Scsi[MAX_SCSI_DEVS];
+  CNF_IDEDEV Ide[MAX_IDE_DEVS];
   CNF_ROM Rom;
   CNF_RS232 RS232;
   CNF_PRINTER Printer;