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

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

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;
}