Massive IDE clean-ups, and finally implemented ATAPI hard disks.

src/include/86box/scsi_disk.h

@@ -20,38 +20,48 @@ typedef struct scsi_disk_t {
     mode_sense_pages_t ms_pages_saved;
 
     hard_disk_t *drv;
+#ifdef EMU_IDE_H
+    ide_tf_t *   tf;
+#else
+    void *       tf;
+#endif
 
     uint8_t *temp_buffer;
-    uint8_t  pad[16]; /* This is atapi_cdb in ATAPI-supporting devices,
-                        and pad in SCSI-only devices. */
+    uint8_t  atapi_cdb[16];
     uint8_t  current_cdb[16];
     uint8_t  sense[256];
 
-    uint8_t status;
+#ifdef ANCIENT_CODE
+    /* Task file. */
+    uint8_t features;
     uint8_t phase;
-    uint8_t error;
-    uint8_t id;
-    uint8_t pad0;
-    uint8_t cur_lun;
-    uint8_t pad1;
-    uint8_t pad2;
-
     uint16_t request_length;
-    uint16_t pad4;
+    uint8_t status;
+    uint8_t error;
+    uint16_t pad;
+    uint32_t pos;
+#endif
+
+    uint8_t id;
+    uint8_t cur_lun;
+    uint8_t pad0;
+    uint8_t pad1;
+
+    uint16_t max_transfer_len;
+    uint16_t pad2;
 
     int requested_blocks;
     int packet_status;
     int total_length;
     int do_page_save;
     int unit_attention;
-    int pad5;
+    int request_pos;
     int pad6;
     int pad7;
 
     uint32_t sector_pos;
     uint32_t sector_len;
     uint32_t packet_len;
-    uint32_t pos;
 
     double callback;
 } scsi_disk_t;