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

Another big change, this time to the NVR. It has been re-done, integrated with the RTC code, and is now ready to be used by other, non-AT-compatible systems, including an ISA card for PC/XT.

Browse Source
This commit is contained in:
waltje
2017-10-03 16:26:55 -04:00
parent a1b3c33054
commit 633adc6b02
31 changed files with 1027 additions and 911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/scsi/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.18 2017/09/24
* Version: @(#)scsi_aha154x.c 1.0.19 2017/10/02
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Original Buslogic version by SA1988 and Miran Grca.
@@ -1838,7 +1838,7 @@ aha_setbios(aha_t *dev)
if (dev->bios_path == NULL) return;
/* Open the BIOS image file and make sure it exists. */
pclog_w(L"%S: loading BIOS from '%s'\n", dev->name, dev->bios_path);
pclog("%s: loading BIOS from '%ws'\n", dev->name, dev->bios_path);
if ((f = rom_fopen(dev->bios_path, L"rb")) == NULL) {
pclog("%s: BIOS ROM not found!\n", dev->name);
return;

6
src/scsi/scsi_buslogic.c
View File

@@ -10,7 +10,7 @@
* 0 - BT-545C ISA;
* 1 - BT-958D PCI (but BT-545C ISA on non-PCI machines)
*
* Version: @(#)scsi_buslogic.c 1.0.14 2017/09/24
* Version: @(#)scsi_buslogic.c 1.0.15 2017/10/02
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -733,7 +733,7 @@ static void BuslogicInitializeAutoSCSIRam(Buslogic_t *bl)
{
FILE *f;
f = nvrfopen(BuslogicGetNVRFileName(bl), L"rb");
f = nvr_fopen(BuslogicGetNVRFileName(bl), L"rb");
if (f)
{
fread(&(bl->LocalRAM.structured.autoSCSIData), 1, 64, f);
@@ -2068,7 +2068,7 @@ BuslogicWrite(uint16_t Port, uint8_t Val, void *p)
BuslogicAutoSCSIRamSetDefaults(bl, 3);
break;
case 1:
f = nvrfopen(BuslogicGetNVRFileName(bl), L"wb");
f = nvr_fopen(BuslogicGetNVRFileName(bl), L"wb");
if (f)
{
fwrite(&(bl->LocalRAM.structured.autoSCSIData), 1, 64, f);