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

Finished the NE1000 (per patch from TheCollector1995) and added the RTL8019AS ISA PnP, finalizing the work on NE1000/NE2000-compatible network cards;

Browse Source 
Disabled excess ZIP logging;
Applied the PCem video and SCAT commits;
Restored the video initialization line in pc.c back to where it was before.
This commit is contained in:
OBattler
2018-01-28 03:15:01 +01:00
parent cb9b6ed371
commit bd7e955b64
14 changed files with 892 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

876
src/network/net_ne2000.c
View File

File diff suppressed because it is too large Load Diff

13
src/network/net_ne2000.h
View File

@@ -8,7 +8,7 @@
*
* Definitions for the NE2000 ethernet controller.
*
* Version: @(#)net_ne2000.h 1.0.3 2017/05/17
* Version: @(#)net_ne2000.h 1.0.4 2018/01/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
@@ -16,13 +16,18 @@
# define NET_NE2000_H
#define NE2K_NE1000 1 /* 8bit ISA NE1000 */
#define NE2K_NE2000 2 /* 16bit ISA NE2000 */
#define NE2K_RTL8029AS 3 /* 32bi PCI Realtek 8029AS */
enum {
NE2K_NONE = 0,
NE2K_NE1000, /* 8bit ISA NE1000 */
NE2K_NE2000, /* 16bit ISA NE2000 */
NE2K_RTL8019AS, /* 16bit? ISA? PnP Realtek 8019AS */
NE2K_RTL8029AS /* 32bit PCI Realtek 8029AS */
};
extern device_t ne1000_device;
extern device_t ne2000_device;
extern device_t rtl8019as_device;
extern device_t rtl8029as_device;

14
src/network/network.c
View File

@@ -12,11 +12,11 @@
* it should be malloc'ed and then linked to the NETCARD def.
* Will be done later.
*
* Version: @(#)network.c 1.0.19 2017/11/04
* Version: @(#)network.c 1.0.20 2018/01/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2017 Fred N. van Kempen.
* Copyright 2017,2018 Fred N. van Kempen.
*/
#include <stdio.h>
#include <stdint.h>
@@ -34,13 +34,13 @@
static netcard_t net_cards[] = {
{ "None", "none", NULL,
NULL, NULL },
#if defined(DEV_BRANCH) && defined(USE_NE1000)
{ "Novell NE1000", "ne1k", &ne1000_device,
{ "[ISA] Novell NE1000", "ne1k", &ne1000_device,
NULL, NULL },
#endif
{ "Novell NE2000", "ne2k", &ne2000_device,
{ "[ISA] Novell NE2000", "ne2k", &ne2000_device,
NULL, NULL },
{ "Realtek RTL8029AS", "ne2kpci", &rtl8029as_device,
{ "[ISA] Realtek RTL8019AS", "ne2kpnp", &rtl8019as_device,
NULL, NULL },
{ "[PCI] Realtek RTL8029AS", "ne2kpci", &rtl8029as_device,
NULL, NULL },
{ "", "", NULL,
NULL, NULL }

12
src/network/network.h
View File

@@ -8,7 +8,7 @@
*
* Definitions for the network module.
*
* Version: @(#)network.h 1.0.10 2017/11/01
* Version: @(#)network.h 1.0.11 2018/01/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
@@ -23,9 +23,13 @@
#define NET_TYPE_SLIRP 2 /* use the SLiRP port forwarder */
/* Supported network cards. */
#define NE1000 1
#define NE2000 2
#define RTL8029AS 3
enum {
NONE = 0,
NE1000,
NE2000,
RTL8019AS,
RTL8029AS
};
typedef void (*NETRXCB)(void *, uint8_t *, int);