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

Merge remote-tracking branch 'origin/master' into version/4.2

Browse Source
This commit is contained in:
OBattler
2024-03-15 18:08:08 +01:00
parent 0c6c7d7da5 d5bf75e952
commit f2ff9e3637
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/net_ne2000.h
View File

@@ -39,7 +39,7 @@
enum { enum {
NE2K_NONE = 0, NE2K_NONE = 0,
NE2K_NE1000 = 1, /* 8-bit ISA NE1000 */ NE2K_NE1000 = 1, /* 8-bit ISA NE1000 */
NE2K_NE1000_COMPAT = 2, /* 16-bit ISA NE2000-Compatible */ NE2K_NE1000_COMPAT = 2, /* 8-bit ISA NE1000-Compatible */
NE2K_NE2000 = 3, /* 16-bit ISA NE2000 */ NE2K_NE2000 = 3, /* 16-bit ISA NE2000 */
NE2K_NE2000_COMPAT = 4, /* 16-bit ISA NE2000-Compatible */ NE2K_NE2000_COMPAT = 4, /* 16-bit ISA NE2000-Compatible */
NE2K_ETHERNEXT_MC = 5, /* 16-bit MCA EtherNext/MC */ NE2K_ETHERNEXT_MC = 5, /* 16-bit MCA EtherNext/MC */

2
src/network/net_ne2000.c
View File

@@ -1329,7 +1329,7 @@ static const device_config_t ne2000_config[] = {
.description = "IRQ", .description = "IRQ",
.type = CONFIG_SELECTION, .type = CONFIG_SELECTION,
.default_string = "", .default_string = "",
.default_int = 10, .default_int = 3,
.file_filter = "", .file_filter = "",
.spinner = { 0 }, .spinner = { 0 },
.selection = { .selection = {