80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Updated the headers of net_ne2000.c/h to reflect the fact the NE1000 is no longer in the Dev branch and removed the NE1000-related things from the makefile.

Browse Source
This commit is contained in:
OBattler
2018-01-28 12:15:57 +01:00
parent a35c4f350f
commit 97cc1774f6
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/net_ne2000.c
View File

@@ -7,7 +7,7 @@
* This file is part of the 86Box distribution.
*
* Implementation of the following network controllers:
* - Novell NE1000 (ISA 8-bit) (Dev branch);
* - Novell NE1000 (ISA 8-bit);
* - Novell NE2000 (ISA 16-bit);
* - Realtek RTL8019AS (ISA 16-bit, PnP);
* - Realtek RTL8029AS (PCI).

10
src/network/net_ne2000.h
View File

@@ -8,7 +8,7 @@
*
* Definitions for the NE2000 ethernet controller.
*
* Version: @(#)net_ne2000.h 1.0.4 2018/01/26
* Version: @(#)net_ne2000.h 1.0.5 2018/01/28
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*/
@@ -18,10 +18,10 @@
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 */
NE2K_NE1000, /* 8-bit ISA NE1000 */
NE2K_NE2000, /* 16-bit ISA NE2000 */
NE2K_RTL8019AS, /* 16-bit ISA PnP Realtek 8019AS */
NE2K_RTL8029AS /* 32-bit PCI Realtek 8029AS */
};

10
src/win/Makefile.mingw
View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.94 2018/01/25
# Version: @(#)Makefile.mingw 1.0.95 2018/01/28
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -71,9 +71,6 @@ endif
ifndef I686
I686 := n
endif
ifndef NE1000
NE1000 := n
endif
ifndef NV_RIVA
NV_RIVA := n
endif
@@ -115,7 +112,6 @@ DEV_BRANCH := y
CIRRUS := y
GREENB := y
I686 := y
NE1000 := y
NV_RIVA := y
PAS16 := y
PORTABLE3 := y
@@ -323,10 +319,6 @@ OPTS += -DUSE_I686
DEVBROBJ += m_at_440fx.o
endif
ifeq ($(NE1000), y)
OPTS += -DUSE_NE1000
endif
ifeq ($(NV_RIVA), y)
OPTS += -DUSE_RIVA
DEVBROBJ += vid_nv_riva128.o