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

Merge branch 'master' of https://github.com/86Box/86Box into qt

Browse Source
This commit is contained in:
ts-korhonen
2022-02-03 18:06:37 +02:00
parent 97b2feaa27 c7824e8ddc
commit df7a9f897e
232 changed files with 1228 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/net_3c503.c
View File

@@ -743,6 +743,7 @@ static const device_config_t threec503_config[] =
const device_t threec503_device = {
"3Com EtherLink II",
"3c503",
DEVICE_ISA,
0,
threec503_nic_init, threec503_nic_close, NULL,

1
src/network/net_dp8390.c
View File

@@ -1114,6 +1114,7 @@ dp8390_close(void *priv)
const device_t dp8390_device =
{
"DP8390 Network Interface Controller",
"dp8390",
0, 0,
dp8390_init, dp8390_close,
NULL, { NULL }, NULL, NULL

5
src/network/net_ne2000.c
View File

@@ -1330,6 +1330,7 @@ static const device_config_t mca_mac_config[] =
const device_t ne1000_device = {
"Novell NE1000",
"ne1k",
DEVICE_ISA,
NE2K_NE1000,
nic_init, nic_close, NULL,
@@ -1339,6 +1340,7 @@ const device_t ne1000_device = {
const device_t ne2000_device = {
"Novell NE2000",
"ne2k",
DEVICE_ISA | DEVICE_AT,
NE2K_NE2000,
nic_init, nic_close, NULL,
@@ -1348,6 +1350,7 @@ const device_t ne2000_device = {
const device_t ethernext_mc_device = {
"NetWorth EtherNext/MC",
"ethernextmc",
DEVICE_MCA,
NE2K_ETHERNEXT_MC,
nic_init, nic_close, NULL,
@@ -1357,6 +1360,7 @@ const device_t ethernext_mc_device = {
const device_t rtl8019as_device = {
"Realtek RTL8019AS",
"ne2kpnp",
DEVICE_ISA | DEVICE_AT,
NE2K_RTL8019AS,
nic_init, nic_close, NULL,
@@ -1366,6 +1370,7 @@ const device_t rtl8019as_device = {
const device_t rtl8029as_device = {
"Realtek RTL8029AS",
"ne2kpci",
DEVICE_PCI,
NE2K_RTL8029AS,
nic_init, nic_close, NULL,

8
src/network/net_pcnet.c
View File

@@ -3218,7 +3218,8 @@ static const device_config_t pcnet_vlb_config[] =
};
const device_t pcnet_am79c960_device = {
"AMD PCnet-ISA ",
"AMD PCnet-ISA",
"pcnetisa",
DEVICE_AT | DEVICE_ISA,
DEV_AM79C960,
pcnet_init, pcnet_close, NULL,
@@ -3228,6 +3229,7 @@ const device_t pcnet_am79c960_device = {
const device_t pcnet_am79c960_eb_device = {
"Racal Interlan EtherBlaster",
"pcnetracal",
DEVICE_AT | DEVICE_ISA,
DEV_AM79C960_EB,
pcnet_init, pcnet_close, NULL,
@@ -3237,6 +3239,7 @@ const device_t pcnet_am79c960_eb_device = {
const device_t pcnet_am79c960_vlb_device = {
"AMD PCnet-VL",
"pcnetvlb",
DEVICE_VLB,
DEV_AM79C960_VLB,
pcnet_init, pcnet_close, NULL,
@@ -3246,6 +3249,7 @@ const device_t pcnet_am79c960_vlb_device = {
const device_t pcnet_am79c961_device = {
"AMD PCnet-ISA+",
"pcnetisaplus",
DEVICE_AT | DEVICE_ISA,
DEV_AM79C961,
pcnet_init, pcnet_close, NULL,
@@ -3255,6 +3259,7 @@ const device_t pcnet_am79c961_device = {
const device_t pcnet_am79c970a_device = {
"AMD PCnet-PCI II",
"pcnetpci",
DEVICE_PCI,
DEV_AM79C970A,
pcnet_init, pcnet_close, NULL,
@@ -3264,6 +3269,7 @@ const device_t pcnet_am79c970a_device = {
const device_t pcnet_am79c973_device = {
"AMD PCnet-FAST III",
"pcnetfast",
DEVICE_PCI,
DEV_AM79C973,
pcnet_init, pcnet_close, NULL,

1
src/network/net_plip.c
View File

@@ -504,6 +504,7 @@ const lpt_device_t lpt_plip_device = {
const device_t plip_device = {
"Parallel Line Internet Protocol",
"plip",
DEVICE_LPT, 0,
plip_net_init, NULL,
NULL, { NULL }, NULL, NULL

5
src/network/net_wd8003.c
View File

@@ -1073,6 +1073,7 @@ static const device_config_t mca_mac_config[] =
const device_t wd8003e_device = {
"Western Digital WD8003E",
"wd8003e",
DEVICE_ISA,
WD8003E,
wd_init, wd_close, NULL,
@@ -1082,6 +1083,7 @@ const device_t wd8003e_device = {
const device_t wd8003eb_device = {
"Western Digital WD8003EB",
"wd8003eb",
DEVICE_ISA,
WD8003EB,
wd_init, wd_close, NULL,
@@ -1091,6 +1093,7 @@ const device_t wd8003eb_device = {
const device_t wd8013ebt_device = {
"Western Digital WD8013EBT",
"wd8013ebt",
DEVICE_ISA,
WD8013EBT,
wd_init, wd_close, NULL,
@@ -1100,6 +1103,7 @@ const device_t wd8013ebt_device = {
const device_t wd8003eta_device = {
"Western Digital WD8003ET/A",
"wd8003eta",
DEVICE_MCA,
WD8003ETA,
wd_init, wd_close, NULL,
@@ -1109,6 +1113,7 @@ const device_t wd8003eta_device = {
const device_t wd8003ea_device = {
"Western Digital WD8003E/A",
"wd8003ea",
DEVICE_MCA,
WD8003EA,
wd_init, wd_close, NULL,

60
src/network/network.c
View File

@@ -70,27 +70,37 @@
#include <86box/net_wd8003.h>
static const device_t net_none_device = {
"None",
"none",
0, NET_TYPE_NONE,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
NULL
};
static netcard_t net_cards[] = {
{ "none", NULL, NULL },
{ "3c503", &threec503_device, NULL },
{ "pcnetisa", &pcnet_am79c960_device, NULL },
{ "pcnetisaplus", &pcnet_am79c961_device, NULL },
{ "ne1k", &ne1000_device, NULL },
{ "ne2k", &ne2000_device, NULL },
{ "pcnetracal", &pcnet_am79c960_eb_device, NULL },
{ "ne2kpnp", &rtl8019as_device, NULL },
{ "wd8003e", &wd8003e_device, NULL },
{ "wd8003eb", &wd8003eb_device, NULL },
{ "wd8013ebt", &wd8013ebt_device, NULL },
{ "plip", &plip_device, NULL },
{ "ethernextmc", &ethernext_mc_device, NULL },
{ "wd8003eta", &wd8003eta_device, NULL },
{ "wd8003ea", &wd8003ea_device, NULL },
{ "pcnetfast", &pcnet_am79c973_device, NULL },
{ "pcnetpci", &pcnet_am79c970a_device, NULL },
{ "ne2kpci", &rtl8029as_device, NULL },
{ "pcnetvlb", &pcnet_am79c960_vlb_device, NULL },
{ "", NULL, NULL }
{ &net_none_device, NULL },
{ &threec503_device, NULL },
{ &pcnet_am79c960_device, NULL },
{ &pcnet_am79c961_device, NULL },
{ &ne1000_device, NULL },
{ &ne2000_device, NULL },
{ &pcnet_am79c960_eb_device, NULL },
{ &rtl8019as_device, NULL },
{ &wd8003e_device, NULL },
{ &wd8003eb_device, NULL },
{ &wd8013ebt_device, NULL },
{ &plip_device, NULL },
{ &ethernext_mc_device, NULL },
{ &wd8003eta_device, NULL },
{ &wd8003ea_device, NULL },
{ &pcnet_am79c973_device, NULL },
{ &pcnet_am79c970a_device, NULL },
{ &rtl8029as_device, NULL },
{ &pcnet_am79c960_vlb_device, NULL },
{ NULL, NULL }
};
@@ -649,7 +659,7 @@ network_card_has_config(int card)
char *
network_card_get_internal_name(int card)
{
return((char *)net_cards[card].internal_name);
return device_get_internal_name(net_cards[card].device);
}
@@ -659,13 +669,13 @@ network_card_get_from_internal_name(char *s)
{
int c = 0;
while (strlen((char *)net_cards[c].internal_name)) {
if (! strcmp((char *)net_cards[c].internal_name, s))
return(c);
while (net_cards[c].device != NULL) {
if (! strcmp((char *)net_cards[c].device->internal_name, s))
return(c);
c++;
}
return(-1);
return 0;
}