Fixes almost all the logging options which were previously broken

src/scsi/scsi_buslogic.c

@@ -20,11 +20,11 @@
  *		Copyright 2016-2018 Miran Grca.
  *		Copyright 2017,2018 Fred N. van Kempen.
  */
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
 #include <86box/86box.h>

src/scsi/scsi_cdrom.c

@@ -15,8 +15,8 @@
  *
  *		Copyright 2016-2020 Miran Grca.
  */
-#include <inttypes.h>
 #include <stdarg.h>
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>

src/scsi/scsi_ncr53c8xx.c

@@ -879,17 +879,10 @@ ncr53c8xx_do_msgout(ncr53c8xx_t *dev, uint8_t id)
 {
     uint8_t msg;
     int     len, arg;
-#ifdef ENABLE_NCR53C8XX_LOG
-    uint32_t current_tag;
-#endif
     scsi_device_t *sd;
 
     sd = &scsi_devices[dev->bus][id];
 
-#ifdef ENABLE_NCR53C8XX_LOG
-    current_tag = id;
-#endif
-
     ncr53c8xx_log("MSG out len=%d\n", dev->dbc);
     while (dev->dbc) {
         msg       = ncr53c8xx_get_msgbyte(dev);
@@ -1011,9 +1004,6 @@ ncr53c8xx_process_script(ncr53c8xx_t *dev)
     int opcode, insn_processed = 0, reg, operator, cond, jmp, n, i, c;
     int32_t offset;
     uint8_t op0, op1, data8, mask, data[7];
-#ifdef ENABLE_NCR53C8XX_LOG
-    uint8_t *pp;
-#endif
 
     dev->sstop = 0;
 again:
@@ -1337,10 +1327,6 @@ again:
                 dev->dsp += 4;
                 ncr53c8xx_memcpy(dev, dest, addr, insn & 0xffffff);
             } else {
-#ifdef ENABLE_NCR53C8XX_LOG
-                pp = data;
-#endif
-
                 if (insn & (1 << 28))
                     addr = dev->dsa + sextract32(addr, 0, 24);
                 n   = (insn & 7);

src/scsi/scsi_x54x.c

@@ -957,7 +957,7 @@ x54x_scsi_cmd_phase1(x54x_t *dev)
     }
 
     dev->callback_sub_phase = 3;
-    x54x_log("scsi_devices[%02xi][%02i].Status = %02X\n", x54x->bus, req->TargetID, sd->status);
+    x54x_log("scsi_devices[%02xi][%02i].Status = %02X\n", dev->bus, req->TargetID, sd->status);
 }
 
 static void