From 8e20b02d76b6d51cb523862ea279cadbc274bf54 Mon Sep 17 00:00:00 2001 From: Ompronce <88358700+Ompronce@users.noreply.github.com> Date: Sat, 28 Feb 2026 02:21:25 -0400 Subject: [PATCH 1/2] Added additional firmware version of CR-563 CD-ROM drive (0.74) This is based on the image seen on this Vogons Wiki page: https://www.vogonswiki.com/index.php/Matsushita_MKE https://www.vogonswiki.com/images/d/df/Matsushita_MKE_driver_screenshot.png --- src/include/86box/cdrom.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/86box/cdrom.h b/src/include/86box/cdrom.h index fb157ba66..00eba5b44 100644 --- a/src/include/86box/cdrom.h +++ b/src/include/86box/cdrom.h @@ -239,7 +239,8 @@ static const struct cdrom_drive_types_s { { "MATSHITA", "CR-562", "0.75", "cr562", BUS_TYPE_MKE , 0, 2, 0, 0, 0, { -1, -1, -1, -1 } }, { "MATSHITA", "CR-562", "0.76", "cr562_076", BUS_TYPE_MKE , 0, 2, 0, 0, 0, { -1, -1, -1, -1 } }, { "MATSHITA", "CR-562", "0.80", "cr562_080", BUS_TYPE_MKE , 0, 2, 0, 0, 0, { -1, -1, -1, -1 } }, - { "MATSHITA", "CR-563", "0.75", "cr563", BUS_TYPE_MKE , 0, 2, 0, 0, 0, { -1, -1, -1, -1 } }, + { "MATSHITA", "CR-563", "0.74", "cr563", BUS_TYPE_MKE , 0, 2, 0, 0, 0, { -1, -1, -1, -1 } }, + { "MATSHITA", "CR-563", "0.75", "cr563_075", BUS_TYPE_MKE , 0, 2, 0, 0, 0, { -1, -1, -1, -1 } }, { "MATSHITA", "CR-563", "0.80", "cr563_080", BUS_TYPE_MKE , 0, 2, 0, 0, 0, { -1, -1, -1, -1 } }, { "", "", "", "", BUS_TYPE_NONE, 0, -1, 0, 0, 0, { -1, -1, -1, -1 } } }; From 0378b3fb3460d19cde2b0a0293f194e0d1aac1a6 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 28 Feb 2026 14:43:02 +0500 Subject: [PATCH 2/2] Don't add AT NVR on SiS 496-based machines Fixes a segfault on startup --- src/machine/machine_table.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index d6bbb0ee7..acbeac10f 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -11250,8 +11250,8 @@ const machine_t machines[] = { .default_jumpered_ecp_dma = 3, .kbc_device = &kbc_at_device, .kbc_params = KBC_VEN_ACER | 0x00004200, - .nvr_device = &nvr_at_device, - .nvr_params = NVR_AT, + .nvr_device = NULL, + .nvr_params = 0x00000000, .sio_device = NULL, .sio_params = 0x00000000, .kbc_p1 = 0x004008f0, @@ -11297,8 +11297,8 @@ const machine_t machines[] = { .default_jumpered_ecp_dma = 3, .kbc_device = &kbc_at_device, .kbc_params = KBC_VEN_AMI | 0x00004800, - .nvr_device = &nvr_at_device, - .nvr_params = NVR_AT, + .nvr_device = NULL, + .nvr_params = 0x00000000, .sio_device = NULL, .sio_params = 0x00000000, .kbc_p1 = 0x00000cf0, @@ -11344,8 +11344,8 @@ const machine_t machines[] = { .default_jumpered_ecp_dma = 3, .kbc_device = &kbc_at_device, .kbc_params = KBC_VEN_AMI | 0x00004800, - .nvr_device = &nvr_at_device, - .nvr_params = NVR_AT, + .nvr_device = NULL, + .nvr_params = 0x00000000, .sio_device = NULL, .sio_params = 0x00000000, .kbc_p1 = 0x00000cf0, @@ -11391,8 +11391,8 @@ const machine_t machines[] = { .default_jumpered_ecp_dma = 3, .kbc_device = &kbc_at_device, .kbc_params = KBC_VEN_VIA | 0x00424600, - .nvr_device = &nvr_at_device, - .nvr_params = NVR_AT, + .nvr_device = NULL, + .nvr_params = 0x00000000, .sio_device = NULL, .sio_params = 0x00000000, .kbc_p1 = 0x00000cf0, @@ -11438,8 +11438,8 @@ const machine_t machines[] = { .default_jumpered_ecp_dma = 3, .kbc_device = &kbc_at_device, .kbc_params = KBC_VEN_AMI | 0x00004800, - .nvr_device = &nvr_at_device, - .nvr_params = NVR_AT, + .nvr_device = NULL, + .nvr_params = 0x00000000, .sio_device = NULL, .sio_params = 0x00000000, .kbc_p1 = 0x000004f0, @@ -11486,8 +11486,8 @@ const machine_t machines[] = { .default_jumpered_ecp_dma = 3, .kbc_device = &kbc_at_device, .kbc_params = KBC_VEN_HOLTEK | 0x00004800, - .nvr_device = &nvr_at_device, - .nvr_params = NVR_AT, + .nvr_device = NULL, + .nvr_params = 0x00000000, .sio_device = NULL, .sio_params = 0x00000000, .kbc_p1 = 0x00000cf0, @@ -11534,8 +11534,8 @@ const machine_t machines[] = { .default_jumpered_ecp_dma = 3, .kbc_device = &kbc_at_device, .kbc_params = KBC_VEN_HOLTEK | 0x00004800, - .nvr_device = &nvr_at_device, - .nvr_params = NVR_AT, + .nvr_device = NULL, + .nvr_params = 0x00000000, .sio_device = NULL, .sio_params = 0x00000000, .kbc_p1 = 0x00000cf0, @@ -11582,8 +11582,8 @@ const machine_t machines[] = { .default_jumpered_ecp_dma = 3, .kbc_device = &kbc_at_device, .kbc_params = KBC_VEN_AMI | 0x00004800, - .nvr_device = &nvr_at_device, - .nvr_params = NVR_AT, + .nvr_device = NULL, + .nvr_params = 0x00000000, .sio_device = NULL, .sio_params = 0x00000000, .kbc_p1 = 0x00000cf0,