From e11bad193823bac012f944898471c67827debb1f Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 2 Apr 2022 18:14:24 -0400 Subject: [PATCH] src/machine --- src/machine/m_amstrad.c | 13 ++++++------- src/machine/m_at_compaq.c | 2 +- src/machine/m_europc.c | 4 ++-- src/machine/m_pcjr.c | 2 +- src/machine/m_tandy.c | 2 +- src/machine/m_xt_olivetti.c | 5 ++--- src/machine/m_xt_t1000_vid.c | 18 ++++++------------ src/machine/m_xt_xi8088.c | 2 +- 8 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c index ba6470120..e05d0d23e 100644 --- a/src/machine/m_amstrad.c +++ b/src/machine/m_amstrad.c @@ -669,7 +669,6 @@ vid_speed_change_1512(void *priv) recalc_timings_1512(vid); } - device_config_t vid_1512_config[] = { { .name = "display_type", @@ -720,7 +719,7 @@ device_config_t vid_1512_config[] = { { .description = "" } } }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t vid_1512_device = { @@ -903,7 +902,7 @@ device_config_t vid_1640_config[] = { { .description = "" } } }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t vid_1640_device = { @@ -1788,7 +1787,7 @@ device_config_t vid_200_config[] = { { .description = "" } } }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t vid_200_device = { @@ -1892,7 +1891,7 @@ device_config_t vid_ppc512_config[] = { .default_string = "", .default_int = 0 }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t vid_ppc512_device = { @@ -1930,7 +1929,7 @@ device_config_t vid_pc2086_config[] = { { .description = "" } } }, - { "", "", -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t vid_pc2086_device = { @@ -1968,7 +1967,7 @@ device_config_t vid_pc3086_config[] = { { .description = "" } } }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t vid_pc3086_device = { diff --git a/src/machine/m_at_compaq.c b/src/machine/m_at_compaq.c index 851230bc8..76d54286f 100644 --- a/src/machine/m_at_compaq.c +++ b/src/machine/m_at_compaq.c @@ -716,7 +716,7 @@ const device_config_t compaq_plasma_config[] = { { .description = "" } } }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t compaq_plasma_device = { diff --git a/src/machine/m_europc.c b/src/machine/m_europc.c index 921feda2b..2c035ded1 100644 --- a/src/machine/m_europc.c +++ b/src/machine/m_europc.c @@ -678,10 +678,10 @@ static const device_config_t europc_config[] = { .selection = { { .description = "Disabled (250h)", .value = 0 }, { .description = "Enabled (350h)", .value = 1 }, - { "" } + { .description = "" } }, }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; const device_t europc_device = { diff --git a/src/machine/m_pcjr.c b/src/machine/m_pcjr.c index c6b38d572..4836da1bc 100644 --- a/src/machine/m_pcjr.c +++ b/src/machine/m_pcjr.c @@ -784,7 +784,7 @@ static const device_config_t pcjr_config[] = { { .description = "" } } }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t pcjr_device = { diff --git a/src/machine/m_tandy.c b/src/machine/m_tandy.c index 894cae784..39e5fe844 100644 --- a/src/machine/m_tandy.c +++ b/src/machine/m_tandy.c @@ -1157,7 +1157,7 @@ static const device_config_t vid_config[] = { { .description = "" } } }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_t vid_device = { diff --git a/src/machine/m_xt_olivetti.c b/src/machine/m_xt_olivetti.c index 9cb6bfc68..a8743cfc5 100644 --- a/src/machine/m_xt_olivetti.c +++ b/src/machine/m_xt_olivetti.c @@ -586,7 +586,6 @@ m19_vid_init(m19_vid_t *vid) device_context_restore(); } - const device_t m24_kbd_device = { .name = "Olivetti M24 keyboard and mouse", .internal_name = "m24_kbd", @@ -616,7 +615,7 @@ const device_config_t m19_vid_config[] = { { .description = "Green Monochrome", .value = 1 }, { .description = "Amber Monochrome", .value = 2 }, { .description = "Gray Monochrome", .value = 3 }, - { .description = "" } + { .description = "" } } }, { @@ -626,7 +625,7 @@ const device_config_t m19_vid_config[] = { .default_string = "", .default_int = 1, }, - { .name = "", .description = "", .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; const device_t m19_vid_device = { diff --git a/src/machine/m_xt_t1000_vid.c b/src/machine/m_xt_t1000_vid.c index b2dcce64d..817b54042 100644 --- a/src/machine/m_xt_t1000_vid.c +++ b/src/machine/m_xt_t1000_vid.c @@ -745,16 +745,9 @@ static const device_config_t t1000_config[] = { .name = "display_language", .description = "Language", .type = CONFIG_SELECTION, - .selection = - { - { - .description = "USA", - .value = 0 - }, - { - .description = "Danish", - .value = 1 - } + .selection = { + { .description = "USA", .value = 0 }, + { .description = "Danish", .value = 1 } }, .default_int = 0 }, @@ -763,7 +756,8 @@ static const device_config_t t1000_config[] = { .description = "Enable backlight", .type = CONFIG_BINARY, .default_string = "", - .default_int = 1 }, + .default_int = 1 + }, { .name = "invert", .description = "Invert colors", @@ -771,7 +765,7 @@ static const device_config_t t1000_config[] = { .default_string = "", .default_int = 0 }, - { .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; const device_t t1000_video_device = { diff --git a/src/machine/m_xt_xi8088.c b/src/machine/m_xt_xi8088.c index ea778a023..ef5d45163 100644 --- a/src/machine/m_xt_xi8088.c +++ b/src/machine/m_xt_xi8088.c @@ -160,7 +160,7 @@ static const device_config_t xi8088_config[] = { .type = CONFIG_BINARY, .default_int = 0 }, - { .type = -1 } + { .name = "", .description = "", .type = CONFIG_END } }; const device_t xi8088_device = {