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

Removed a lot of useless #include's from a lot of files and reworked the SCSI #include's a bit to resolve the problem of scsi.h being a mess.

Browse Source
This commit is contained in:
OBattler
2018-10-02 22:54:28 +02:00
parent 512afda373
commit 647d78e4c2
63 changed files with 444 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/net_3c503.c
View File

@@ -8,7 +8,7 @@
* Implementation of the following network controllers:
* - 3Com Etherlink II 3c503 (ISA 8-bit).
*
* Version: @(#)net_3c503.c 1.0.0 2018/06/08
* Version: @(#)net_3c503.c 1.0.1 2018/10/02
*
* Based on @(#)3c503.cpp Carl (MAME)
*
@@ -49,8 +49,6 @@
#include <time.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../config.h"
#include "../machine/machine.h"
#include "../io.h"
#include "../dma.h"
#include "../pic.h"

8
src/network/net_ne2000.c
View File

@@ -13,7 +13,7 @@
* - Realtek RTL8019AS (ISA 16-bit, PnP);
* - Realtek RTL8029AS (PCI).
*
* Version: @(#)net_ne2000.c 1.0.8 2018/08/11
* Version: @(#)net_ne2000.c 1.0.9 2018/10/02
*
* Based on @(#)ne2k.cc v1.56.2.1 2004/02/02 22:37:22 cbothamy
*
@@ -53,8 +53,6 @@
#include <time.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../config.h"
#include "../machine/machine.h"
#include "../io.h"
#include "../mem.h"
#include "../rom.h"
@@ -166,7 +164,7 @@ nelog(int lvl, const char *fmt, ...)
static void
nic_interrupt(nic_t *dev, int set)
{
if (PCI && dev->is_pci) {
if (dev->is_pci) {
if (set)
pci_set_irq(dev->card, PCI_INTA);
else
@@ -1775,7 +1773,7 @@ nic_update_bios(nic_t *dev)
if (! dev->has_bios) return;
if (PCI && dev->is_pci)
if (dev->is_pci)
reg_bios_enable = dev->pci_bar[1].addr_regs[0] & 0x01;
/* PCI BIOS stuff, just enable_disable. */

3
src/network/net_pcap.c
View File

@@ -8,7 +8,7 @@
*
* Handle WinPcap library processing.
*
* Version: @(#)net_pcap.c 1.0.4 2018/04/29
* Version: @(#)net_pcap.c 1.0.5 2018/10/02
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -52,7 +52,6 @@
#include <wchar.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../config.h"
#include "../device.h"
#include "../plat.h"
#include "../plat_dynld.h"

3
src/network/net_slirp.c
View File

@@ -8,7 +8,7 @@
*
* Handle SLiRP library processing.
*
* Version: @(#)net_slirp.c 1.0.3 2018/04/29
* Version: @(#)net_slirp.c 1.0.4 2018/10/02
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -54,7 +54,6 @@
#include "slirp/slirp.h"
#include "slirp/queue.h"
#include "../86box.h"
#include "../config.h"
#include "../device.h"
#include "../plat.h"
#include "network.h"

7
src/network/net_wd8003.c
View File

@@ -11,7 +11,7 @@
* - SMC/WD 8013EBT (ISA 16-bit);
* - SMC/WD 8013EP/A (MCA).
*
* Version: @(#)net_wd8003.c 1.0.0 2018/07/19
* Version: @(#)net_wd8003.c 1.0.1 2018/10/02
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* TheCollector1995, <mariogplayer@gmail.com>
@@ -49,9 +49,6 @@
#include <time.h>
#define HAVE_STDARG_H
#include "../86box.h"
#include "../cpu/cpu.h"
#include "../config.h"
#include "../machine/machine.h"
#include "../io.h"
#include "../mem.h"
#include "../rom.h"
@@ -1008,7 +1005,7 @@ read_cr(wd_t *dev)
static void
write_cr(wd_t *dev, uint8_t val)
{
wdlog(3, "%s: wrote 0x%02x to CR, CS=%08x, PC=%08x\n", dev->name, val, CS, cpu_state.pc);
wdlog(3, "%s: wrote 0x%02x to CR\n", dev->name, val);
/* Validate remote-DMA */
if ((val & 0x38) == 0x00) {