Merge remote-tracking branch 'upstream/master' into version/4.1

2023-10-07 16:40:58 -04:00
parent 6b52843a80 9d1d69394b
commit ca45c58c59
47 changed files with 3643 additions and 2829 deletions
--- a/src/network/network.c
+++ b/src/network/network.c
@@ -96,8 +96,23 @@ static const device_t net_none_device = {
    .config        = NULL
 };

+static const device_t net_internal_device = {
+    .name          = "Internal",
+    .internal_name = "internal",
+    .flags         = 0,
+    .local         = NET_TYPE_NONE,
+    .init          = NULL,
+    .close         = NULL,
+    .reset         = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw  = NULL,
+    .config        = NULL
+};
+
 static const device_t *net_cards[] = {
    &net_none_device,
+    &net_internal_device,
    &threec501_device,
    &threec503_device,
    &pcnet_am79c960_device,