From 85eaaf9d2d120d9c0a4a67cdbe510f9ff2abe9d0 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 19 Dec 2021 19:54:23 -0500 Subject: [PATCH 1/4] Default UART to 16550 --- src/device/serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/device/serial.c b/src/device/serial.c index 7f93edb53..0186a997f 100644 --- a/src/device/serial.c +++ b/src/device/serial.c @@ -718,7 +718,7 @@ serial_set_next_inst(int ni) void serial_standalone_init(void) { for ( ; next_inst < 4; ) - device_add_inst(&i8250_device, next_inst + 1); + device_add_inst(&ns16550_device, next_inst + 1); }; From 89726bc1555844fffa7d8af36a7aaccaceb4e7a5 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 19 Dec 2021 19:54:54 -0500 Subject: [PATCH 2/4] XT UART to 8250 --- src/machine/m_xt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c index 1e4e7bd39..bd0f8dac0 100644 --- a/src/machine/m_xt.c +++ b/src/machine/m_xt.c @@ -8,6 +8,7 @@ #include <86box/pit.h> #include <86box/mem.h> #include <86box/device.h> +#include <86box/serial.h> #include <86box/fdd.h> #include <86box/fdc.h> #include <86box/fdc_ext.h> @@ -30,6 +31,10 @@ machine_xt_common_init(const machine_t *model) device_add(&fdc_xt_device); nmi_init(); + + device_add_inst(&i8250_device, 1); + device_add_inst(&i8250_device, 2); + standalone_gameport_type = &gameport_device; } From 8c4cd92490dec1956b4d894995bb14db7946011a Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 19 Dec 2021 19:55:05 -0500 Subject: [PATCH 3/4] AT UART to 16450 --- src/machine/m_at.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/machine/m_at.c b/src/machine/m_at.c index dc47b6207..61f6f4752 100644 --- a/src/machine/m_at.c +++ b/src/machine/m_at.c @@ -47,6 +47,7 @@ #include <86box/dma.h> #include <86box/mem.h> #include <86box/device.h> +#include <86box/serial.h> #include <86box/fdd.h> #include <86box/fdc.h> #include <86box/fdc_ext.h> @@ -79,6 +80,9 @@ machine_at_common_init_ex(const machine_t *model, int type) else if (type == 0) device_add(&at_nvr_device); + device_add_inst(&ns16450_device, 1); + device_add_inst(&ns16450_device, 2); + standalone_gameport_type = &gameport_device; } From 4f8d1a9ede79537a02d72dfc179bf10df061657e Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 19 Dec 2021 20:22:11 -0500 Subject: [PATCH 4/4] Revert "AT UART to 16450" This reverts commit 8c4cd92490dec1956b4d894995bb14db7946011a. --- src/machine/m_at.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/machine/m_at.c b/src/machine/m_at.c index 61f6f4752..dc47b6207 100644 --- a/src/machine/m_at.c +++ b/src/machine/m_at.c @@ -47,7 +47,6 @@ #include <86box/dma.h> #include <86box/mem.h> #include <86box/device.h> -#include <86box/serial.h> #include <86box/fdd.h> #include <86box/fdc.h> #include <86box/fdc_ext.h> @@ -80,9 +79,6 @@ machine_at_common_init_ex(const machine_t *model, int type) else if (type == 0) device_add(&at_nvr_device); - device_add_inst(&ns16450_device, 1); - device_add_inst(&ns16450_device, 2); - standalone_gameport_type = &gameport_device; }