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

Another massive cleanup run. Ibm.h no longer includes system header files. ROM loading simplified, and moved from mem.c to rom.c. Fixes in Makefile. Corrected mamy wrong includes. Removed old junk from days long gone. First phase of new SCAT chipset driver - no longer gives errors in BIOS, but NOT DONE YET.

Browse Source
This commit is contained in:
waltje
2017-09-25 04:31:20 -04:00
parent 637ce66da2
commit 43b055b5ee
227 changed files with 2861 additions and 2082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/scsi/scsi.c
View File

@@ -8,7 +8,7 @@
*
* Handling of the SCSI controllers.
*
* Version: @(#)scsi.c 1.0.4 2017/09/03
* Version: @(#)scsi.c 1.0.5 2017/09/24
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -16,8 +16,11 @@
* Copyright 2016,2017 Miran Grca.
* Copyright 2017 Fred N. van Kempen.
*/
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../timer.h"

9
src/scsi/scsi_aha154x.c
View File

@@ -12,17 +12,18 @@
*
* NOTE: THIS IS CURRENTLY A MESS, but will be cleaned up as I go.
*
* Version: @(#)scsi_aha154x.c 1.0.17 2017/09/19
* Version: @(#)scsi_aha154x.c 1.0.18 2017/09/24
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Original Buslogic version by SA1988 and Miran Grca.
* Copyright 2017 Fred N. van Kempen.
*/
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#include "../ibm.h"
#include "../io.h"
#include "../mca.h"
@@ -1838,7 +1839,7 @@ aha_setbios(aha_t *dev)
/* Open the BIOS image file and make sure it exists. */
pclog_w(L"%S: loading BIOS from '%s'\n", dev->name, dev->bios_path);
if ((f = romfopen(dev->bios_path, L"rb")) == NULL) {
if ((f = rom_fopen(dev->bios_path, L"rb")) == NULL) {
pclog("%s: BIOS ROM not found!\n", dev->name);
return;
}

8
src/scsi/scsi_bios_command.c
View File

@@ -8,7 +8,7 @@
*
* The shared AHA and Buslogic SCSI BIOS command handler.
*
* Version: @(#)scsi_bios_command.c 1.0.1 2017/08/27
* Version: @(#)scsi_bios_command.c 1.0.2 2017/09/24
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -16,8 +16,12 @@
* Copyright 2017 Miran Grca.
* Copyright 2017 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>
#include "../ibm.h"
#include "../dma.h"
#include "scsi.h"

11
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.13 2017/09/19
* Version: @(#)scsi_buslogic.c 1.0.14 2017/09/24
*
* Authors: TheCollector1995, <mariogplayer@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -18,11 +18,12 @@
* Copyright 2016,2017 Miran Grca.
* Copyright 2017 Fred N. van Kempen.
*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"
@@ -2947,7 +2948,7 @@ BuslogicInit(int chip)
if (has_autoscsi_rom)
{
f = romfopen(autoscsi_rom_name, L"rb");
f = rom_fopen(autoscsi_rom_name, L"rb");
if (f)
{
fread(bl->AutoSCSIROM, 1, autoscsi_rom_size, f);
@@ -2958,7 +2959,7 @@ BuslogicInit(int chip)
if (has_scam_rom)
{
f = romfopen(scam_rom_name, L"rb");
f = rom_fopen(scam_rom_name, L"rb");
if (f)
{
fread(bl->SCAMData, 1, scam_rom_size, f);

6
src/scsi/scsi_device.c
View File

@@ -8,13 +8,17 @@
*
* The generic SCSI device command handler.
*
* Version: @(#)scsi_device.c 1.0.2 2017/09/03
* Version: @(#)scsi_device.c 1.0.3 2017/09/24
*
* Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
* Copyright 2016,2017 Miran Grca.
* Copyright 2017 Fred N. van Kempen.
*/
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <wchar.h>
#include "../ibm.h"
#include "../cdrom/cdrom.h"
#include "scsi.h"

6
src/scsi/scsi_disk.c
View File

@@ -6,15 +6,17 @@
*
* Emulation of SCSI fixed and removable disks.
*
* Version: @(#)scsi_disk.c 1.0.7 2017/09/03
* Version: @(#)scsi_disk.c 1.0.8 2017/09/24
*
* Author: Miran Grca, <mgrca8@gmail.com>
* Copyright 2017 Miran Grca.
*/
#include <stdint.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "../timer.h"