Revert "Revert "Merge branch 'feature/machine_and_kb' into master""

This reverts commit f2cd3756dd.
2021-07-04 17:40:39 +02:00
parent 3b61d8a4d1
commit 4f6df76f10
77 changed files with 11883 additions and 3484 deletions
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -111,6 +111,8 @@ video_cards[] = {
    { "tvga9000b",		&tvga9000b_device			},
    { "tgkorvga",		&et4000k_isa_device			},
    { "et2000",			&et2000_device				},
+    { "et3000ax",		&et3000_isa_device			},
+    { "et4000ax_tc6058af",	&et4000_tc6058af_isa_device		},
    { "et4000ax",		&et4000_isa_device			},
    { "et4000w32",		&et4000w32_device			},
    { "et4000w32i",		&et4000w32i_isa_device			},