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

SCSI controller is now once again reset on soft reset, but this time this is handled in a more appropriate way;

Browse Source 
Fixed some copyright headers.
This commit is contained in:
OBattler
2017-06-14 03:03:29 +02:00
parent eb02faea83
commit eb8b8e3766
11 changed files with 115 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/scsi_aha154x.c
View File

@@ -12,7 +12,7 @@
*
* NOTE: THIS IS CURRENTLY A MESS, but will be cleaned up as I go.
*
* Version: @(#)scsi_aha154x.c 1.0.6 2017/05/06
* Version: @(#)scsi_aha154x.c 1.0.7 2017/06/14
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Original Buslogic version by SA1988 and Miran Grca.
@@ -179,6 +179,32 @@ static uint16_t aha_ports[] = {
0x0130, 0x0134, 0x0000, 0x0000
};
#ifdef WALTJE
int aha_do_log = 1;
# define ENABLE_AHA154X_LOG
#else
int aha_do_log = 0;
#endif
static void
aha_log(const char *format, ...)
{
#ifdef ENABLE_AHA154X_LOG
va_list ap;
if (aha_do_log) {
va_start(ap, format);
vprintf(format, ap);
va_end(ap);
fflush(stdout);
}
#endif
}
#define pclog aha_log
/*
* Write data to the BIOS space.
*
@@ -839,31 +865,6 @@ enum {
};
#ifdef WALTJE
int aha_do_log = 1;
# define ENABLE_AHA154X_LOG
#else
int aha_do_log = 0;
#endif
static void
aha_log(const char *format, ...)
{
#ifdef ENABLE_AHA154X_LOG
va_list ap;
if (aha_do_log) {
va_start(ap, format);
vprintf(format, ap);
va_end(ap);
fflush(stdout);
}
#endif
}
#define pclog aha_log
static void
ClearIntr(aha_t *dev)
{
@@ -2168,6 +2169,14 @@ void aha_mca_write(int port, uint8_t val, void *p)
}
void
aha_device_reset(void *p)
{
aha_t *dev = (aha_t *) p;
aha_reset_ctrl(dev, 1);
}
static void *
aha_init(int chip, int has_bios)
{