Fix logging issues.

This commit is contained in:
waltje
2017-12-10 02:53:10 -05:00
parent d52846d3be
commit c7946fbce7
18 changed files with 87 additions and 60 deletions

View File

@@ -10,7 +10,7 @@
* made by Adaptec, Inc. These controllers were designed for
* the ISA bus.
*
* Version: @(#)scsi_aha154x.c 1.0.35 2017/11/24
* Version: @(#)scsi_aha154x.c 1.0.36 2017/12/09
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Original Buslogic version by SA1988 and Miran Grca.
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../io.h"
#include "../mca.h"
@@ -91,7 +92,7 @@ aha_log(const char *fmt, ...)
if (aha_do_log) {
va_start(ap, fmt);
pclog(fmt, ap);
pclog_ex(fmt, ap);
va_end(ap);
}
#endif

View File

@@ -8,7 +8,7 @@
*
* The generic SCSI bus operations handler.
*
* Version: @(#)scsi_bus.c 1.0.4 2017/11/24
* Version: @(#)scsi_bus.c 1.0.5 2017/12/09
*
* NOTES: For now ported from PCem with some modifications
* but at least it's a start.
@@ -21,6 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "scsi.h"
#include "scsi_device.h"
@@ -44,14 +45,14 @@ int scsi_bus_do_log = ENABLE_SCSI_BUS_LOG;
static void
scsi_bus_log(const char *format, ...)
scsi_bus_log(const char *fmt, ...)
{
#ifdef ENABLE_SCSI_BUS_LOG
va_list ap;
if (scsi_bus_do_log) {
va_start(ap, format);
pclog(format, ap);
va_start(ap, fmt);
pclog_ex(fmt, ap);
va_end(ap);
}
#endif

View File

@@ -11,7 +11,7 @@
* 1 - BT-545S ISA;
* 2 - BT-958D PCI
*
* Version: @(#)scsi_buslogic.c 1.0.29 2017/11/24
* Version: @(#)scsi_buslogic.c 1.0.30 2017/12/09
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../io.h"
#include "../mca.h"
@@ -243,14 +244,14 @@ int buslogic_do_log = ENABLE_BUSLOGIC_LOG;
static void
buslogic_log(const char *format, ...)
buslogic_log(const char *fmt, ...)
{
#ifdef ENABLE_BUSLOGIC_LOG
va_list ap;
if (buslogic_do_log) {
va_start(ap, format);
pclog(format, ap);
va_start(ap, fmt);
pclog_ex(fmt, ap);
va_end(ap);
}
#endif

View File

@@ -6,7 +6,7 @@
*
* Emulation of SCSI fixed and removable disks.
*
* Version: @(#)scsi_disk.c 1.0.10 2017/11/24
* Version: @(#)scsi_disk.c 1.0.11 2017/12/09
*
* Author: Miran Grca, <mgrca8@gmail.com>
*
@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../timer.h"
#include "../device.h"
@@ -457,14 +458,14 @@ int scsi_hd_do_log = ENABLE_SCSI_DISK_LOG;
static void
scsi_hd_log(const char *format, ...)
scsi_hd_log(const char *fmt, ...)
{
#ifdef ENABLE_SCSI_DISK_LOG
va_list ap;
if (scsi_hd_do_log) {
va_start(ap, format);
pclog(format, ap);
va_start(ap, fmt);
pclog_ex(fmt, ap);
va_end(ap);
}
#endif

View File

@@ -9,7 +9,7 @@
* Implementation of the NCR 5380 series of SCSI Host Adapters
* made by NCR. These controllers were designed for the ISA bus.
*
* Version: @(#)scsi_ncr5380.c 1.0.7 2017/11/24
* Version: @(#)scsi_ncr5380.c 1.0.8 2017/12/09
*
* Authors: Sarah Walker, <tommowalker@tommowalker.co.uk>
* TheCollector1995, <mariogplayer@gmail.com>
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../io.h"
#include "../dma.h"
@@ -156,7 +157,7 @@ ncr_log(const char *fmt, ...)
if (ncr5380_do_log) {
va_start(ap, fmt);
pclog(fmt, ap);
pclog_ex(fmt, ap);
va_end(ap);
}
#endif

View File

@@ -11,7 +11,7 @@
* series of SCSI Host Adapters made by Mylex.
* These controllers were designed for various buses.
*
* Version: @(#)scsi_x54x.c 1.0.6 2017/11/24
* Version: @(#)scsi_x54x.c 1.0.7 2017/12/09
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../io.h"
#include "../dma.h"
@@ -81,7 +82,7 @@ x54x_log(const char *fmt, ...)
if (x54x_do_log) {
va_start(ap, fmt);
pclog(fmt, ap);
pclog_ex(fmt, ap);
va_end(ap);
}
#endif