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

10
src/network/net_ne2000.c
View File

@@ -10,7 +10,7 @@
*
* NOTE: The file will also implement an NE1000 for 8-bit ISA systems.
*
* Version: @(#)net_ne2000.c 1.0.14 2017/09/03
* Version: @(#)net_ne2000.c 1.0.15 2017/09/24
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Peter Grehan, grehan@iprg.nokia.com>
@@ -19,10 +19,12 @@
* Based on @(#)ne2k.cc v1.56.2.1 2004/02/02 22:37:22 cbothamy
* Portions Copyright (C) 2002 MandrakeSoft S.A.
*/
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
#include <wchar.h>
#include <time.h>
#include "../config.h"
#include "../ibm.h"
@@ -1855,7 +1857,7 @@ nic_rom_init(nic_t *dev, wchar_t *s)
}
if (dev->bios_addr > 0) {
if ((f = romfopen(s, L"rb")) != NULL) {
if ((f = rom_fopen(s, L"rb")) != NULL) {
fseek(f, 0L, SEEK_END);
temp = ftell(f);
fclose(f);

7
src/network/net_pcap.c
View File

@@ -8,14 +8,15 @@
*
* Handle WinPcap library processing.
*
* Version: @(#)net_pcap.c 1.0.5 2017/06/04
* Version: @(#)net_pcap.c 1.0.6 2017/09/24
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include <pcap.h>
#include "../ibm.h"
#include "../config.h"

7
src/network/net_slirp.c
View File

@@ -8,14 +8,15 @@
*
* Handle SLiRP library processing.
*
* Version: @(#)net_slirp.c 1.0.4 2017/06/14
* Version: @(#)net_slirp.c 1.0.5 2017/09/24
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "slirp/slirp.h"
#include "slirp/queue.h"
#include "../ibm.h"

9
src/network/network.c
View File

@@ -12,19 +12,20 @@
* it should be malloc'ed and then linked to the NETCARD def.
* Will be done later.
*
* Version: @(#)network.c 1.0.10 2017/06/14
* Version: @(#)network.c 1.0.11 2017/09/24
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../ibm.h"
#include "../device.h"
#include "../win/plat_ui.h"
#include "network.h"
#include "net_ne2000.h"
#include "../win/plat_ui.h"
static netcard_t net_cards[] = {