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

A lot of fixes - everything now seems to work properly.

Browse Source
This commit is contained in:
OBattler
2022-02-03 03:10:06 +01:00
parent 296e25c685
commit 6f2b93923c
59 changed files with 551 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/net_3c503.c
View File

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

10
src/network/net_ne2000.c
View File

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

14
src/network/net_pcnet.c
View File

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

24
src/network/network.c
View File

@@ -72,7 +72,7 @@
static const device_t net_none_device = {
"None",
"net_none",
"none",
0, NET_TYPE_NONE,
NULL, NULL, NULL,
{ NULL }, NULL, NULL,
@@ -81,23 +81,23 @@ static const device_t net_none_device = {
static netcard_t net_cards[] = {
{ &net_none_device, NULL },
{ &net_none_device, NULL },
{ &threec503_device, NULL },
{ &pcnet_am79c960_device, NULL },
{ &pcnet_am79c961_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 },
{ &wd8003e_device, NULL },
{ &wd8003eb_device, NULL },
{ &wd8013ebt_device, NULL },
{ &plip_device, NULL },
{ &ethernext_mc_device, NULL },
{ &wd8003eta_device, NULL },
{ &wd8003ea_device, NULL },
{ &wd8003ea_device, NULL },
{ &pcnet_am79c973_device, NULL },
{ &pcnet_am79c970a_device, NULL },
{ &pcnet_am79c970a_device, NULL },
{ &rtl8029as_device, NULL },
{ &pcnet_am79c960_vlb_device, NULL },
{ NULL, NULL }
@@ -659,7 +659,7 @@ network_card_has_config(int card)
char *
network_card_get_internal_name(int card)
{
return((char *)net_cards[card].device->internal_name);
return device_get_internal_name(net_cards[card].device);
}
@@ -669,13 +669,13 @@ network_card_get_from_internal_name(char *s)
{
int c = 0;
while (strlen((char *)net_cards[c].device->internal_name)) {
while (net_cards[c].device != NULL) {
if (! strcmp((char *)net_cards[c].device->internal_name, s))
return(c);
return(c);
c++;
}
return(-1);
return 0;
}