From 99c81fe03d640f06d16682e67ad84110bcfa9406 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 29 Mar 2025 18:36:33 +0100
Subject: [PATCH] IBM PC/XT/AT and PB450: Remove "Device" from machine device_t
 names.

---
 src/machine/m_at.c           |  4 ++--
 src/machine/m_at_386dx_486.c |  2 +-
 src/machine/m_xt.c           | 12 ++++++------
 src/machine/m_xt_laserxt.c   | 11 +++++++----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/machine/m_at.c b/src/machine/m_at.c
index 3f5e88011..8a561630c 100644
--- a/src/machine/m_at.c
+++ b/src/machine/m_at.c
@@ -187,7 +187,7 @@ static const device_config_t ibmat_config[] = {
 };
 
 const device_t ibmat_device = {
-    .name          = " IBM AT Devices",
+    .name          = "IBM AT",
     .internal_name = "ibmat_device",
     .flags         = 0,
     .local         = 0,
@@ -294,7 +294,7 @@ static const device_config_t ibmxt286_config[] = {
 };
 
 const device_t ibmxt286_device = {
-    .name          = "IBM XT Model 286 Devices",
+    .name          = "IBM XT Model 286",
     .internal_name = "ibmxt286_device",
     .flags         = 0,
     .local         = 0,
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index 639233e10..0ee353f53 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -708,7 +708,7 @@ static const device_config_t pb450_config[] = {
 };
 
 const device_t pb450_device = {
-    .name          = "Packard Bell PB450 Devices",
+    .name          = "Packard Bell PB450",
     .internal_name = "pb450_device",
     .flags         = 0,
     .local         = 0,
diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c
index 78d2daa13..13f9c52ca 100644
--- a/src/machine/m_xt.c
+++ b/src/machine/m_xt.c
@@ -108,7 +108,7 @@ static const device_config_t ibmpc_config[] = {
 };
 
 const device_t ibmpc_device = {
-    .name          = "IBM PC (1981) Device",
+    .name          = "IBM PC (1981)",
     .internal_name = "ibmpc_device",
     .flags         = 0,
     .local         = 0,
@@ -218,7 +218,7 @@ static const device_config_t ibmpc82_config[] = {
 };
 
 const device_t ibmpc82_device = {
-    .name          = "IBM PC (1982) Devices",
+    .name          = "IBM PC (1982)",
     .internal_name = "ibmpc82_device",
     .flags         = 0,
     .local         = 0,
@@ -331,7 +331,7 @@ static const device_config_t ibmxt_config[] = {
 };
 
 const device_t ibmxt_device = {
-    .name          = "IBM XT (1982) Device",
+    .name          = "IBM XT (1982)",
     .internal_name = "ibmxt_device",
     .flags         = 0,
     .local         = 0,
@@ -451,7 +451,7 @@ static const device_config_t ibmxt86_config[] = {
 };
 
 const device_t ibmxt86_device = {
-    .name          = "IBM XT (1986) Device",
+    .name          = "IBM XT (1986)",
     .internal_name = "ibmxt86_device",
     .flags         = 0,
     .local         = 0,
@@ -624,7 +624,7 @@ static const device_config_t jukopc_config[] = {
 };
 
 const device_t jukopc_device = {
-    .name          = "Juko ST Devices",
+    .name          = "Juko ST",
     .internal_name = "jukopc_device",
     .flags         = 0,
     .local         = 0,
@@ -949,7 +949,7 @@ static const device_config_t vendex_config[] = {
 };
 
 const device_t vendex_device = {
-    .name          = "Vendex 888T Devices",
+    .name          = "Vendex 888T",
     .internal_name = "vendex_device",
     .flags         = 0,
     .local         = 0,
diff --git a/src/machine/m_xt_laserxt.c b/src/machine/m_xt_laserxt.c
index 877d26ff5..595cce1ca 100644
--- a/src/machine/m_xt_laserxt.c
+++ b/src/machine/m_xt_laserxt.c
@@ -154,6 +154,8 @@ machine_xt_laserxt_common_init(const machine_t *model,int is_lxt3)
     standalone_gameport_type = &gameport_device;
 
     laserxt_init(is_lxt3);
+
+    device_add(&keyboard_xt_lxt3_device);
 }
 
 int
@@ -167,8 +169,6 @@ machine_xt_laserxt_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    device_add(&keyboard_xt_device);
-
     machine_xt_laserxt_common_init(model, 0);
 
     return ret;
@@ -179,14 +179,17 @@ machine_xt_lxt3_init(const machine_t *model)
 {
     int ret;
 
+#if 0
     ret = bios_load_linear("roms/machines/lxt3/27c64d.bin",
                            0x000fe000, 8192, 0);
+#else
+    ret = bios_load_linear("roms/machines/lxt3/vtech-laser-xt3-bios-v1-26-27c64-637cfbe96dfa1809192278.bin",
+                           0x000fe000, 8192, 0);
+#endif
 
     if (bios_only || !ret)
         return ret;
 
-    device_add(&keyboard_xt_lxt3_device);
-
     machine_xt_laserxt_common_init(model, 1);
 
     return ret;