Another major cleanup - folders for cdrom and floppy, renamed disc to floppy, renamed SuperIO stuff, others as needed.

src/scsi/scsi.c

@@ -8,7 +8,7 @@
  *
  *		Handling of the SCSI controllers.
  *
- * Version:	@(#)scsi.c	1.0.3	2017/08/27
+ * Version:	@(#)scsi.c	1.0.4	2017/09/03
  *
  * Authors:	TheCollector1995, <mariogplayer@gmail.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -22,7 +22,7 @@
 #include "../ibm.h"
 #include "../timer.h"
 #include "../device.h"
-#include "../cdrom.h"
+#include "../cdrom/cdrom.h"
 #include "scsi.h"
 #include "scsi_aha154x.h"
 #include "scsi_buslogic.h"

src/scsi/scsi_device.c

@@ -8,7 +8,7 @@
  *
  *		The generic SCSI device command handler.
  *
- * Version:	@(#)scsi_device.c	1.0.1	2017/08/23
+ * Version:	@(#)scsi_device.c	1.0.2	2017/09/03
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -16,9 +16,9 @@
  *		Copyright 2017 Fred N. van Kempen.
  */
 #include "../ibm.h"
+#include "../cdrom/cdrom.h"
 #include "scsi.h"
 #include "scsi_disk.h"
-#include "../cdrom.h"
 
 
 static uint8_t scsi_null_device_sense[14] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0 };

src/scsi/scsi_disk.c

@@ -6,26 +6,25 @@
  *
  *		Emulation of SCSI fixed and removable disks.
  *
- * Version:	@(#)scsi_disk.c	1.0.6	2017/08/24
+ * Version:	@(#)scsi_disk.c	1.0.7	2017/09/03
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2017 Miran Grca.
  */
-#include <malloc.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
-
 #include "../86box.h"
-#include "../cdrom.h"
 #include "../ibm.h"
+#include "../timer.h"
+#include "../piix.h"
+#include "../cdrom/cdrom.h"
 #include "../hdd/hdd_image.h"
 #include "../hdd/hdd_ide_at.h"
-#include "../piix.h"
+#include "../win/plat_iodev.h"
 #include "scsi.h"
 #include "scsi_disk.h"
-#include "../timer.h"
-#include "../win/plat_iodev.h"
 
 
 /* Bits of 'status' */