claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More cleanups, also updated Makefile.local with all "user-settable" parts.

Browse Source
This commit is contained in:
waltje
2017-10-19 21:08:34 -04:00
parent 1d60a99ea3
commit 0af26c1c3b
13 changed files with 102 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/scsi/scsi_aha154x.c
View File

@@ -10,7 +10,7 @@
* made by Adaptec, Inc. These controllers were designed for
* the ISA bus.
*
* Version: @(#)scsi_aha154x.c 1.0.30 2017/10/16
* Version: @(#)scsi_aha154x.c 1.0.31 2017/10/19
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Original Buslogic version by SA1988 and Miran Grca.
@@ -87,7 +87,7 @@ int aha_do_log = ENABLE_AHA154X_LOG;
static void
aha_log(const char *fmt, ...)
{
#if ENABLE_AHA154X_LOG
#ifdef ENABLE_AHA154X_LOG
va_list ap;
if (aha_do_log) {

8
src/scsi/scsi_disk.c
View File

@@ -6,7 +6,7 @@
*
* Emulation of SCSI fixed and removable disks.
*
* Version: @(#)scsi_disk.c 1.0.17 2017/10/16
* Version: @(#)scsi_disk.c 1.0.18 2017/10/19
*
* Author: Miran Grca, <mgrca8@gmail.com>
*
@@ -447,13 +447,13 @@ uint8_t scsi_hd_mode_sense_pages_saved[HDD_NUM][0x40][0x40] =
[0x30] = { 0xB0, 0x16, '8', '6', 'B', 'o', 'x', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' } }
};
#ifdef ENABLE_SCSI_HD_LOG
int scsi_hd_do_log = ENABLE_SCSI_HD_LOG;
#ifdef ENABLE_SCSI_DISK_LOG
int scsi_hd_do_log = ENABLE_SCSI_DISK_LOG;
#endif
void scsi_hd_log(const char *format, ...)
{
#ifdef ENABLE_SCSI_HD_LOG
#ifdef ENABLE_SCSI_DISK_LOG
if (scsi_hd_do_log)
{
va_list ap;

7
src/scsi/scsi_ncr5380.c
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.4 2017/10/16
* Version: @(#)scsi_ncr5380.c 1.0.5 2017/10/19
*
* Authors: Sarah Walker, <tommowalker@tommowalker.co.uk>
* TheCollector1995, <mariogplayer@gmail.com>
@@ -37,9 +37,6 @@
#include "scsi_ncr5380.h"
//#define ENABLE_NCR5380_LOG 1
#define LCS6821N_ROM L"roms/scsi/ncr5380/Longshine LCS-6821N - BIOS version 1.04.bin"
#define RT1000B_ROM L"roms/scsi/ncr5380/Rancho_RT1000_RTBios_version_8.10R.bin"
#define T130B_ROM L"roms/scsi/ncr5380/trantor_t130b_bios_v2.14.bin"
@@ -155,7 +152,7 @@ int ncr5380_do_log = ENABLE_NCR5380_LOG;
static void
ncr_log(const char *fmt, ...)
{
#if ENABLE_NCR5380_LOG
#ifdef ENABLE_NCR5380_LOG
va_list ap;
if (ncr5380_do_log) {

4
src/scsi/scsi_x54x.c
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.2 2017/10/16
* Version: @(#)scsi_x54x.c 1.0.3 2017/10/19
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -70,7 +70,7 @@ int x54x_do_log = ENABLE_X54X_LOG;
static void
x54x_log(const char *fmt, ...)
{
#if ENABLE_X54X_LOG
#ifdef ENABLE_X54X_LOG
va_list ap;
if (x54x_do_log) {