Merge branch 'master' into pc98x1

src/include/86box/cdrom.h

@@ -226,7 +226,6 @@ typedef struct cdrom {
     uint8_t speed;
     uint8_t cur_speed;
 
-    int   is_dir;
     void *priv;
 
     char image_path[1024];

src/include/86box/cdrom_image_backend.h

@@ -53,6 +53,8 @@ typedef struct track_file_t {
     char  fn[260];
     FILE *fp;
     void *priv;
+
+    int motorola;
 } track_file_t;
 
 typedef struct track_t {
@@ -63,7 +65,7 @@ typedef struct track_t {
     int           mode2;
     int           form;
     int           pre;
-    int           pad;
+    int           noskip; /* Do not skip by 8 bytes.*/
     uint64_t      start;
     uint64_t      length;
     uint64_t      skip;

src/include/86box/scsi_ncr5380.h

@@ -138,9 +138,6 @@ extern const device_t scsi_t128_device;
 extern const device_t scsi_t228_device;
 extern const device_t scsi_t130b_device;
 extern const device_t scsi_ls2000_device;
-#if defined(DEV_BRANCH) && defined(USE_SUMO)
-extern const device_t scsi_scsiat_device;
-#endif
 #endif
 
 #endif /*SCSI_NCR5380_H*/