diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c index 198a3f9dc..4049f9dc7 100644 --- a/src/network/net_ne2000.c +++ b/src/network/net_ne2000.c @@ -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). diff --git a/src/network/net_ne2000.h b/src/network/net_ne2000.h index 800e62863..b623c10d9 100644 --- a/src/network/net_ne2000.h +++ b/src/network/net_ne2000.h @@ -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, */ @@ -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 */ }; diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index 8fb1a4851..0d76e8ff9 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -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, # Fred N. van Kempen, @@ -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