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 } } }; diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index de3d2a88c..56f105997 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,