diff --git a/src/device/bugger.c b/src/device/bugger.c index 6f2b64e65..214f8acb8 100644 --- a/src/device/bugger.c +++ b/src/device/bugger.c @@ -351,7 +351,7 @@ static void bug_close(UNUSED(void *priv)) { io_removehandler(BUGGER_ADDR, BUGGER_ADDRLEN, - bug_read, NULL, NULL, bug_write, NULL, NULL, NULL); + bug_read, NULL, NULL, bug_write, NULL, NULL, NULL); } diff --git a/src/device/isamem.c b/src/device/isamem.c index 70ef32024..9b1ee7090 100644 --- a/src/device/isamem.c +++ b/src/device/isamem.c @@ -676,22 +676,20 @@ isamem_close(void *priv) free(dev); } - -static const device_config_t ibmxt_config[] = -{ - { - "size", "Memory Size", CONFIG_SPINNER, "", 128, "", - { 0, 512, 16 }, - { { 0 } } - }, - { - "start", "Start Address", CONFIG_SPINNER, "", 256, "", - { 0, 576, 64 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t ibmxt_config[] = { +// clang-format off + { + "size", "Memory Size", CONFIG_SPINNER, "", 128, "", + { 0, 512, 16 }, + { { 0 } } + }, + { + "start", "Start Address", CONFIG_SPINNER, "", 256, "", + { 0, 576, 64 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t ibmxt_device = { @@ -704,22 +702,20 @@ static const device_t ibmxt_device = { ibmxt_config }; - -static const device_config_t genericxt_config[] = -{ - { - "size", "Memory Size", CONFIG_SPINNER, "", 16, "", - { 0, 640, 16 }, - { { 0 } } - }, - { - "start", "Start Address", CONFIG_SPINNER, "", 0, "", - { 0, 624, 16 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t genericxt_config[] = { +// clang-format off + { + "size", "Memory Size", CONFIG_SPINNER, "", 16, "", + { 0, 640, 16 }, + { { 0 } } + }, + { + "start", "Start Address", CONFIG_SPINNER, "", 0, "", + { 0, 624, 16 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t genericxt_device = { @@ -733,21 +729,20 @@ static const device_t genericxt_device = { }; -static const device_config_t ibmat_config[] = -{ - { - "size", "Memory Size", CONFIG_SPINNER, "", 512, "", - { 0, 12288, 512 }, - { { 0 } } - }, - { - "start", "Start Address", CONFIG_SPINNER, "", 512, "", - { 0, 15872, 512 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t ibmat_config[] = { +// clang-format off + { + "size", "Memory Size", CONFIG_SPINNER, "", 512, "", + { 0, 12288, 512 }, + { { 0 } } + }, + { + "start", "Start Address", CONFIG_SPINNER, "", 512, "", + { 0, 15872, 512 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t ibmat_device = { @@ -761,21 +756,20 @@ static const device_t ibmat_device = { }; -static const device_config_t genericat_config[] = -{ - { - "size", "Memory Size", CONFIG_SPINNER, "", 512, "", - { 0, 16384, 512 }, - { { 0 } } - }, - { - "start", "Start Address", CONFIG_SPINNER, "", 512, "", - { 0, 15872, 128 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t genericat_config[] = { +// clang-format off + { + "size", "Memory Size", CONFIG_SPINNER, "", 512, "", + { 0, 16384, 512 }, + { { 0 } } + }, + { + "start", "Start Address", CONFIG_SPINNER, "", 512, "", + { 0, 15872, 128 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t genericat_device = { @@ -789,21 +783,20 @@ static const device_t genericat_device = { }; -static const device_config_t p5pak_config[] = -{ - { - "size", "Memory Size", CONFIG_SPINNER, "", 128, "", - { 0, 384, 64 }, - { { 0 } } - }, - { - "start", "Start Address", CONFIG_SPINNER, "", 512, "", - { 64, 576, 64 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t p5pak_config[] = { +// clang-format off + { + "size", "Memory Size", CONFIG_SPINNER, "", 128, "", + { 0, 384, 64 }, + { { 0 } } + }, + { + "start", "Start Address", CONFIG_SPINNER, "", 512, "", + { 64, 576, 64 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t p5pak_device = { @@ -817,21 +810,20 @@ static const device_t p5pak_device = { }; -static const device_config_t a6pak_config[] = -{ - { - "size", "Memory Size", CONFIG_SPINNER, "", 64, "", - { 0, 576, 64 }, - { { 0 } } - }, - { - "start", "Start Address", CONFIG_SPINNER, "", 256, "", - { 64, 512, 64 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t a6pak_config[] = { +// clang-format off + { + "size", "Memory Size", CONFIG_SPINNER, "", 64, "", + { 0, 576, 64 }, + { { 0 } } + }, + { + "start", "Start Address", CONFIG_SPINNER, "", 256, "", + { 64, 512, 64 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t a6pak_device = { @@ -845,40 +837,26 @@ static const device_t a6pak_device = { }; -static const device_config_t ems5150_config[] = -{ - { - "size", "Memory Size", CONFIG_SPINNER, "", 256, - "", - { 0, 2048, 64 }, - { { 0 } } - }, - { - "base", "Address", CONFIG_HEX16, "", 0, "", { 0 }, - { - { - "Disabled", 0 - }, - { - "Board 1", 0x0208 - }, - { - "Board 2", 0x020a - }, - { - "Board 3", 0x020c - }, - { - "Board 4", 0x020e - }, - { - "" - } - }, - }, - { - "", "", -1 - } +static const device_config_t ems5150_config[] = { +// clang-format off + { + "size", "Memory Size", CONFIG_SPINNER, "", 256, "", + { 0, 2048, 64 }, + { { 0 } } + }, + { + "base", "Address", CONFIG_HEX16, "", 0, "", { 0 }, + { + { "Disabled", 0x0000 }, + { "Board 1", 0x0208 }, + { "Board 2", 0x020a }, + { "Board 3", 0x020c }, + { "Board 4", 0x020e }, + { "" } + }, + }, + { "", "", -1 } +// clang-format on }; static const device_t ems5150_device = { @@ -891,98 +869,62 @@ static const device_t ems5150_device = { ems5150_config }; - -static const device_config_t ev159_config[] = -{ - { - "size", "Memory Size", CONFIG_SPINNER, "", 512, "", - { 0, 3072, 512 }, - { { 0 } } - }, - { - "start", "Start Address", CONFIG_SPINNER, "", 0, "", - { 0, 16128, 128 }, - { { 0 } } - }, - { - "length", "Contiguous Size", CONFIG_SPINNER, "", 0, "", - { 0, 16384, 128 }, - { { 0 } } - }, - { - "width", "I/O Width", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "8-bit", 0 - }, - { - "16-bit", 1 - }, - { - "" - } - }, - }, - { - "speed", "Transfer Speed", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Standard (150ns)", 0 - }, - { - "High-Speed (120ns)", 1 - }, - { - "" - } - } - }, - { - "ems", "EMS mode", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Disabled", 0 - }, - { - "Enabled", 1 - }, - { - "" - } - }, - }, - { - "base", "Address", CONFIG_HEX16, "", 0x0258, "", { 0 }, - { - { - "208H", 0x0208 - }, - { - "218H", 0x0218 - }, - { - "258H", 0x0258 - }, - { - "268H", 0x0268 - }, - { - "2A8H", 0x02A8 - }, - { - "2B8H", 0x02B8 - }, - { - "2E8H", 0x02E8 - }, - { - "" - } - }, - }, - { - "", "", -1 - } +static const device_config_t ev159_config[] = { +// clang-format off + { + "size", "Memory Size", CONFIG_SPINNER, "", 512, "", + { 0, 3072, 512 }, + { { 0 } } + }, + { + "start", "Start Address", CONFIG_SPINNER, "", 0, "", + { 0, 16128, 128 }, + { { 0 } } + }, + { + "length", "Contiguous Size", CONFIG_SPINNER, "", 0, "", + { 0, 16384, 128 }, + { { 0 } } + }, + { + "width", "I/O Width", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "8-bit", 0 }, + { "16-bit", 1 }, + { "" } + }, + }, + { + "speed", "Transfer Speed", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Standard (150ns)", 0 }, + { "High-Speed (120ns)", 1 }, + { "" } + } + }, + { + "ems", "EMS mode", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Disabled", 0 }, + { "Enabled", 1 }, + { "" } + }, + }, + { + "base", "Address", CONFIG_HEX16, "", 0x0258, "", { 0 }, + { + { "208H", 0x0208 }, + { "218H", 0x0218 }, + { "258H", 0x0258 }, + { "268H", 0x0268 }, + { "2A8H", 0x02A8 }, + { "2B8H", 0x02B8 }, + { "2E8H", 0x02E8 }, + { "" } + }, + }, + { "", "", -1 } +// clang-format on }; static const device_t ev159_device = { @@ -995,84 +937,52 @@ static const device_t ev159_device = { ev159_config }; - #if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT) -static const device_config_t brat_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x0258, "", { 0 }, - { - { - "208H", 0x0208 - }, - { - "218H", 0x0218 - }, - { - "258H", 0x0258 - }, - { - "268H", 0x0268 - }, - { - "" - } - }, - }, - { - "frame", "Frame Address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { - "Disabled", 0x00000 - }, - { - "D000H", 0xD0000 - }, - { - "E000H", 0xE0000 - }, - { - "" - } - }, - }, - { - "width", "I/O Width", CONFIG_SELECTION, "", 8, "", { 0 }, - { - { - "8-bit", 8 - }, - { - "16-bit", 16 - }, - { - "" - } - }, - }, - { - "speed", "Transfer Speed", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Standard", 0 - }, - { - "High-Speed", 1 - }, - { - "" - } - } - }, - { - "size", "Memory Size", CONFIG_SPINNER, "", 128, - "", - { 0, 8192, 512 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t brat_config[] = { +// clang-format off + { + "base", "Address", CONFIG_HEX16, "", 0x0258, "", { 0 }, + { + { "208H", 0x0208 }, + { "218H", 0x0218 }, + { "258H", 0x0258 }, + { "268H", 0x0268 }, + { "" } + }, + }, + { + "frame", "Frame Address", CONFIG_HEX20, "", 0, "", { 0 }, + { + { "Disabled", 0x00000 }, + { "D000H", 0xD0000 }, + { "E000H", 0xE0000 }, + { "" } + }, + }, + { + "width", "I/O Width", CONFIG_SELECTION, "", 8, "", { 0 }, + { + { "8-bit", 8 }, + { "16-bit", 16 }, + { "" } + }, + }, + { + "speed", "Transfer Speed", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Standard", 0 }, + { "High-Speed", 1 }, + { "" } + } + }, + { + "size", "Memory Size", CONFIG_SPINNER, "", 128, + "", + { 0, 8192, 512 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t brat_device = { @@ -1086,96 +996,55 @@ static const device_t brat_device = { }; #endif - #if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE) -static const device_config_t rampage_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x0258, "", { 0 }, - { - { - "208H", 0x0208 - }, - { - "218H", 0x0218 - }, - { - "258H", 0x0258 - }, - { - "268H", 0x0268 - }, - { - "2A8H", 0x02A8 - }, - { - "2B8H", 0x02B8 - }, - { - "2E8H", 0x02E8 - }, - { - "" - } - }, - }, - { - "frame", "Frame Address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { - "Disabled", 0x00000 - }, - { - "C000H", 0xC0000 - }, - { - "D000H", 0xD0000 - }, - { - "E000H", 0xE0000 - }, - { - "" - } - }, - }, - { - "width", "I/O Width", CONFIG_SELECTION, "", 8, "", { 0 }, - { - { - "8-bit", 8 - }, - { - "16-bit", 16 - }, - { - "" - } - }, - }, - { - "speed", "Transfer Speed", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Standard", 0 - }, - { - "High-Speed", 1 - }, - { - "" - } - } - }, - { - "size", "Memory Size", CONFIG_SPINNER, "", 128, - "", - { 0, 8192, 128 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t rampage_config[] = { +// clang-format off + { + "base", "Address", CONFIG_HEX16, "", 0x0258, "", { 0 }, + { + { "208H", 0x0208 }, + { "218H", 0x0218 }, + { "258H", 0x0258 }, + { "268H", 0x0268 }, + { "2A8H", 0x02A8 }, + { "2B8H", 0x02B8 }, + { "2E8H", 0x02E8 }, + { "" } + }, + }, + { + "frame", "Frame Address", CONFIG_HEX20, "", 0, "", { 0 }, + { + { "Disabled", 0x00000 }, + { "C000H", 0xC0000 }, + { "D000H", 0xD0000 }, + { "E000H", 0xE0000 }, + { "" } + }, + }, + { + "width", "I/O Width", CONFIG_SELECTION, "", 8, "", { 0 }, + { + { "8-bit", 8 }, + { "16-bit", 16 }, + { "" } + }, + }, + { + "speed", "Transfer Speed", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Standard", 0 }, + { "High-Speed", 1 }, + { "" } + } + }, + { + "size", "Memory Size", CONFIG_SPINNER, "", 128, "", + { 0, 8192, 128 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t rampage_device = { @@ -1191,94 +1060,54 @@ static const device_t rampage_device = { #if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB) -static const device_config_t iab_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x0258, "", { 0 }, - { - { - "208H", 0x0208 - }, - { - "218H", 0x0218 - }, - { - "258H", 0x0258 - }, - { - "268H", 0x0268 - }, - { - "2A8H", 0x02A8 - }, - { - "2B8H", 0x02B8 - }, - { - "2E8H", 0x02E8 - }, - { - "" - } - }, - }, - { - "frame", "Frame Address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { - "Disabled", 0x00000 - }, - { - "C000H", 0xC0000 - }, - { - "D000H", 0xD0000 - }, - { - "E000H", 0xE0000 - }, - { - "" - } - }, - }, - { - "width", "I/O Width", CONFIG_SELECTION, "", 8, "", { 0 }, - { - { - "8-bit", 8 - }, - { - "16-bit", 16 - }, - { - "" - } - }, - }, - { - "speed", "Transfer Speed", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Standard", 0 - }, - { - "High-Speed", 1 - }, - { - "" - } - } - }, - { - "size", "Memory Size", CONFIG_SPINNER, "", 128, - "", - { 0, 8192, 128 }, - { { 0 } } - }, - { - "", "", -1 - } +static const device_config_t iab_config[] = { +// clang-format off + { + "base", "Address", CONFIG_HEX16, "", 0x0258, "", { 0 }, + { + { "208H", 0x0208 }, + { "218H", 0x0218 }, + { "258H", 0x0258 }, + { "268H", 0x0268 }, + { "2A8H", 0x02A8 }, + { "2B8H", 0x02B8 }, + { "2E8H", 0x02E8 }, + { "" } + }, + }, + { + "frame", "Frame Address", CONFIG_HEX20, "", 0, "", { 0 }, + { + { "Disabled", 0x00000 }, + { "C000H", 0xC0000 }, + { "D000H", 0xD0000 }, + { "E000H", 0xE0000 }, + { "" } + }, + }, + { + "width", "I/O Width", CONFIG_SELECTION, "", 8, "", { 0 }, + { + { "8-bit", 8 }, + { "16-bit", 16 }, + { "" } + }, + }, + { + "speed", "Transfer Speed", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Standard", 0 }, + { "High-Speed", 1 }, + { "" } + } + }, + { + "size", "Memory Size", CONFIG_SPINNER, "", 128, "", + { 0, 8192, 128 }, + { { 0 } } + }, + { "", "", -1 } +// clang-format on }; static const device_t iab_device = { @@ -1292,7 +1121,6 @@ static const device_t iab_device = { }; #endif - static const device_t isa_none_device = { "None", "none", @@ -1302,32 +1130,32 @@ static const device_t isa_none_device = { NULL }; - static const struct { const device_t *dev; } boards[] = { - { &isa_none_device }, - { &ibmxt_device }, - { &genericxt_device }, - { &ibmat_device }, - { &genericat_device }, - { &p5pak_device }, - { &a6pak_device }, - { &ems5150_device }, - { &ev159_device }, +// clang-format off + { &isa_none_device }, + { &ibmxt_device }, + { &genericxt_device }, + { &ibmat_device }, + { &genericat_device }, + { &p5pak_device }, + { &a6pak_device }, + { &ems5150_device }, + { &ev159_device }, #if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT) - { &brat_device }, + { &brat_device }, #endif #if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE) - { &rampage_device }, + { &rampage_device }, #endif #if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB) - { &iab_device }, + { &iab_device }, #endif - { NULL } + { NULL } +// clang-format on }; - void isamem_reset(void) { @@ -1345,7 +1173,6 @@ isamem_reset(void) } } - const char * isamem_get_name(int board) { @@ -1354,15 +1181,12 @@ isamem_get_name(int board) return(boards[board].dev->name); } - const char * isamem_get_internal_name(int board) { return device_get_internal_name(boards[board].dev); } - - int isamem_get_from_internal_name(const char *s) { @@ -1378,7 +1202,6 @@ isamem_get_from_internal_name(const char *s) return(0); } - const device_t * isamem_get_device(int board) { diff --git a/src/device/isartc.c b/src/device/isartc.c index 57ccd957f..6acf01f0c 100644 --- a/src/device/isartc.c +++ b/src/device/isartc.c @@ -594,43 +594,27 @@ isartc_close(void *priv) static const device_config_t ev170_config[] = { - { - "base", "Address", CONFIG_HEX16, "", 0x02C0, "", { 0 }, - { - { - "240H", 0x0240 - }, - { - "2C0H", 0x02c0 - }, - { - "" - } - }, - }, - { - "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 }, - { - { - "Disabled", -1 - }, - { - "IRQ2", 2 - }, - { - "IRQ5", 5 - }, - { - "IRQ7", 7 - }, - { - "" - } - }, - }, - { - "", "", -1 - } +// clang-format off + { + "base", "Address", CONFIG_HEX16, "", 0x02C0, "", { 0 }, + { + { "240H", 0x0240 }, + { "2C0H", 0x02c0 }, + { "" } + }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 }, + { + { "Disabled", -1 }, + { "IRQ2", 2 }, + { "IRQ5", 5 }, + { "IRQ7", 7 }, + { "" } + }, + }, + { "", "", -1 } +// clang-format on }; static const device_t ev170_device = { @@ -645,23 +629,17 @@ static const device_t ev170_device = { static const device_config_t pii147_config[] = { - { - "base", "Address", CONFIG_HEX16, "", 0x0240, "", { 0 }, - { - { - "Clock 1", 0x0240 - }, - { - "Clock 2", 0x0340 - }, - { - "" - } - }, - }, - { - "", "", -1 - } +// clang-format off + { + "base", "Address", CONFIG_HEX16, "", 0x0240, "", { 0 }, + { + { "Clock 1", 0x0240 }, + { "Clock 2", 0x0340 }, + { "" } + }, + }, + { "", "", -1 } +// clang-format on }; static const device_t pii147_device = { @@ -676,29 +654,19 @@ static const device_t pii147_device = { static const device_config_t p5pak_config[] = { - { - "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 }, - { - { - "Disabled", -1 - }, - { - "IRQ2", 2 - }, - { - "IRQ3", 3 - }, - { - "IRQ5", 5 - }, - { - "" - } - }, - }, - { - "", "", -1 - } +// clang-format off + { + "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 }, + { + { "Disabled", -1 }, + { "IRQ2", 2 }, + { "IRQ3", 3 }, + { "IRQ5", 5 }, + { "" } + }, + }, + { "", "", -1 } +// clang-format on }; static const device_t p5pak_device = { @@ -713,29 +681,19 @@ static const device_t p5pak_device = { static const device_config_t a6pak_config[] = { - { - "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 }, - { - { - "Disabled", -1 - }, - { - "IRQ2", 2 - }, - { - "IRQ3", 3 - }, - { - "IRQ5", 5 - }, - { - "" - } - }, - }, - { - "", "", -1 - } +// clang-format off + { + "irq", "IRQ", CONFIG_SELECTION, "", -1, "", { 0 }, + { + { "Disabled", -1 }, + { "IRQ2", 2 }, + { "IRQ3", 3 }, + { "IRQ5", 5 }, + { "" } + }, + }, + { "", "", -1 } +// clang-format on }; static const device_t a6pak_device = { @@ -748,7 +706,6 @@ static const device_t a6pak_device = { a6pak_config }; - static const device_t isartc_none_device = { "None", "none", @@ -758,19 +715,19 @@ static const device_t isartc_none_device = { NULL }; - static const struct { const device_t *dev; } boards[] = { - { &isartc_none_device }, - { &ev170_device }, - { &pii147_device }, - { &p5pak_device }, - { &a6pak_device }, - { NULL }, +// clang-format off + { &isartc_none_device }, + { &ev170_device }, + { &pii147_device }, + { &p5pak_device }, + { &a6pak_device }, + { NULL }, +// clang-format on }; - void isartc_reset(void) { @@ -780,7 +737,6 @@ isartc_reset(void) device_add(boards[isartc_type].dev); } - char * isartc_get_internal_name(int board) { diff --git a/src/device/mouse.c b/src/device/mouse.c index 662d5e76e..295f0b8fb 100644 --- a/src/device/mouse.c +++ b/src/device/mouse.c @@ -61,18 +61,20 @@ static const device_t mouse_internal_device = { static mouse_t mouse_devices[] = { - { &mouse_none_device }, - { &mouse_internal_device }, - { &mouse_logibus_device }, - { &mouse_msinport_device }, +// clang-format off + { &mouse_none_device }, + { &mouse_internal_device }, + { &mouse_logibus_device }, + { &mouse_msinport_device }, #if 0 - { &mouse_genibus_device }, + { &mouse_genibus_device }, #endif - { &mouse_mssystems_device }, - { &mouse_msserial_device }, - { &mouse_ltserial_device }, - { &mouse_ps2_device }, - { NULL } + { &mouse_mssystems_device }, + { &mouse_msserial_device }, + { &mouse_ltserial_device }, + { &mouse_ps2_device }, + { NULL } +// clang-format on }; diff --git a/src/device/mouse_bus.c b/src/device/mouse_bus.c index d627db75f..de2183b4d 100644 --- a/src/device/mouse_bus.c +++ b/src/device/mouse_bus.c @@ -693,144 +693,77 @@ bm_init(const device_t *info) return dev; } - static const device_config_t lt_config[] = { +// clang-format off { - "base", "Address", CONFIG_HEX16, "", 0x23c, "", { 0 }, - { - { - "0x230", 0x230 - }, - { - "0x234", 0x234 - }, - { - "0x238", 0x238 - }, - { - "0x23C", 0x23c - }, - { - "" - } - } + "base", "Address", CONFIG_HEX16, "", 0x23c, "", { 0 }, { + { "0x230", 0x230 }, + { "0x234", 0x234 }, + { "0x238", 0x238 }, + { "0x23C", 0x23c }, + { "" } + } }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, { - { - "IRQ 2", 2 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 5", 5 - }, - { - "" - } - } + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, { + { "IRQ 2", 2 }, + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 5", 5 }, + { "" } + } }, { - "hz", "Hz", CONFIG_SELECTION, "", 45, "", { 0 }, { - { - "Non-timed (original)", 0 - }, - { - "30 Hz (JMP2 = 1)", 30 - }, - { - "45 Hz (JMP2 not populated)", 45 - }, - { - "60 Hz (JMP 2 = 2)", 60 - }, - { - "" - } - } + "hz", "Hz", CONFIG_SELECTION, "", 45, "", { 0 }, { + { "Non-timed (original)", 0 }, + { "30 Hz (JMP2 = 1)", 30 }, + { "45 Hz (JMP2 not populated)", 45 }, + { "60 Hz (JMP 2 = 2)", 60 }, + { "" } + } }, { - "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { - { - "Two", 2 - }, - { - "Three", 3 - }, - { - "" - } - } + "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { + { "Two", 2 }, + { "Three", 3 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } +// clang-format on }; - static const device_config_t ms_config[] = { +// clang-format off { - "base", "Address", CONFIG_HEX16, "", 0x23c, "", { 0 }, - { - { - "0x230", 0x230 - }, - { - "0x234", 0x234 - }, - { - "0x238", 0x238 - }, - { - "0x23C", 0x23c - }, - { - "" - } - } + "base", "Address", CONFIG_HEX16, "", 0x23c, "", { 0 }, { + { "0x230", 0x230 }, + { "0x234", 0x234 }, + { "0x238", 0x238 }, + { "0x23C", 0x23c }, + { "" } + } }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, { - { - "IRQ 2", 2 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 5", 5 - }, - { - "" - } - } + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, { + { "IRQ 2", 2 }, + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 5", 5 }, + { "" } + } }, { - "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { - { - "Two", 2 - }, - { - "Three", 3 - }, - { - "" - } - } + "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { + { "Two", 2 }, + { "Three", 3 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } +// clang-format on }; - const device_t mouse_logibus_device = { "Logitech/Microsoft Bus Mouse", "logibus", diff --git a/src/device/mouse_ps2.c b/src/device/mouse_ps2.c index 949875bbf..04653661b 100644 --- a/src/device/mouse_ps2.c +++ b/src/device/mouse_ps2.c @@ -331,28 +331,21 @@ ps2_close(void *priv) static const device_config_t ps2_config[] = { +// clang-format off { - "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { - { - "Two", 2 - }, - { - "Three", 3 - }, - { - "Wheel", 4 - }, - { - "" - } - } + "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { + { "Two", 2 }, + { "Three", 3 }, + { "Wheel", 4 }, + { "" } + } }, { - "", "", -1 + "", "", -1 } +// clang-format on }; - const device_t mouse_ps2_device = { "Standard PS/2 Mouse", "ps2", diff --git a/src/device/mouse_serial.c b/src/device/mouse_serial.c index 432aa1711..32365fffe 100644 --- a/src/device/mouse_serial.c +++ b/src/device/mouse_serial.c @@ -830,74 +830,51 @@ sermouse_init(const device_t *info) static const device_config_t mssermouse_config[] = { +// clang-format off { - "port", "Serial Port", CONFIG_SELECTION, "", 0, "", { 0 }, { - { - "COM1", 0 - }, - { - "COM2", 1 - }, - { - "" - } - } + "port", "Serial Port", CONFIG_SELECTION, "", 0, "", { 0 }, { + { "COM1", 0 }, + { "COM2", 1 }, + { "COM3", 2 }, + { "COM4", 3 }, + { "" } + } }, { - "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { - { - "Two", 2 - }, - { - "Three", 3 - }, - { - "Wheel", 4 - }, - { - "" - } - } + "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { + { "Two", 2 }, + { "Three", 3 }, + { "Wheel", 4 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } +// clang-format on }; static const device_config_t ltsermouse_config[] = { +// clang-format off { - "port", "Serial Port", CONFIG_SELECTION, "", 0, "", { 0 }, { - { - "COM1", 0 - }, - { - "COM2", 1 - }, - { - "" - } - } + "port", "Serial Port", CONFIG_SELECTION, "", 0, "", { 0 }, { + { "COM1", 0 }, + { "COM2", 1 }, + { "COM3", 2 }, + { "COM4", 3 }, + { "" } + } }, { - "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { - { - "Two", 2 - }, - { - "Three", 3 - }, - { - "" - } - } + "buttons", "Buttons", CONFIG_SELECTION, "", 2, "", { 0 }, { + { "Two", 2 }, + { "Three", 3 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } +// clang-format on }; - const device_t mouse_mssystems_device = { "Mouse Systems Serial Mouse", "mssystems", diff --git a/src/disk/hdc.c b/src/disk/hdc.c index a6e09b732..10b9ea72a 100644 --- a/src/disk/hdc.c +++ b/src/disk/hdc.c @@ -92,35 +92,36 @@ static const device_t hdc_internal_device = { static const struct { +// clang-format off const device_t *device; } controllers[] = { - { &hdc_none_device }, - { &hdc_internal_device }, - { &st506_xt_xebec_device }, - { &st506_xt_dtc5150x_device }, - { &st506_xt_st11_m_device }, - { &st506_xt_wd1002a_wx1_device }, - { &st506_at_wd1003_device }, - { &st506_xt_st11_r_device }, - { &st506_xt_wd1002a_27x_device }, - { &esdi_at_wd1007vse1_device }, - { &ide_isa_device }, - { &ide_isa_2ch_device }, - { &xtide_at_device }, - { &xtide_at_386_device }, - { &xtide_at_ps2_device }, - { &xta_wdxt150_device }, - { &xtide_acculogic_device }, - { &xtide_device }, - { &esdi_ps2_device }, - { &ide_pci_device }, - { &ide_pci_2ch_device }, - { &ide_vlb_device }, - { &ide_vlb_2ch_device }, + { &hdc_none_device }, + { &hdc_internal_device }, + { &st506_xt_xebec_device }, + { &st506_xt_dtc5150x_device }, + { &st506_xt_st11_m_device }, + { &st506_xt_wd1002a_wx1_device }, + { &st506_at_wd1003_device }, + { &st506_xt_st11_r_device }, + { &st506_xt_wd1002a_27x_device }, + { &esdi_at_wd1007vse1_device }, + { &ide_isa_device }, + { &ide_isa_2ch_device }, + { &xtide_at_device }, + { &xtide_at_386_device }, + { &xtide_at_ps2_device }, + { &xta_wdxt150_device }, + { &xtide_acculogic_device }, + { &xtide_device }, + { &esdi_ps2_device }, + { &ide_pci_device }, + { &ide_pci_2ch_device }, + { &ide_vlb_device }, + { &ide_vlb_2ch_device }, { NULL } +// clang-format on }; - /* Initialize the 'hdc_current' value based on configured HDC name. */ void hdc_init(void) diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index cc0eb7126..7350f6d84 100644 --- a/src/disk/hdc_ide.c +++ b/src/disk/hdc_ide.c @@ -3117,95 +3117,47 @@ const device_t ide_pci_2ch_device = { { NULL }, NULL, NULL, NULL }; -static const device_config_t ide_ter_config[] = -{ +// clang-format off +static const device_config_t ide_ter_config[] = { + { + "irq", "IRQ", CONFIG_SELECTION, "", 10, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 10, "", { 0 }, - { - { - "Plug and Play", -1 - }, - { - "IRQ 2", 2 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "IRQ 9", 9 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "IRQ 12", 12 - }, - { - "" - } - } - }, - { - "", "", -1 + { "Plug and Play", -1 }, + { "IRQ 2", 2 }, + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "IRQ 9", 9 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "IRQ 12", 12 }, + { "" } } + }, + { "", "", -1 } }; -static const device_config_t ide_qua_config[] = -{ +static const device_config_t ide_qua_config[] = { + { + "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, - { - { - "Plug and Play", -1 - }, - { - "IRQ 2", 2 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "IRQ 9", 9 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "IRQ 12", 12 - }, - { - "" - } - } - }, - { - "", "", -1 + { "Plug and Play", -1 }, + { "IRQ 2", 2 }, + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "IRQ 9", 9 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "IRQ 12", 12 }, + { "" } } + }, + { "", "", -1 } }; +// clang-format on const device_t ide_ter_device = { "Tertiary IDE Controller", diff --git a/src/disk/hdc_st506_xt.c b/src/disk/hdc_st506_xt.c index 814bd5c59..fd2ef2b9b 100644 --- a/src/disk/hdc_st506_xt.c +++ b/src/disk/hdc_st506_xt.c @@ -1614,223 +1614,127 @@ wd1002a_27x_available(void) return(rom_present(WD1002A_27X_BIOS_FILE)); } - +// clang-format off static const device_config_t dtc_config[] = { { - "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, - { - { - "Disabled", 0x00000 - }, - { - "C800H", 0xc8000 - }, - { - "CA00H", 0xca000 - }, - { - "D800H", 0xd8000 - }, - { - "F400H", 0xf4000 - }, - { - "" - } - } + "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, + { + { "Disabled", 0x00000 }, + { "C800H", 0xc8000 }, + { "CA00H", 0xca000 }, + { "D800H", 0xd8000 }, + { "F400H", 0xf4000 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } }; static const device_config_t st11_config[] = { { - "base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, - { - { - "320H", 0x0320 - }, - { - "324H", 0x0324 - }, - { - "328H", 0x0328 - }, - { - "32CH", 0x032c - }, - { - "" - } - } + "base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, + { + { "320H", 0x0320 }, + { "324H", 0x0324 }, + { "328H", 0x0328 }, + { "32CH", 0x032c }, + { "" } + } }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { - "IRQ 2", 2 - }, - { - "IRQ 5", 5 - }, - { - "" - } - } + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, + { + { "IRQ 2", 2 }, + { "IRQ 5", 5 }, + { "" } + } }, { - "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, - { - { - "Disabled", 0x00000 - }, - { - "C800H", 0xc8000 - }, - { - "D000H", 0xd0000 - }, - { - "D800H", 0xd8000 - }, - { - "E000H", 0xe0000 - }, - { - "" - } - } + "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, + { + { "Disabled", 0x00000 }, + { "C800H", 0xc8000 }, + { "D000H", 0xd0000 }, + { "D800H", 0xd8000 }, + { "E000H", 0xe0000 }, + { "" } + } }, { - "revision", "Board Revision", CONFIG_SELECTION, "", 19, "", { 0 }, - { - { - "Rev. 05 (v1.7)", 5 - }, - { - "Rev. 19 (v2.0)", 19 - }, - { - "" - } - } + "revision", "Board Revision", CONFIG_SELECTION, "", 19, "", { 0 }, + { + { "Rev. 05 (v1.7)", 5 }, + { "Rev. 19 (v2.0)", 19 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } }; static const device_config_t wd_config[] = { { - "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, - { - { - "Disabled", 0x00000 - }, - { - "C800H", 0xc8000 - }, - { - "" - } - } + "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, + { + { "Disabled", 0x00000 }, + { "C800H", 0xc8000 }, + { "" } + } }, { - "base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, - { - { - "320H", 0x0320 - }, - { - "324H", 0x0324 - }, - { - "" - } - } + "base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, + { + { "320H", 0x0320 }, + { "324H", 0x0324 }, + { "" } + } }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { - "IRQ 2", 2 - }, - { - "IRQ 5", 5 - }, - { - "" - } - } + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, + { + { "IRQ 2", 2 }, + { "IRQ 5", 5 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } }; static const device_config_t wd_rll_config[] = { { - "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, - { - { - "Disabled", 0x00000 - }, - { - "C800H", 0xc8000 - }, - { - "" - } - } + "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, + { + { "Disabled", 0x00000 }, + { "C800H", 0xc8000 }, + { "" } + } }, { - "base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, - { - { - "320H", 0x0320 - }, - { - "324H", 0x0324 - }, - { - "" - } - } + "base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, + { + { "320H", 0x0320 }, + { "324H", 0x0324 }, + { "" } + } }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { - "IRQ 2", 2 - }, - { - "IRQ 5", 5 - }, - { - "" - } - } + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, + { + { "IRQ 2", 2 }, + { "IRQ 5", 5 }, + { "" } + } }, { - "translate", "Translate 26 -> 17", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Off", 0 - }, - { - "On", 1 - }, - { - "" - } - } + "translate", "Translate 26 -> 17", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Off", 0 }, + { "On", 1 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } }; - +// clang-format on const device_t st506_xt_xebec_device = { "IBM PC Fixed Disk Adapter (MFM)", diff --git a/src/disk/hdc_xta.c b/src/disk/hdc_xta.c index 31c6ada0e..03a7c6fb2 100644 --- a/src/disk/hdc_xta.c +++ b/src/disk/hdc_xta.c @@ -1104,54 +1104,35 @@ xta_close(void *priv) static const device_config_t wdxt150_config[] = { +// clang-format off + { + "base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, /*W2*/ { - "base", "Address", CONFIG_HEX16, "", 0x0320, "", { 0 }, /*W2*/ - { - { - "320H", 0x0320 - }, - { - "324H", 0x0324 - }, - { - "" - } - }, + { "320H", 0x0320 }, + { "324H", 0x0324 }, + { "" } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, /*W3*/ { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, /*W3*/ - { - { - "IRQ 5", 5 - }, - { - "IRQ 4", 4 - }, - { - "" - } - }, + { "IRQ 5", 5 }, + { "IRQ 4", 4 }, + { "" } }, + }, + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, /*W1*/ { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xc8000, "", { 0 }, /*W1*/ - { - { - "C800H", 0xc8000 - }, - { - "CA00H", 0xca000 - }, - { - "" - } - }, + { "C800H", 0xc8000 }, + { "CA00H", 0xca000 }, + { "" } }, - { - "", "", -1 - } + }, + { "", "", -1 } +// clang-format off }; - const device_t xta_wdxt150_device = { "WDXT-150 XTA Fixed Disk Controller", "xta_wdxt150", @@ -1162,7 +1143,6 @@ const device_t xta_wdxt150_device = { wdxt150_config }; - const device_t xta_hd20_device = { "EuroPC HD20 Fixed Disk Controller", "xta_hd20", diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c index 21c114d90..485b8925c 100644 --- a/src/floppy/fdc.c +++ b/src/floppy/fdc.c @@ -2381,9 +2381,6 @@ fdc_3f1_enable(fdc_t *fdc, int enable) fdc->enable_3f1 = enable; } - - - const device_t fdc_xt_device = { "PC/XT Floppy Drive Controller", "fdc_xt", diff --git a/src/floppy/fdc_magitronic.c b/src/floppy/fdc_magitronic.c index e0845ae7d..58679a5aa 100644 --- a/src/floppy/fdc_magitronic.c +++ b/src/floppy/fdc_magitronic.c @@ -112,23 +112,17 @@ static int b215_available(void) } static const device_config_t b215_config[] = { +// clang-format off { - "bios_addr", "BIOS Address:", CONFIG_HEX20, "", 0xca000, "", { 0 }, - { - { - "CA00H", 0xca000 - }, - { - "CC00H", 0xcc000 - }, - { - "" - } - } + "bios_addr", "BIOS Address:", CONFIG_HEX20, "", 0xca000, "", { 0 }, + { + { "CA00H", 0xca000 }, + { "CC00H", 0xcc000 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } +// clang-format on }; const device_t fdc_b215_device = { diff --git a/src/floppy/fdc_pii15xb.c b/src/floppy/fdc_pii15xb.c index 661520e02..6ac6786c9 100644 --- a/src/floppy/fdc_pii15xb.c +++ b/src/floppy/fdc_pii15xb.c @@ -122,29 +122,19 @@ static int pii_158_available(void) } static const device_config_t pii_config[] = { +// clang-format off { - "bios_addr", "BIOS Address:", CONFIG_HEX20, "", 0xce000, "", { 0 }, - { - { - "Disabled", 0 - }, - { - "CA00H", 0xca000 - }, - { - "CC00H", 0xcc000 - }, - { - "CE00H", 0xce000 - }, - { - "" - } - } + "bios_addr", "BIOS Address:", CONFIG_HEX20, "", 0xce000, "", { 0 }, + { + { "Disabled", 0 }, + { "CA00H", 0xca000 }, + { "CC00H", 0xcc000 }, + { "CE00H", 0xce000 }, + { "" } + } }, - { - "", "", -1 - } + { "", "", -1 } +// clang-format on }; const device_t fdc_pii151b_device = { diff --git a/src/game/gameport.c b/src/game/gameport.c index cbd4ec4ba..d224e7baa 100644 --- a/src/game/gameport.c +++ b/src/game/gameport.c @@ -438,7 +438,6 @@ gameport_close(void *priv) free(dev); } - const device_t gameport_device = { "Game port", "gameport", diff --git a/src/lpt.c b/src/lpt.c index e2cb6ad5e..fa8fa458f 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -21,19 +21,20 @@ static const struct { const char *internal_name; const lpt_device_t *device; } lpt_devices[] = { - {"none", NULL}, - {"dss", &dss_device}, - {"lpt_dac", &lpt_dac_device}, - {"lpt_dac_stereo", &lpt_dac_stereo_device}, - {"text_prt", &lpt_prt_text_device}, - {"dot_matrix", &lpt_prt_escp_device}, - {"postscript", &lpt_prt_ps_device}, - {"plip", &lpt_plip_device}, - {"dongle_savquest", &lpt_hasp_savquest_device}, - {"", NULL} +// clang-format off + {"none", NULL }, + {"dss", &dss_device }, + {"lpt_dac", &lpt_dac_device }, + {"lpt_dac_stereo", &lpt_dac_stereo_device }, + {"text_prt", &lpt_prt_text_device }, + {"dot_matrix", &lpt_prt_escp_device }, + {"postscript", &lpt_prt_ps_device }, + {"plip", &lpt_plip_device }, + {"dongle_savquest", &lpt_hasp_savquest_device }, + {"", NULL } +// clang-format on }; - char * lpt_device_get_name(int id) { diff --git a/src/network/net_3c503.c b/src/network/net_3c503.c index acbc1ec04..7700c8039 100644 --- a/src/network/net_3c503.c +++ b/src/network/net_3c503.c @@ -636,111 +636,61 @@ threec503_nic_close(void *priv) } -static const device_config_t threec503_config[] = -{ +static const device_config_t threec503_config[] = { +// clang-format off { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { - "0x250", 0x250 - }, - { - "0x280", 0x280 - }, - { - "0x2a0", 0x2a0 - }, - { - "0x2e0", 0x2e0 - }, - { - "0x300", 0x300 - }, - { - "0x310", 0x310 - }, - { - "0x330", 0x330 - }, - { - "0x350", 0x350 - }, - { - "", 0 - } - }, + "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, + { + { "0x250", 0x250 }, + { "0x280", 0x280 }, + { "0x2a0", 0x2a0 }, + { "0x2e0", 0x2e0 }, + { "0x300", 0x300 }, + { "0x310", 0x310 }, + { "0x330", 0x330 }, + { "0x350", 0x350 }, + { "", 0 } + }, }, { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { - "IRQ 2", 2 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 5", 5 - }, - { - "", 0 - } - }, + "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, + { + { "IRQ 2", 2 }, + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 5", 5 }, + { "", 0 } + }, }, { - "dma", "DMA", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { - "DMA 1", 1 - }, - { - "DMA 2", 2 - }, - { - "DMA 3", 3 - }, - { - "", 0 - } - }, + "dma", "DMA", CONFIG_SELECTION, "", 3, "", { 0 }, + { + { "DMA 1", 1 }, + { "DMA 2", 2 }, + { "DMA 3", 3 }, + { "", 0 } + }, }, { - "mac", "MAC Address", CONFIG_MAC, "", -1, "", { 0 }, - { - { - "", 0 - } - }, + "mac", "MAC Address", CONFIG_MAC, "", -1, "", { 0 }, + { + { "", 0 } + }, }, { - "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xCC000, "", { 0 }, - { - { - "DC00", 0xDC000 - }, - { - "D800", 0xD8000 - }, - { - "C800", 0xC8000 - }, - { - "CC00", 0xCC000 - }, - { - "", 0 - } - }, + "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xCC000, "", { 0 }, + { + { "DC00", 0xDC000 }, + { "D800", 0xD8000 }, + { "C800", 0xC8000 }, + { "CC00", 0xCC000 }, + { "", 0 } + }, }, - { - "", "", -1 - } + { "", "", -1 } +// clang-format off }; - const device_t threec503_device = { "3Com EtherLink II", "3c503", diff --git a/src/network/net_dp8390.c b/src/network/net_dp8390.c index 28b6fd4bd..8e9b16f59 100644 --- a/src/network/net_dp8390.c +++ b/src/network/net_dp8390.c @@ -1111,11 +1111,10 @@ dp8390_close(void *priv) } -const device_t dp8390_device = -{ - "DP8390 Network Interface Controller", - "dp8390", - 0, 0, - dp8390_init, dp8390_close, - NULL, { NULL }, NULL, NULL +const device_t dp8390_device = { + "DP8390 Network Interface Controller", + "dp8390", + 0, 0, + dp8390_init, dp8390_close, + NULL, { NULL }, NULL, NULL }; diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c index 1f75d21fc..a836d5d8a 100644 --- a/src/network/net_ne2000.c +++ b/src/network/net_ne2000.c @@ -1139,185 +1139,91 @@ nic_close(void *priv) free(dev); } - -static const device_config_t ne1000_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { - "0x280", 0x280 - }, - { - "0x300", 0x300 - }, - { - "0x320", 0x320 - }, - { - "0x340", 0x340 - }, - { - "0x360", 0x360 - }, - { - "0x380", 0x380 - }, - { - "" - } - }, - }, - { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { - "IRQ 2", 2 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "" - } - }, - }, - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +// clang-format off +static const device_config_t ne1000_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, + { + { "0x280", 0x280 }, + { "0x300", 0x300 }, + { "0x320", 0x320 }, + { "0x340", 0x340 }, + { "0x360", 0x360 }, + { "0x380", 0x380 }, + { "" } + }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, + { + { "IRQ 2", 2 }, + { "IRQ 3", 3 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "" } + }, + }, + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; -static const device_config_t ne2000_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { - "0x280", 0x280 - }, - { - "0x300", 0x300 - }, - { - "0x320", 0x320 - }, - { - "0x340", 0x340 - }, - { - "0x360", 0x360 - }, - { - "0x380", 0x380 - }, - { - "" - } - }, - }, - { - "irq", "IRQ", CONFIG_SELECTION, "", 10, "", { 0 }, - { - { - "IRQ 2", 2 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "" - } - }, - }, - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "bios_addr", "BIOS address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { - "Disabled", 0x00000 - }, - { - "D000", 0xD0000 - }, - { - "D800", 0xD8000 - }, - { - "C800", 0xC8000 - }, - { - "" - } - }, - }, - { - "", "", -1 - } +static const device_config_t ne2000_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, + { + { "0x280", 0x280 }, + { "0x300", 0x300 }, + { "0x320", 0x320 }, + { "0x340", 0x340 }, + { "0x360", 0x360 }, + { "0x380", 0x380 }, + { "" } + }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 10, "", { 0 }, + { + { "IRQ 2", 2 }, + { "IRQ 3", 3 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "" } + }, + }, + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { + "bios_addr", "BIOS address", CONFIG_HEX20, "", 0, "", { 0 }, + { + { "Disabled", 0x00000 }, + { "D000", 0xD0000 }, + { "D800", 0xD8000 }, + { "C800", 0xC8000 }, + { "" } + }, + }, + { "", "", -1 } }; -static const device_config_t rtl8019as_config[] = -{ - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +static const device_config_t rtl8019as_config[] = { + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; -static const device_config_t rtl8029as_config[] = -{ - { - "bios", "Enable BIOS", CONFIG_BINARY, "", 0 - }, - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +static const device_config_t rtl8029as_config[] = { + { "bios", "Enable BIOS", CONFIG_BINARY, "", 0 }, + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; -static const device_config_t mca_mac_config[] = -{ - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +static const device_config_t mca_mac_config[] = { + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; - - +// clang-format on const device_t ne1000_device = { "Novell NE1000", diff --git a/src/network/net_pcnet.c b/src/network/net_pcnet.c index 6eee3d508..17049e2bf 100644 --- a/src/network/net_pcnet.c +++ b/src/network/net_pcnet.c @@ -3076,137 +3076,72 @@ pcnet_close(void *priv) } } - -static const device_config_t pcnet_pci_config[] = -{ - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +// clang-format off +static const device_config_t pcnet_pci_config[] = { + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; - -static const device_config_t pcnet_isa_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { - "0x300", 0x300 - }, - { - "0x320", 0x320 - }, - { - "0x340", 0x340 - }, - { - "0x360", 0x360 - }, - { - "" - } - }, - }, - { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 9", 9 - }, - { - "" - } - }, - }, - { - "dma", "DMA channel", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { - "DMA 3", 3 - }, - { - "DMA 5", 5 - }, - { - "DMA 6", 6 - }, - { - "DMA 7", 7 - }, - { - "" - } - }, - }, - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +static const device_config_t pcnet_isa_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, + { + { "0x300", 0x300 }, + { "0x320", 0x320 }, + { "0x340", 0x340 }, + { "0x360", 0x360 }, + { "" } + }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, + { + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 5", 5 }, + { "IRQ 9", 9 }, + { "" } + }, + }, + { + "dma", "DMA channel", CONFIG_SELECTION, "", 5, "", { 0 }, + { + { "DMA 3", 3 }, + { "DMA 5", 5 }, + { "DMA 6", 6 }, + { "DMA 7", 7 }, + { "" } + }, + }, + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; -static const device_config_t pcnet_vlb_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { - "0x300", 0x300 - }, - { - "0x320", 0x320 - }, - { - "0x340", 0x340 - }, - { - "0x360", 0x360 - }, - { - "" - } - }, - }, - { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 9", 9 - }, - { - "" - } - }, - }, - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +static const device_config_t pcnet_vlb_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, + { + { "0x300", 0x300 }, + { "0x320", 0x320 }, + { "0x340", 0x340 }, + { "0x360", 0x360 }, + { "" } + }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, + { + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 5", 5 }, + { "IRQ 9", 9 }, + { "" } + }, + }, + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; +// clang-format on const device_t pcnet_am79c960_device = { "AMD PCnet-ISA", diff --git a/src/network/net_wd8003.c b/src/network/net_wd8003.c index 3c6a5a059..90cbdea2e 100644 --- a/src/network/net_wd8003.c +++ b/src/network/net_wd8003.c @@ -735,335 +735,161 @@ wd_close(void *priv) free(dev); } - -static const device_config_t wd8003_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { - "0x240", 0x240 - }, - { - "0x280", 0x280 - }, - { - "0x300", 0x300 - }, - { - "0x380", 0x380 - }, - { - "" - } - }, - }, - { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { - "IRQ 2", 2 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "" - } - }, - }, - { - "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, - { - { - "C800", 0xC8000 - }, - { - "CC00", 0xCC000 - }, - { - "D000", 0xD0000 - }, - { - "D400", 0xD4000 - }, - { - "D800", 0xD8000 - }, - { - "DC00", 0xDC000 - }, - { - "" - } - }, - }, - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +// clang-format off +static const device_config_t wd8003_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, + { + { "0x240", 0x240 }, + { "0x280", 0x280 }, + { "0x300", 0x300 }, + { "0x380", 0x380 }, + { "" } + }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, + { + { "IRQ 2", 2 }, + { "IRQ 3", 3 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "" } + }, + }, + { + "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, + { + { "C800", 0xC8000 }, + { "CC00", 0xCC000 }, + { "D000", 0xD0000 }, + { "D400", 0xD4000 }, + { "D800", 0xD8000 }, + { "DC00", 0xDC000 }, + { "" } + }, + }, + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; -static const device_config_t wd8003eb_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x280, "", { 0 }, - { - { - "0x200", 0x200 - }, - { - "0x220", 0x220 - }, - { - "0x240", 0x240 - }, - { - "0x260", 0x260 - }, - { - "0x280", 0x280 - }, - { - "0x2A0", 0x2A0 - }, - { - "0x2C0", 0x2C0 - }, - { - "0x300", 0x300 - }, - { - "0x340", 0x340 - }, - { - "0x380", 0x380 - }, - { - "" - } - }, - }, - { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { - "IRQ 2/9", 9 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 7", 7 - }, - { - "" - } - }, - }, - { - "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, - { - { - "C000", 0xC0000 - }, - { - "C400", 0xC4000 - }, - { - "C800", 0xC8000 - }, - { - "CC00", 0xCC000 - }, - { - "D000", 0xD0000 - }, - { - "D400", 0xD4000 - }, - { - "D800", 0xD8000 - }, - { - "DC00", 0xDC000 - }, - { - "" - } - }, - }, - { - "ram_size", "RAM size", CONFIG_SELECTION, "", 8192, "", { 0 }, - { - { - "8 kB", 8192 - }, - { - "32 kB", 32768 - }, - { - "" - } - }, - }, - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +static const device_config_t wd8003eb_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x280, "", { 0 }, + { + { "0x200", 0x200 }, + { "0x220", 0x220 }, + { "0x240", 0x240 }, + { "0x260", 0x260 }, + { "0x280", 0x280 }, + { "0x2A0", 0x2A0 }, + { "0x2C0", 0x2C0 }, + { "0x300", 0x300 }, + { "0x340", 0x340 }, + { "0x380", 0x380 }, + { "" } + }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, + { + { "IRQ 2/9", 9 }, + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 7", 7 }, + { "" } + }, + }, + { + "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, + { + { "C000", 0xC0000 }, + { "C400", 0xC4000 }, + { "C800", 0xC8000 }, + { "CC00", 0xCC000 }, + { "D000", 0xD0000 }, + { "D400", 0xD4000 }, + { "D800", 0xD8000 }, + { "DC00", 0xDC000 }, + { "" } + }, + }, + { + "ram_size", "RAM size", CONFIG_SELECTION, "", 8192, "", { 0 }, + { + { "8 kB", 8192 }, + { "32 kB", 32768 }, + { "" } + }, + }, + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; /* WD8013EBT configuration and defaults set according to this site: http://www.stack.nl/~marcolz/network/wd80x3.html#WD8013EBT */ -static const device_config_t wd8013_config[] = -{ - { - "base", "Address", CONFIG_HEX16, "", 0x280, "", { 0 }, - { - { - "0x200", 0x200 - }, - { - "0x220", 0x220 - }, - { - "0x240", 0x240 - }, - { - "0x260", 0x260 - }, - { - "0x280", 0x280 - }, - { - "0x2A0", 0x2A0 - }, - { - "0x2C0", 0x2C0 - }, - { - "0x300", 0x300 - }, - { - "0x340", 0x340 - }, - { - "0x380", 0x380 - }, - { - "" - } - }, - }, - { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { - "IRQ 2/9", 9 - }, - { - "IRQ 3", 3 - }, - { - "IRQ 4", 4 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "IRQ 15", 15 - }, - { - "" - } - }, - }, - { - "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, - { - { - "C000", 0xC0000 - }, - { - "C400", 0xC4000 - }, - { - "C800", 0xC8000 - }, - { - "CC00", 0xCC000 - }, - { - "D000", 0xD0000 - }, - { - "D400", 0xD4000 - }, - { - "D800", 0xD8000 - }, - { - "DC00", 0xDC000 - }, - { - "" - } - }, - }, - { - "ram_size", "RAM size", CONFIG_SELECTION, "", 16384, "", { 0 }, - { - { - "16 kB", 16384 - }, - { - "64 kB", 65536 - }, - { - "" - } - }, - }, - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +static const device_config_t wd8013_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x280, "", { 0 }, + { + { "0x200", 0x200 }, + { "0x220", 0x220 }, + { "0x240", 0x240 }, + { "0x260", 0x260 }, + { "0x280", 0x280 }, + { "0x2A0", 0x2A0 }, + { "0x2C0", 0x2C0 }, + { "0x300", 0x300 }, + { "0x340", 0x340 }, + { "0x380", 0x380 }, + { "" } + }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, + { + { "IRQ 2/9", 9 }, + { "IRQ 3", 3 }, + { "IRQ 4", 4 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "IRQ 15", 15 }, + { "" } + }, + }, + { + "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, + { + { "C000", 0xC0000 }, + { "C400", 0xC4000 }, + { "C800", 0xC8000 }, + { "CC00", 0xCC000 }, + { "D000", 0xD0000 }, + { "D400", 0xD4000 }, + { "D800", 0xD8000 }, + { "DC00", 0xDC000 }, + { "" } + }, + }, + { + "ram_size", "RAM size", CONFIG_SELECTION, "", 16384, "", { 0 }, + { + { "16 kB", 16384 }, + { "64 kB", 65536 }, + { "" } + }, + }, + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; -static const device_config_t mca_mac_config[] = -{ - { - "mac", "MAC Address", CONFIG_MAC, "", -1 - }, - { - "", "", -1 - } +static const device_config_t mca_mac_config[] = { + { "mac", "MAC Address", CONFIG_MAC, "", -1 }, + { "", "", -1 } }; - +// clang-format on const device_t wd8003e_device = { "Western Digital WD8003E", diff --git a/src/network/network.c b/src/network/network.c index 8caf11067..ea1ccdf46 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -81,26 +81,28 @@ static const device_t net_none_device = { static netcard_t net_cards[] = { - { &net_none_device, NULL }, - { &threec503_device, NULL }, - { &pcnet_am79c960_device, NULL }, - { &pcnet_am79c961_device, NULL }, - { &ne1000_device, NULL }, - { &ne2000_device, NULL }, - { &pcnet_am79c960_eb_device, NULL }, - { &rtl8019as_device, NULL }, - { &wd8003e_device, NULL }, - { &wd8003eb_device, NULL }, - { &wd8013ebt_device, NULL }, - { &plip_device, NULL }, - { ðernext_mc_device, NULL }, - { &wd8003eta_device, NULL }, - { &wd8003ea_device, NULL }, - { &pcnet_am79c973_device, NULL }, - { &pcnet_am79c970a_device, NULL }, - { &rtl8029as_device, NULL }, - { &pcnet_am79c960_vlb_device, NULL }, - { NULL, NULL } +// clang-format off + { &net_none_device, NULL }, + { &threec503_device, NULL }, + { &pcnet_am79c960_device, NULL }, + { &pcnet_am79c961_device, NULL }, + { &ne1000_device, NULL }, + { &ne2000_device, NULL }, + { &pcnet_am79c960_eb_device, NULL }, + { &rtl8019as_device, NULL }, + { &wd8003e_device, NULL }, + { &wd8003eb_device, NULL }, + { &wd8013ebt_device, NULL }, + { &plip_device, NULL }, + { ðernext_mc_device, NULL }, + { &wd8003eta_device, NULL }, + { &wd8003ea_device, NULL }, + { &pcnet_am79c973_device, NULL }, + { &pcnet_am79c970a_device, NULL }, + { &rtl8029as_device, NULL }, + { &pcnet_am79c960_vlb_device, NULL }, + { NULL, NULL } +// clang-format off }; diff --git a/src/network/pcap_if.c b/src/network/pcap_if.c index 53b3d8882..384b11746 100644 --- a/src/network/pcap_if.c +++ b/src/network/pcap_if.c @@ -69,12 +69,14 @@ static pcap_t *(*f_pcap_open_live)(const char *,int,int,int,char *); static int (*f_pcap_next_ex)(pcap_t*,struct pcap_pkthdr**,const unsigned char**); static void (*f_pcap_close)(pcap_t *); static dllimp_t pcap_imports[] = { - { "pcap_findalldevs", &f_pcap_findalldevs }, - { "pcap_freealldevs", &f_pcap_freealldevs }, - { "pcap_open_live", &f_pcap_open_live }, - { "pcap_next_ex", &f_pcap_next_ex }, - { "pcap_close", &f_pcap_close }, - { NULL, NULL }, +// clang-format off + { "pcap_findalldevs", &f_pcap_findalldevs }, + { "pcap_freealldevs", &f_pcap_freealldevs }, + { "pcap_open_live", &f_pcap_open_live }, + { "pcap_next_ex", &f_pcap_next_ex }, + { "pcap_close", &f_pcap_close }, + { NULL, NULL }, +// clang-format on }; diff --git a/src/printer/prt_cpmap.c b/src/printer/prt_cpmap.c index 605fe9fdc..2c1465878 100644 --- a/src/printer/prt_cpmap.c +++ b/src/printer/prt_cpmap.c @@ -553,21 +553,23 @@ static const struct { uint16_t code; const uint16_t *map; } maps[] = { - { 437, cp437Map }, - { 737, cp737Map }, - { 775, cp775Map }, - { 850, cp850Map }, - { 852, cp852Map }, - { 855, cp855Map }, - { 857, cp857Map }, - { 860, cp860Map }, - { 861, cp861Map }, - { 862, cp862Map }, - { 863, cp863Map }, - { 864, cp864Map }, - { 865, cp865Map }, - { 866, cp866Map }, - { -1, NULL } +// clang-format off + { 437, cp437Map }, + { 737, cp737Map }, + { 775, cp775Map }, + { 850, cp850Map }, + { 852, cp852Map }, + { 855, cp855Map }, + { 857, cp857Map }, + { 860, cp860Map }, + { 861, cp861Map }, + { 862, cp862Map }, + { 863, cp863Map }, + { 864, cp864Map }, + { 865, cp865Map }, + { 866, cp866Map }, + { -1, NULL } +// clang-format on }; diff --git a/src/printer/prt_ps.c b/src/printer/prt_ps.c index efb6d104f..fdc820a84 100644 --- a/src/printer/prt_ps.c +++ b/src/printer/prt_ps.c @@ -100,13 +100,15 @@ static int (GSDLLAPI *gsapi_init_with_args)(void *instance, int argc, char **ar static int (GSDLLAPI *gsapi_exit)(void *instance); static dllimp_t ghostscript_imports[] = { - { "gsapi_revision", &gsapi_revision }, - { "gsapi_new_instance", &gsapi_new_instance }, - { "gsapi_delete_instance", &gsapi_delete_instance }, - { "gsapi_set_arg_encoding", &gsapi_set_arg_encoding }, - { "gsapi_init_with_args", &gsapi_init_with_args }, - { "gsapi_exit", &gsapi_exit }, - { NULL, NULL } +// clang-format off + { "gsapi_revision", &gsapi_revision }, + { "gsapi_new_instance", &gsapi_new_instance }, + { "gsapi_delete_instance", &gsapi_delete_instance }, + { "gsapi_set_arg_encoding", &gsapi_set_arg_encoding }, + { "gsapi_init_with_args", &gsapi_init_with_args }, + { "gsapi_exit", &gsapi_exit }, + { NULL, NULL } +// clang-format on }; static void *ghostscript_handle = NULL; diff --git a/src/scsi/scsi_aha154x.c b/src/scsi/scsi_aha154x.c index 1c78473f9..ab94a57be 100644 --- a/src/scsi/scsi_aha154x.c +++ b/src/scsi/scsi_aha154x.c @@ -1138,366 +1138,186 @@ aha_init(const device_t *info) return(dev); } - +// clang-format off static const device_config_t aha_154xb_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 }, { - "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 }, - { - { - "None", 0 - }, - { - "0x330", 0x330 - }, - { - "0x334", 0x334 - }, - { - "0x230", 0x230 - }, - { - "0x234", 0x234 - }, - { - "0x130", 0x130 - }, - { - "0x134", 0x134 - }, - { - "" - } - }, + { "None", 0 }, + { "0x330", 0x330 }, + { "0x334", 0x334 }, + { "0x230", 0x230 }, + { "0x234", 0x234 }, + { "0x130", 0x130 }, + { "0x134", 0x134 }, + { "" } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, - { - { - "IRQ 9", 9 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "IRQ 12", 12 - }, - { - "IRQ 14", 14 - }, - { - "IRQ 15", 15 - }, - { - "" - } - }, + { "IRQ 9", 9 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "IRQ 12", 12 }, + { "IRQ 14", 14 }, + { "IRQ 15", 15 }, + { "" } }, + }, + { + "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 }, { - "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 }, - { - { - "DMA 5", 5 - }, - { - "DMA 6", 6 - }, - { - "DMA 7", 7 - }, - { - "" - } - }, + { "DMA 5", 5 }, + { "DMA 6", 6 }, + { "DMA 7", 7 }, + { "" } }, + }, + { + "hostid", "Host ID", CONFIG_SELECTION, "", 7, "", { 0 }, { - "hostid", "Host ID", CONFIG_SELECTION, "", 7, "", { 0 }, - { - { - "0", 0 - }, - { - "1", 1 - }, - { - "2", 2 - }, - { - "3", 3 - }, - { - "4", 4 - }, - { - "5", 5 - }, - { - "6", 6 - }, - { - "7", 7 - }, - { - "" - } - }, + { "0", 0 }, + { "1", 1 }, + { "2", 2 }, + { "3", 3 }, + { "4", 4 }, + { "5", 5 }, + { "6", 6 }, + { "7", 7 }, + { "" } }, + }, + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 }, { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { - "Disabled", 0 - }, - { - "C800H", 0xc8000 - }, - { - "D000H", 0xd0000 - }, - { - "D800H", 0xd8000 - }, - { - "DC00H", 0xdc000 - }, - { - "" - } - }, + { "Disabled", 0 }, + { "C800H", 0xc8000 }, + { "D000H", 0xd0000 }, + { "D800H", 0xd8000 }, + { "DC00H", 0xdc000 }, + { "" } }, - { - "", "", -1 - } + }, + { + "", "", -1 + } }; static const device_config_t aha_154x_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 }, { - "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 }, - { - { - "None", 0 - }, - { - "0x330", 0x330 - }, - { - "0x334", 0x334 - }, - { - "0x230", 0x230 - }, - { - "0x234", 0x234 - }, - { - "0x130", 0x130 - }, - { - "0x134", 0x134 - }, - { - "" - } - }, + { "None", 0 }, + { "0x330", 0x330 }, + { "0x334", 0x334 }, + { "0x230", 0x230 }, + { "0x234", 0x234 }, + { "0x130", 0x130 }, + { "0x134", 0x134 }, + { "" } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, - { - { - "IRQ 9", 9 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "IRQ 12", 12 - }, - { - "IRQ 14", 14 - }, - { - "IRQ 15", 15 - }, - { - "" - } - }, + { "IRQ 9", 9 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "IRQ 12", 12 }, + { "IRQ 14", 14 }, + { "IRQ 15", 15 }, + { "" } }, + }, + { + "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 }, { - "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 }, - { - { - "DMA 5", 5 - }, - { - "DMA 6", 6 - }, - { - "DMA 7", 7 - }, - { - "" - } - }, + { "DMA 5", 5 }, + { "DMA 6", 6 }, + { "DMA 7", 7 }, + { "" } }, + }, + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 }, { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { - "Disabled", 0 - }, - { - "C800H", 0xc8000 - }, - { - "D000H", 0xd0000 - }, - { - "D800H", 0xd8000 - }, - { - "DC00H", 0xdc000 - }, - { - "" - } - }, + { "Disabled", 0 }, + { "C800H", 0xc8000 }, + { "D000H", 0xd0000 }, + { "D800H", 0xd8000 }, + { "DC00H", 0xdc000 }, + { "" } + }, }, - { - "", "", -1 - } + { + "", "", -1 + } }; static const device_config_t aha_154xcf_config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 }, { - "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 }, - { - { - "None", 0 - }, - { - "0x330", 0x330 - }, - { - "0x334", 0x334 - }, - { - "0x230", 0x230 - }, - { - "0x234", 0x234 - }, - { - "0x130", 0x130 - }, - { - "0x134", 0x134 - }, - { - "" - } - }, + { "None", 0 }, + { "0x330", 0x330 }, + { "0x334", 0x334 }, + { "0x230", 0x230 }, + { "0x234", 0x234 }, + { "0x130", 0x130 }, + { "0x134", 0x134 }, + { "" } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, - { - { - "IRQ 9", 9 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "IRQ 12", 12 - }, - { - "IRQ 14", 14 - }, - { - "IRQ 15", 15 - }, - { - "" - } - }, + { "IRQ 9", 9 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "IRQ 12", 12 }, + { "IRQ 14", 14 }, + { "IRQ 15", 15 }, + { "" } }, + }, + { + "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 }, { - "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 }, - { - { - "DMA 5", 5 - }, - { - "DMA 6", 6 - }, - { - "DMA 7", 7 - }, - { - "" - } - }, + { "DMA 5", 5 }, + { "DMA 6", 6 }, + { "DMA 7", 7 }, + { "" } }, + }, + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 }, { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { - "Disabled", 0 - }, - { - "C800H", 0xc8000 - }, - { - "CC00H", 0xcc000 - }, - { - "D000H", 0xd0000 - }, - { - "D400H", 0xd4000 - }, - { - "D800H", 0xd8000 - }, - { - "DC00H", 0xdc000 - }, - { - "" - } - }, + { "Disabled", 0 }, + { "C800H", 0xc8000 }, + { "CC00H", 0xcc000 }, + { "D000H", 0xd0000 }, + { "D400H", 0xd4000 }, + { "D800H", 0xd8000 }, + { "DC00H", 0xdc000 }, + { "" } }, - { + }, + { "fdc_addr", "FDC address", CONFIG_HEX16, "", 0, "", { 0 }, - { - { - "None", 0 - }, - { - "0x3f0", 0x3f0 - }, - { - "0x370", 0x370 - }, - { - "" - } - }, + { + { "None", 0 }, + { "0x3f0", 0x3f0 }, + { "0x370", 0x370 }, + { "" } }, - { - "", "", -1 - } + }, + { + "", "", -1 + } }; - +// clang-format on const device_t aha154xa_device = { "Adaptec AHA-154xA", diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c index d6c0b69b5..84144383b 100644 --- a/src/scsi/scsi_buslogic.c +++ b/src/scsi/scsi_buslogic.c @@ -1802,111 +1802,59 @@ buslogic_init(const device_t *info) return(dev); } - +// clang-format off static const device_config_t BT_ISA_Config[] = { + { + "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 }, { - "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 }, - { - { - "0x330", 0x330 - }, - { - "0x334", 0x334 - }, - { - "0x230", 0x230 - }, - { - "0x234", 0x234 - }, - { - "0x130", 0x130 - }, - { - "0x134", 0x134 - }, - { - "", 0 - } - }, + { "0x330", 0x330 }, + { "0x334", 0x334 }, + { "0x230", 0x230 }, + { "0x234", 0x234 }, + { "0x130", 0x130 }, + { "0x134", 0x134 }, + { "", 0 } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 }, - { - { - "IRQ 9", 9 - }, - { - "IRQ 10", 10 - }, - { - "IRQ 11", 11 - }, - { - "IRQ 12", 12 - }, - { - "IRQ 14", 14 - }, - { - "IRQ 15", 15 - }, - { - "", 0 - } - }, + { "IRQ 9", 9 }, + { "IRQ 10", 10 }, + { "IRQ 11", 11 }, + { "IRQ 12", 12 }, + { "IRQ 14", 14 }, + { "IRQ 15", 15 }, + { "", 0 } }, + }, + { + "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 }, { - "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 }, - { - { - "DMA 5", 5 - }, - { - "DMA 6", 6 - }, - { - "DMA 7", 7 - }, - { - "", 0 - } - }, + { "DMA 5", 5 }, + { "DMA 6", 6 }, + { "DMA 7", 7 }, + { "", 0 } }, + }, + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 }, { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { - "Disabled", 0 - }, - { - "C800H", 0xc8000 - }, - { - "D000H", 0xd0000 - }, - { - "D800H", 0xd8000 - }, - { - "", 0 - } - }, + { "Disabled", 0 }, + { "C800H", 0xc8000 }, + { "D000H", 0xd0000 }, + { "D800H", 0xd8000 }, + { "", 0 } }, - { - "", "", -1 - } + }, + { "", "", -1 } }; - static const device_config_t BT958D_Config[] = { - { - "bios", "Enable BIOS", CONFIG_BINARY, "", 0 - }, - { - "", "", -1 - } + { "bios", "Enable BIOS", CONFIG_BINARY, "", 0 }, + { "", "", -1 } }; +// clang-format on const device_t buslogic_542b_device = { "BusLogic BT-542B ISA", diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c index 713e69f7b..394bb1907 100644 --- a/src/scsi/scsi_ncr5380.c +++ b/src/scsi/scsi_ncr5380.c @@ -1568,220 +1568,121 @@ t128_available(void) return(rom_present(T128_ROM)); } +// clang-format off static const device_config_t ncr5380_mmio_config[] = { + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 }, { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 }, - { - { - "C800H", 0xc8000 - }, - { - "CC00H", 0xcc000 - }, - { - "D800H", 0xd8000 - }, - { - "DC00H", 0xdc000 - }, - { - "" - } - }, - + { "C800H", 0xc8000 }, + { "CC00H", 0xcc000 }, + { "D800H", 0xd8000 }, + { "DC00H", 0xdc000 }, + { "" } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { - "IRQ 3", 3 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "" - } - }, + { "IRQ 3", 3 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "" } }, - { - "", "", -1 - } + }, + { "", "", -1 } }; static const device_config_t rancho_config[] = { + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 }, { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 }, - { - { - "C800H", 0xc8000 - }, - { - "CC00H", 0xcc000 - }, - { - "D800H", 0xd8000 - }, - { - "DC00H", 0xdc000 - }, - { - "" - } - }, - + { "C800H", 0xc8000 }, + { "CC00H", 0xcc000 }, + { "D800H", 0xd8000 }, + { "DC00H", 0xdc000 }, + { "" } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { - "IRQ 3", 3 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "" - } - }, + { "IRQ 3", 3 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "" } }, + }, + { + "bios_ver", "BIOS Version", CONFIG_SELECTION, "", 1, "", { 0 }, { - "bios_ver", "BIOS Version", CONFIG_SELECTION, "", 1, "", { 0 }, - { - { - "8.20R", 1 - }, - { - "8.10R", 0 - }, - { - "" - } - }, + { "8.20R", 1 }, + { "8.10R", 0 }, + { "" } }, - { - "", "", -1 - } + }, + { "", "", -1 } }; static const device_config_t t130b_config[] = { + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 }, { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 }, - { - { - "Disabled", 0 - }, - { - "C800H", 0xc8000 - }, - { - "CC00H", 0xcc000 - }, - { - "D800H", 0xd8000 - }, - { - "DC00H", 0xdc000 - }, - { - "" - } - }, + { "Disabled", 0 }, + { "C800H", 0xc8000 }, + { "CC00H", 0xcc000 }, + { "D800H", 0xd8000 }, + { "DC00H", 0xdc000 }, + { "" } }, + }, + { + "base", "Address", CONFIG_HEX16, "", 0x0350, "", { 0 }, { - "base", "Address", CONFIG_HEX16, "", 0x0350, "", { 0 }, - { - { - "240H", 0x0240 - }, - { - "250H", 0x0250 - }, - { - "340H", 0x0340 - }, - { - "350H", 0x0350 - }, - { - "" - } - }, + { "240H", 0x0240 }, + { "250H", 0x0250 }, + { "340H", 0x0340 }, + { "350H", 0x0350 }, + { "" } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { - "IRQ 3", 3 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "" - } - }, + { "IRQ 3", 3 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "" } }, - { - "", "", -1 - } + }, + { "", "", -1 } }; - static const device_config_t t128_config[] = { + { + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 }, { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 }, - { - { - "C800H", 0xc8000 - }, - { - "CC00H", 0xcc000 - }, - { - "D800H", 0xd8000 - }, - { - "DC00H", 0xdc000 - }, - { - "" - } - }, + { "C800H", 0xc8000 }, + { "CC00H", 0xcc000 }, + { "D800H", 0xd8000 }, + { "DC00H", 0xdc000 }, + { "" } }, + }, + { + "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, { - "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { - "IRQ 3", 3 - }, - { - "IRQ 5", 5 - }, - { - "IRQ 7", 7 - }, - { - "" - } - }, + { "IRQ 3", 3 }, + { "IRQ 5", 5 }, + { "IRQ 7", 7 }, + { "" } }, - { - "boot", "Enable Boot ROM", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 - } + }, + { + "boot", "Enable Boot ROM", CONFIG_BINARY, "", 1 + }, + { "", "", -1 } }; +// clang-format on const device_t scsi_lcs6821n_device = { diff --git a/src/scsi/scsi_ncr53c8xx.c b/src/scsi/scsi_ncr53c8xx.c index 919a4ef05..12439e4ee 100644 --- a/src/scsi/scsi_ncr53c8xx.c +++ b/src/scsi/scsi_ncr53c8xx.c @@ -2634,26 +2634,18 @@ ncr53c8xx_close(void *priv) } static const device_config_t ncr53c8xx_pci_config[] = { +// clang-format off + { + "bios", "BIOS", CONFIG_SELECTION, "", 1, "", { 0 }, { - "bios", "BIOS", CONFIG_SELECTION, "", 1, "", { 0 }, - { - { - "SDMS 4.x BIOS", 2 - }, - { - "SDMS 3.x BIOS", 1 - }, - { - "Disable BIOS", 0 - }, - { - "" - } - }, + { "SDMS 4.x BIOS", 2 }, + { "SDMS 3.x BIOS", 1 }, + { "Disable BIOS", 0 }, + { "" } }, - { - "", "", -1 - } + }, + { "", "", -1 } +// clang-format on }; diff --git a/src/scsi/scsi_pcscsi.c b/src/scsi/scsi_pcscsi.c index 41bbd65b9..aff95074e 100644 --- a/src/scsi/scsi_pcscsi.c +++ b/src/scsi/scsi_pcscsi.c @@ -2000,15 +2000,16 @@ esp_close(void *priv) static const device_config_t bios_enable_config[] = { - { - "bios", "Enable BIOS", CONFIG_BINARY, "", 0 - }, - { - "", "", -1 - } +// clang-format off + { + "bios", "Enable BIOS", CONFIG_BINARY, "", 0 + }, + { + "", "", -1 + } +// clang-format on }; - const device_t dc390_pci_device = { "Tekram DC-390 PCI", diff --git a/src/scsi/scsi_spock.c b/src/scsi/scsi_spock.c index 849b4c953..32ce2a812 100644 --- a/src/scsi/scsi_spock.c +++ b/src/scsi/scsi_spock.c @@ -1157,23 +1157,17 @@ spock_available(void) } static const device_config_t spock_rom_config[] = { +// clang-format off + { + "bios_ver", "BIOS Version", CONFIG_SELECTION, "", 1, "", { 0 }, { - "bios_ver", "BIOS Version", CONFIG_SELECTION, "", 1, "", { 0 }, - { - { - "1991 BIOS (>1GB)", 1 - }, - { - "1990 BIOS", 0 - }, - { - "" - } - }, + { "1991 BIOS (>1GB)", 1 }, + { "1990 BIOS", 0 }, + { "" } }, - { - "", "", -1 - } + }, + { "", "", -1 } +// clang-format on }; const device_t spock_device = diff --git a/src/video/vid_ati28800.c b/src/video/vid_ati28800.c index 2fac97885..26d2c9cfd 100644 --- a/src/video/vid_ati28800.c +++ b/src/video/vid_ati28800.c @@ -705,63 +705,47 @@ ati28800_force_redraw(void *priv) ati28800->svga.fullchange = changeframecount; } - -static const device_config_t ati28800_config[] = -{ +// clang-format off +static const device_config_t ati28800_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 512, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 512, "", { 0 }, - { - { - "256 kB", 256 - }, - { - "512 kB", 512 - }, - { - "1 MB", 1024 - }, - { - "" - } - } - }, - { - "", "", -1 + { "256 kB", 256 }, + { "512 kB", 512 }, + { "1 MB", 1024 }, + { "" } } + }, + { + "", "", -1 + } }; #if defined(DEV_BRANCH) && defined(USE_XL24) static const device_config_t ati28800_wonderxl_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 512, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 512, "", { 0 }, - { - { - "256 kB", 256 - }, - { - "512 kB", 512 - }, - { - "1 MB", 1024 - }, - { - "" - } - } - }, - { - "", "", -1 + { "256 kB", 256 }, + { "512 kB", 512 }, + { "1 MB", 1024 }, + { "" } } + }, + { + "", "", -1 + } }; #endif +// clang-format on const device_t ati28800_device = { "ATI 28800-5 (ATI VGA Charger)", "ati28800", DEVICE_ISA, - 0, + 0, ati28800_init, ati28800_close, NULL, { ati28800_available }, ati28800_speed_changed, @@ -774,12 +758,12 @@ const device_t ati28800k_device = "ATI Korean VGA", "ati28800k", DEVICE_ISA, - 0, + 0, ati28800k_init, ati28800_close, NULL, { ati28800k_available }, ati28800_speed_changed, ati28800_force_redraw, - ati28800_config + ati28800_config }; const device_t ati28800k_spc4620p_device = @@ -787,7 +771,7 @@ const device_t ati28800k_spc4620p_device = "ATI Korean VGA On-Board SPC-4620P", "ati28800k_spc4620p", DEVICE_ISA, - 1, + 1, ati28800k_init, ati28800_close, NULL, { NULL }, ati28800_speed_changed, @@ -799,7 +783,7 @@ const device_t ati28800k_spc6033p_device = "ATI Korean VGA On-Board SPC-6033P", "ati28800k_spc6033p", DEVICE_ISA, - 2, + 2, ati28800k_init, ati28800_close, NULL, { NULL }, ati28800_speed_changed, @@ -811,12 +795,12 @@ const device_t compaq_ati28800_device = "ATI 28800-5 (ATI VGA Wonder XL)", "compaq_ati28800", DEVICE_ISA, - VGAWONDERXL, + VGAWONDERXL, ati28800_init, ati28800_close, NULL, { compaq_ati28800_available }, ati28800_speed_changed, ati28800_force_redraw, - ati28800_config + ati28800_config }; #if defined(DEV_BRANCH) && defined(USE_XL24) @@ -825,11 +809,11 @@ const device_t ati28800_wonderxl24_device = "ATI-28800 (VGA Wonder XL24)", "ati28800w", DEVICE_ISA, - VGAWONDERXL24, + VGAWONDERXL24, ati28800_init, ati28800_close, NULL, { ati28800_wonderxl24_available }, ati28800_speed_changed, ati28800_force_redraw, - ati28800_wonderxl_config + ati28800_wonderxl_config }; #endif diff --git a/src/video/vid_ati_mach64.c b/src/video/vid_ati_mach64.c index 1838ef5a7..032cb7e26 100644 --- a/src/video/vid_ati_mach64.c +++ b/src/video/vid_ati_mach64.c @@ -3441,75 +3441,65 @@ void mach64_force_redraw(void *p) mach64->svga.fullchange = changeframecount; } -static const device_config_t mach64gx_config[] = -{ +// clang-format off +static const device_config_t mach64gx_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, - { - { - "1 MB", 1 - }, - { - "2 MB", 2 - }, - { - "4 MB", 4 - }, - { - "" - } - } - }, - { - "", "", -1 + { "1 MB", 1 }, + { "2 MB", 2 }, + { "4 MB", 4 }, + { "" } } + }, + { + "", "", -1 + } }; -static const device_config_t mach64vt2_config[] = -{ +static const device_config_t mach64vt2_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, - { - { - "2 MB", 2 - }, - { - "4 MB", 4 - }, - { - "" - } - } - }, - { - "", "", -1 + { "2 MB", 2 }, + { "4 MB", 4 }, + { "" } } + }, + { + "", "", -1 + } }; +// clang-format on const device_t mach64gx_isa_device = { - "ATI Mach64GX ISA", - "mach64gx_isa", - DEVICE_AT | DEVICE_ISA, - 0, - mach64gx_init, mach64_close, NULL, - { mach64gx_isa_available }, - mach64_speed_changed, - mach64_force_redraw, - mach64gx_config + "ATI Mach64GX ISA", + "mach64gx_isa", + DEVICE_AT | DEVICE_ISA, + 0, + mach64gx_init, + mach64_close, + NULL, + { mach64gx_isa_available }, + mach64_speed_changed, + mach64_force_redraw, + mach64gx_config }; const device_t mach64gx_vlb_device = { - "ATI Mach64GX VLB", - "mach64gx_vlb", - DEVICE_VLB, - 0, - mach64gx_init, mach64_close, NULL, - { mach64gx_vlb_available }, - mach64_speed_changed, - mach64_force_redraw, - mach64gx_config + "ATI Mach64GX VLB", + "mach64gx_vlb", + DEVICE_VLB, + 0, + mach64gx_init, + mach64_close, + NULL, + { mach64gx_vlb_available }, + mach64_speed_changed, + mach64_force_redraw, + mach64gx_config }; const device_t mach64gx_pci_device = @@ -3517,7 +3507,7 @@ const device_t mach64gx_pci_device = "ATI Mach64GX PCI", "mach64gx_pci", DEVICE_PCI, - 0, + 0, mach64gx_init, mach64_close, NULL, { mach64gx_available }, mach64_speed_changed, @@ -3530,7 +3520,7 @@ const device_t mach64vt2_device = "ATI Mach64VT2", "mach64vt2", DEVICE_PCI, - 0, + 0, mach64vt2_init, mach64_close, NULL, { mach64vt2_available }, mach64_speed_changed, diff --git a/src/video/vid_cga.c b/src/video/vid_cga.c index e022e1a67..138d9d987 100644 --- a/src/video/vid_cga.c +++ b/src/video/vid_cga.c @@ -575,79 +575,54 @@ cga_speed_changed(void *p) cga_recalctimings(cga); } - -const device_config_t cga_config[] = -{ +// clang-format off +const device_config_t cga_config[] = { + { + "display_type", "Display type", CONFIG_SELECTION, "", CGA_RGB, "", { 0 }, { - "display_type", "Display type", CONFIG_SELECTION, "", CGA_RGB, "", { 0 }, - { - { - "RGB", CGA_RGB - }, - { - "Composite", CGA_COMPOSITE - }, - { - "" - } - } - }, - { - "composite_type", "Composite type", CONFIG_SELECTION, "", COMPOSITE_OLD, "", { 0 }, - { - { - "Old", COMPOSITE_OLD - }, - { - "New", COMPOSITE_NEW - }, - { - "" - } - } - }, - { - "rgb_type", "RGB type", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Color", 0 - }, - { - "Green Monochrome", 1 - }, - { - "Amber Monochrome", 2 - }, - { - "Gray Monochrome", 3 - }, - { - "Color (no brown)", 4 - }, - { - "" - } - } - }, - { - "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 + { "RGB", CGA_RGB }, + { "Composite", CGA_COMPOSITE }, + { "" } } + }, + { + "composite_type", "Composite type", CONFIG_SELECTION, "", COMPOSITE_OLD, "", { 0 }, + { + { "Old", COMPOSITE_OLD }, + { "New", COMPOSITE_NEW }, + { "" } + } + }, + { + "rgb_type", "RGB type", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Color", 0 }, + { "Green Monochrome", 1 }, + { "Amber Monochrome", 2 }, + { "Gray Monochrome", 3 }, + { "Color (no brown)", 4 }, + { "" } + } + }, + { + "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1 + }, + { + "", "", -1 + } }; +// clang-format on - -const device_t cga_device = -{ - "CGA", - "cga", - DEVICE_ISA, 0, - cga_standalone_init, - cga_close, - NULL, - { NULL }, - cga_speed_changed, - NULL, - cga_config +const device_t cga_device = { + "CGA", + "cga", + DEVICE_ISA, + 0, + cga_standalone_init, + cga_close, + NULL, + { NULL }, + cga_speed_changed, + NULL, + cga_config }; diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c index 99fb61980..8ee63fd18 100644 --- a/src/video/vid_cl54xx.c +++ b/src/video/vid_cl54xx.c @@ -4282,237 +4282,223 @@ gd54xx_force_redraw(void *p) gd54xx->svga.fullchange = changeframecount; } -static const device_config_t gd542x_config[] = -{ - { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "512 KB", - .value = 512 - }, - { - .description = "1 MB", - .value = 1024 - }, - { - .description = "" - } - }, - .default_int = 512 +// clang-format off +static const device_config_t gd542x_config[] = { + { + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "512 KB", + .value = 512 + }, + { + .description = "1 MB", + .value = 1024 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 512 + }, + { + .type = -1 + } }; -static const device_config_t gd5426_config[] = -{ - { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "512 KB", - .value = 512 - }, - { - .description = "1 MB", - .value = 1024 - }, - { - .description = "2 MB", - .value = 2048 - }, - { - .description = "" - } - }, - .default_int = 2048 +static const device_config_t gd5426_config[] = { + { + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "512 KB", + .value = 512 + }, + { + .description = "1 MB", + .value = 1024 + }, + { + .description = "2 MB", + .value = 2048 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 2048 + }, + { + .type = -1 + } }; -static const device_config_t gd5428_onboard_config[] = -{ - { - .name = "memory", - .description = "Onboard memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "512 KB", - .value = 512 - }, - { - .description = "1 MB", - .value = 1024 - }, - { - .description = "2 MB", - .value = 2048 - }, - { - .description = "" - } - }, - .default_int = 2048 +static const device_config_t gd5428_onboard_config[] = { + { + .name = "memory", + .description = "Onboard memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "512 KB", + .value = 512 + }, + { + .description = "1 MB", + .value = 1024 + }, + { + .description = "2 MB", + .value = 2048 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 2048 + }, + { + .type = -1 + } }; -static const device_config_t gd5429_config[] = -{ - { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1 MB", - .value = 1 - }, - { - .description = "2 MB", - .value = 2 - }, - { - .description = "" - } - }, - .default_int = 2 +static const device_config_t gd5429_config[] = { + { + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1 MB", + .value = 1 + }, + { + .description = "2 MB", + .value = 2 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 2 + }, + { + .type = -1 + } }; -static const device_config_t gd5440_onboard_config[] = -{ - { - .name = "memory", - .description = "Onboard memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1 MB", - .value = 1 - }, - { - .description = "2 MB", - .value = 2 - }, - { - .description = "" - } - }, - .default_int = 2 +static const device_config_t gd5440_onboard_config[] = { + { + .name = "memory", + .description = "Onboard memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1 MB", + .value = 1 + }, + { + .description = "2 MB", + .value = 2 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 2 + }, + { + .type = -1 + } }; -static const device_config_t gd5434_config[] = -{ - { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1 MB", - .value = 1 - }, - { - .description = "2 MB", - .value = 2 - }, - { - .description = "4 MB", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 4 +static const device_config_t gd5434_config[] = { + { + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1 MB", + .value = 1 + }, + { + .description = "2 MB", + .value = 2 + }, + { + .description = "4 MB", + .value = 4 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 4 + }, + { + .type = -1 + } }; -static const device_config_t gd5434_onboard_config[] = -{ - { - .name = "memory", - .description = "Onboard memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1 MB", - .value = 1 - }, - { - .description = "2 MB", - .value = 2 - }, - { - .description = "4 MB", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 4 +static const device_config_t gd5434_onboard_config[] = { + { + .name = "memory", + .description = "Onboard memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1 MB", + .value = 1 + }, + { + .description = "2 MB", + .value = 2 + }, + { + .description = "4 MB", + .value = 4 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 4 + }, + { + .type = -1 + } }; -static const device_config_t gd5480_config[] = -{ - { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "2 MB", - .value = 2 - }, - { - .description = "4 MB", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 4 +static const device_config_t gd5480_config[] = { + { + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "2 MB", + .value = 2 + }, + { + .description = "4 MB", + .value = 4 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 4 + }, + { + .type = -1 + } }; +// clang-format on const device_t gd5401_isa_device = { diff --git a/src/video/vid_colorplus.c b/src/video/vid_colorplus.c index 3b51beb60..ee9d10eb3 100644 --- a/src/video/vid_colorplus.c +++ b/src/video/vid_colorplus.c @@ -427,53 +427,40 @@ void colorplus_speed_changed(void *p) cga_recalctimings(&colorplus->cga); } -static const device_config_t colorplus_config[] = -{ + +static const device_config_t colorplus_config[] = { +// clang-format off + { + "display_type", "Display type", CONFIG_SELECTION, "", CGA_RGB, "", { 0 }, { - "display_type", "Display type", CONFIG_SELECTION, "", CGA_RGB, "", { 0 }, - { - { - "RGB", CGA_RGB - }, - { - "Composite", CGA_COMPOSITE - }, - { - "" - } - } - }, - { - "composite_type", "Composite type", CONFIG_SELECTION, "", COMPOSITE_OLD, "", { 0 }, - { - { - "Old", COMPOSITE_OLD - }, - { - "New", COMPOSITE_NEW - }, - { - "" - } - } - }, - { - "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 + { "RGB", CGA_RGB }, + { "Composite", CGA_COMPOSITE }, + { "" } } + }, + { + "composite_type", "Composite type", CONFIG_SELECTION, "", COMPOSITE_OLD, "", { 0 }, + { + { "Old", COMPOSITE_OLD }, + { "New", COMPOSITE_NEW }, + { "" } + } + }, + { "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1 }, + { "", "", -1 } +// clang-format on }; const device_t colorplus_device = { - "Colorplus", - "plantronics", - DEVICE_ISA, 0, - colorplus_standalone_init, - colorplus_close, - NULL, { NULL }, - colorplus_speed_changed, - NULL, - colorplus_config + "Colorplus", + "plantronics", + DEVICE_ISA, 0, + colorplus_standalone_init, + colorplus_close, + NULL, + { NULL }, + colorplus_speed_changed, + NULL, + colorplus_config }; diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c index b6ed063e9..4969cdfed 100644 --- a/src/video/vid_ega.c +++ b/src/video/vid_ega.c @@ -1176,71 +1176,61 @@ ega_speed_changed(void *p) 0 = Switch closed (ON); 1 = Switch open (OFF). */ -static const device_config_t ega_config[] = -{ +static const device_config_t ega_config[] = { +// clang-format off + { + "memory", "Memory size", CONFIG_SELECTION, "", 256, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 256, "", { 0 }, - { - { - "32 kB", 32 - }, - { - "64 kB", 64 - }, - { - "128 kB", 128 - }, - { - "256 kB", 256 - }, - { - "" - } - } - }, - { - .name = "monitor_type", - .description = "Monitor type", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "Monochrome (5151/MDA) (white)", - .value = 0x0B | (DISPLAY_WHITE << 4) - }, - { - .description = "Monochrome (5151/MDA) (green)", - .value = 0x0B | (DISPLAY_GREEN << 4) - }, - { - .description = "Monochrome (5151/MDA) (amber)", - .value = 0x0B | (DISPLAY_AMBER << 4) - }, - { - .description = "Color 40x25 (5153/CGA)", - .value = 0x06 - }, - { - .description = "Color 80x25 (5153/CGA)", - .value = 0x07 - }, - { - .description = "Enhanced Color - Normal Mode (5154/ECD)", - .value = 0x08 - }, - { - .description = "Enhanced Color - Enhanced Mode (5154/ECD)", - .value = 0x09 - }, - { - .description = "" - } - }, - .default_int = 9 - }, - { - .type = -1 + { "32 kB", 32 }, + { "64 kB", 64 }, + { "128 kB", 128 }, + { "256 kB", 256 }, + { "" } } + }, + { + .name = "monitor_type", + .description = "Monitor type", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "Monochrome (5151/MDA) (white)", + .value = 0x0B | (DISPLAY_WHITE << 4) + }, + { + .description = "Monochrome (5151/MDA) (green)", + .value = 0x0B | (DISPLAY_GREEN << 4) + }, + { + .description = "Monochrome (5151/MDA) (amber)", + .value = 0x0B | (DISPLAY_AMBER << 4) + }, + { + .description = "Color 40x25 (5153/CGA)", + .value = 0x06 + }, + { + .description = "Color 80x25 (5153/CGA)", + .value = 0x07 + }, + { + .description = "Enhanced Color - Normal Mode (5154/ECD)", + .value = 0x08 + }, + { + .description = "Enhanced Color - Enhanced Mode (5154/ECD)", + .value = 0x09 + }, + { + .description = "" + } + }, + .default_int = 9 + }, + { + .type = -1 + } +// clang-format on }; @@ -1249,7 +1239,7 @@ const device_t ega_device = "EGA", "ega", DEVICE_ISA, - EGA_IBM, + EGA_IBM, ega_standalone_init, ega_close, NULL, { ega_standalone_available }, ega_speed_changed, @@ -1262,7 +1252,7 @@ const device_t cpqega_device = "Compaq EGA", "compaq_ega", DEVICE_ISA, - EGA_COMPAQ, + EGA_COMPAQ, ega_standalone_init, ega_close, NULL, { cpqega_standalone_available }, ega_speed_changed, @@ -1275,7 +1265,7 @@ const device_t sega_device = "SuperEGA", "superega", DEVICE_ISA, - EGA_SUPEREGA, + EGA_SUPEREGA, ega_standalone_init, ega_close, NULL, { sega_standalone_available }, ega_speed_changed, @@ -1288,7 +1278,7 @@ const device_t atiega_device = "ATI EGA Wonder 800+", "egawonder800", DEVICE_ISA, - EGA_ATI, + EGA_ATI, ega_standalone_init, ega_close, NULL, { atiega_standalone_available }, ega_speed_changed, @@ -1301,7 +1291,7 @@ const device_t iskra_ega_device = "Iskra EGA (Cyrillic ROM)", "iskra_ega", DEVICE_ISA, - EGA_ISKRA, + EGA_ISKRA, ega_standalone_init, ega_close, NULL, { iskra_ega_standalone_available }, ega_speed_changed, @@ -1314,7 +1304,7 @@ const device_t et2000_device = "Tseng Labs ET2000", "et2000", DEVICE_ISA, - EGA_TSENG, + EGA_TSENG, ega_standalone_init, ega_close, NULL, { et2000_standalone_available }, ega_speed_changed, diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c index 0254a8509..e443ae517 100644 --- a/src/video/vid_et4000.c +++ b/src/video/vid_et4000.c @@ -804,28 +804,19 @@ et4000_kasan_available(void) rom_present(KASAN_FONT_ROM_PATH); } -static const device_config_t et4000_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, - { - { - "256 KB", 256 - }, - { - "512 KB", 512 - }, - { - "1 MB", 1024 - }, - { - "" - } - } - }, - { - "", "", -1 - } +static const device_config_t et4000_config[] = { +// clang-format off + { + "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, + { + { "256 KB", 256 }, + { "512 KB", 512 }, + { "1 MB", 1024 }, + { "" } + } + }, + { "", "", -1 } +// clang-format on }; const device_t et4000_isa_device = { diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c index dfc0c242e..ccae1d869 100644 --- a/src/video/vid_et4000w32.c +++ b/src/video/vid_et4000w32.c @@ -2191,25 +2191,18 @@ et4000w32p_force_redraw(void *p) } -static const device_config_t et4000w32p_config[] = -{ +static const device_config_t et4000w32p_config[] = { +// clang-format off + { + "memory", "Memory size", CONFIG_SELECTION, "", 2, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 2, "", { 0 }, - { - { - "1 MB", 1 - }, - { - "2 MB", 2 - }, - { - "" - } - } - }, - { - "", "", -1 + { "1 MB", 1 }, + { "2 MB", 2 }, + { "" } } + }, + { "", "", -1 } +// clang-format on }; diff --git a/src/video/vid_genius.c b/src/video/vid_genius.c index 847730ac8..db89eebc0 100644 --- a/src/video/vid_genius.c +++ b/src/video/vid_genius.c @@ -797,6 +797,6 @@ const device_t genius_device = genius_init, genius_close, NULL, { genius_available }, genius_speed_changed, - NULL, + NULL, NULL }; diff --git a/src/video/vid_hercules.c b/src/video/vid_hercules.c index ce9cf0349..923f0d874 100644 --- a/src/video/vid_hercules.c +++ b/src/video/vid_hercules.c @@ -610,32 +610,20 @@ speed_changed(void *priv) static const device_config_t hercules_config[] = { +// clang-format off { - "rgb_type", "Display type", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Default", 0 - }, - { - "Green", 1 - }, - { - "Amber", 2 - }, - { - "Gray", 3 - }, - { - "" - } - } + "rgb_type", "Display type", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Default", 0 }, + { "Green", 1 }, + { "Amber", 2 }, + { "Gray", 3 }, + { "" } + } }, - { - "blend", "Blend", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 - } + { "blend", "Blend", CONFIG_BINARY, "", 1 }, + { "", "", -1 } +// clang-format on }; const device_t hercules_device = { diff --git a/src/video/vid_herculesplus.c b/src/video/vid_herculesplus.c index 8c95c6734..21f8642ba 100644 --- a/src/video/vid_herculesplus.c +++ b/src/video/vid_herculesplus.c @@ -695,32 +695,20 @@ speed_changed(void *priv) static const device_config_t herculesplus_config[] = { +// clang-format off { - "rgb_type", "Display type", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Default", 0 - }, - { - "Green", 1 - }, - { - "Amber", 2 - }, - { - "Gray", 3 - }, - { - "" - } - } + "rgb_type", "Display type", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Default", 0 }, + { "Green", 1 }, + { "Amber", 2 }, + { "Gray", 3 }, + { "" } + } }, - { - "blend", "Blend", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 - } + { "blend", "Blend", CONFIG_BINARY, "", 1 }, + { "", "", -1 } +// clang-format on }; const device_t herculesplus_device = { diff --git a/src/video/vid_ht216.c b/src/video/vid_ht216.c index c65cde149..58a3a1a73 100644 --- a/src/video/vid_ht216.c +++ b/src/video/vid_ht216.c @@ -1622,74 +1622,45 @@ ht216_force_redraw(void *p) } -static const device_config_t v7_vga_1024i_config[] = -{ +static const device_config_t v7_vga_1024i_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 512, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 512, "", { 0 }, - { - { - "256 kB", 256 - }, - { - "512 kB", 512 - }, - { - "" - } - } - }, - { - "", "", -1 + { "256 kB", 256 }, + { "512 kB", 512 }, + { "" } } + }, + { "", "", -1 } }; -static const device_config_t ht216_32_standalone_config[] = -{ +// clang-format off +static const device_config_t ht216_32_standalone_config[] = { + { + "monitor_type", "Monitor type", CONFIG_SELECTION, "", 0x18, "", { 0 }, { - "monitor_type", "Monitor type", CONFIG_SELECTION, "", 0x18, "", { 0 }, - { - { - "Mono Interlaced", 0x00 - }, - { - "Mono Non-Interlaced", 0x08 - }, - { - "Color Interlaced", 0x10 - }, - { - "Color Non-Interlaced", 0x18 - }, - { - "" - } - } - }, - { - "", "", -1 + { "Mono Interlaced", 0x00 }, + { "Mono Non-Interlaced", 0x08 }, + { "Color Interlaced", 0x10 }, + { "Color Non-Interlaced", 0x18 }, + { "" } } + }, + { "", "", -1 } }; -static const device_config_t radius_svga_multiview_config[] = -{ +static const device_config_t radius_svga_multiview_config[] = { + { + "extensions", "Extensions", CONFIG_SELECTION, "", 0x00, "", { 0 }, { - "extensions", "Extensions", CONFIG_SELECTION, "", 0x00, "", { 0 }, - { - { - "Extensions Enabled", 0x00 - }, - { - "Extensions Disabled", 0x02 - }, - { - "" - } - } - }, - { - "", "", -1 + { "Extensions Enabled", 0x00 }, + { "Extensions Disabled", 0x02 }, + { "" } } + }, + { "", "", -1 } }; +// clang-format on const device_t g2_gc205_device = { diff --git a/src/video/vid_ibm_rgb528_ramdac.c b/src/video/vid_ibm_rgb528_ramdac.c index 8dae60f23..4e736ee8e 100644 --- a/src/video/vid_ibm_rgb528_ramdac.c +++ b/src/video/vid_ibm_rgb528_ramdac.c @@ -954,11 +954,10 @@ ibm_rgb528_ramdac_close(void *priv) } -const device_t ibm_rgb528_ramdac_device = -{ - "IBM RGB528 RAMDAC", - "ibm_rgb528_ramdac", - 0, 0, - ibm_rgb528_ramdac_init, ibm_rgb528_ramdac_close, - NULL, { NULL }, NULL, NULL, NULL +const device_t ibm_rgb528_ramdac_device = { + "IBM RGB528 RAMDAC", + "ibm_rgb528_ramdac", + 0, 0, + ibm_rgb528_ramdac_init, ibm_rgb528_ramdac_close, + NULL, { NULL }, NULL, NULL, NULL }; diff --git a/src/video/vid_mda.c b/src/video/vid_mda.c index fed92c1f5..fba6257fa 100644 --- a/src/video/vid_mda.c +++ b/src/video/vid_mda.c @@ -327,36 +327,23 @@ void mda_speed_changed(void *p) mda_recalctimings(mda); } -static const device_config_t mda_config[] = -{ +static const device_config_t mda_config[] = { +// clang-format off + { + "rgb_type", "Display type", CONFIG_SELECTION, "", 0, "", { 0 }, { - "rgb_type", "Display type", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Default", 0 - }, - { - "Green", 1 - }, - { - "Amber", 2 - }, - { - "Gray", 3 - }, - { - "" - } - } - }, - { - "", "", -1 + { "Default", 0 }, + { "Green", 1 }, + { "Amber", 2 }, + { "Gray", 3 }, + { "" } } + }, + { "", "", -1 } +// clang-format on }; - -const device_t mda_device = -{ +const device_t mda_device = { "MDA", "mda", DEVICE_ISA, 0, @@ -364,5 +351,5 @@ const device_t mda_device = { NULL }, mda_speed_changed, NULL, - mda_config + mda_config }; diff --git a/src/video/vid_mga.c b/src/video/vid_mga.c index f81baf596..836be2011 100644 --- a/src/video/vid_mga.c +++ b/src/video/vid_mga.c @@ -5337,35 +5337,34 @@ mystique_force_redraw(void *p) } -static const device_config_t mystique_config[] = -{ +static const device_config_t mystique_config[] = { +// clang-format off { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "2 MB", - .value = 2 - }, - { - .description = "4 MB", - .value = 4 - }, - { - .description = "8 MB", - .value = 8 - }, - { - .description = "" - } - }, - .default_int = 8 + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = + { + { + .description = "2 MB", + .value = 2 + }, + { + .description = "4 MB", + .value = 4 + }, + { + .description = "8 MB", + .value = 8 + }, + { + .description = "" + } + }, + .default_int = 8 }, - { - .type = -1 - } + { .type = -1 } +// clang-format on }; const device_t millennium_device = diff --git a/src/video/vid_nga.c b/src/video/vid_nga.c index 927a63c12..abacd10bb 100644 --- a/src/video/vid_nga.c +++ b/src/video/vid_nga.c @@ -599,76 +599,45 @@ nga_init(const device_t *info) } -const device_config_t nga_config[] = -{ +const device_config_t nga_config[] = { +// clang-format off + { + "rgb_type", "RGB type", CONFIG_SELECTION, "", 0, "", { 0 }, { - "rgb_type", "RGB type", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Color", 0 - }, - { - "Green Monochrome", 1 - }, - { - "Amber Monochrome", 2 - }, - { - "Gray Monochrome", 3 - }, - { - "Color (no brown)", 4 - }, - { - "" - } - } - }, - { - "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1 - }, - { - "memory", "Memory size", CONFIG_SELECTION, "", 64, "", { 0 }, - { - { - "32 KB", 32 - }, - { - "64 KB", 64 - }, - { - "" - } - } - }, - { - "charset", "Character set", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "U.S. English", 0 - }, - { - "Scandinavian", 1 - }, - { - "Other languages", 2 - }, - { - "E.F. Hutton", 3 - }, - { - "" - } - } - }, - { - "", "", -1 + { "Color", 0 }, + { "Green Monochrome", 1 }, + { "Amber Monochrome", 2 }, + { "Gray Monochrome", 3 }, + { "Color (no brown)", 4 }, + { "" } } + }, + { + "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1 + }, + { + "memory", "Memory size", CONFIG_SELECTION, "", 64, "", { 0 }, + { + { "32 KB", 32 }, + { "64 KB", 64 }, + { "" } + } + }, + { + "charset", "Character set", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "U.S. English", 0 }, + { "Scandinavian", 1 }, + { "Other languages", 2 }, + { "E.F. Hutton", 3 }, + { "" } + } + }, + { "", "", -1 } +// clang-format on }; - -const device_t nga_device = -{ +const device_t nga_device = { "NCR NGA", "nga", DEVICE_ISA, 0, diff --git a/src/video/vid_oak_oti.c b/src/video/vid_oak_oti.c index 0902d33ee..956c07781 100644 --- a/src/video/vid_oak_oti.c +++ b/src/video/vid_oak_oti.c @@ -495,82 +495,52 @@ static int oti067_m300_available(void) { if (rom_present(BIOS_067_M300_15_PATH)) - return(rom_present(BIOS_067_M300_15_PATH)); - else - return(rom_present(BIOS_067_M300_08_PATH)); + return(rom_present(BIOS_067_M300_15_PATH)); + else + return(rom_present(BIOS_067_M300_08_PATH)); } -static const device_config_t oti067_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 512, "", { 0 }, - { - { - "256 kB", 256 - }, - { - "512 kB", 512 - }, - { - "" - } - } - }, - { - "", "", -1 - } +// clang-format off +static const device_config_t oti067_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 512, "", { 0 }, + { + { "256 kB", 256 }, + { "512 kB", 512 }, + { "" } + } + }, + { "", "", -1 } }; - -static const device_config_t oti067_ama932j_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 256, "", { 0 }, - { - { - "256 kB", 256 - }, - { - "512 kB", 512 - }, - { - "" - } - } - }, - { - "", "", -1 - } +static const device_config_t oti067_ama932j_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 256, "", { 0 }, + { + { "256 kB", 256 }, + { "512 kB", 512 }, + { "" } + } + }, + { "", "", -1 } }; - -static const device_config_t oti077_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, - { - { - "256 kB", 256 - }, - { - "512 kB", 512 - }, - { - "1 MB", 1024 - }, - { - "" - } - } - }, - { - "", "", -1 - } +static const device_config_t oti077_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, + { + { "256 kB", 256 }, + { "512 kB", 512 }, + { "1 MB", 1024 }, + { "" } + } + }, + { "", "", -1 } }; +// clang-format on -const device_t oti037c_device = -{ +const device_t oti037c_device = { "Oak OTI-037C", "oti037c", DEVICE_ISA, @@ -581,8 +551,7 @@ const device_t oti037c_device = oti_force_redraw }; -const device_t oti067_device = -{ +const device_t oti067_device = { "Oak OTI-067", "oti067", DEVICE_ISA, @@ -594,8 +563,7 @@ const device_t oti067_device = oti067_config }; -const device_t oti067_m300_device = -{ +const device_t oti067_m300_device = { "Oak OTI-067 (Olivetti M300-08/15)", "oti067_m300", DEVICE_ISA, @@ -607,8 +575,7 @@ const device_t oti067_m300_device = oti067_config }; -const device_t oti067_ama932j_device = -{ +const device_t oti067_ama932j_device = { "Oak OTI-067 (AMA-932J)", "oti067_ama932j", DEVICE_ISA, @@ -620,8 +587,7 @@ const device_t oti067_ama932j_device = oti067_ama932j_config }; -const device_t oti077_device = -{ +const device_t oti077_device = { "Oak OTI-077", "oti077", DEVICE_ISA, diff --git a/src/video/vid_ogc.c b/src/video/vid_ogc.c index 8da375ef2..05ad26222 100644 --- a/src/video/vid_ogc.c +++ b/src/video/vid_ogc.c @@ -635,36 +635,22 @@ ogc_init(const device_t *info) return ogc; } - -const device_config_t ogc_m24_config[] = -{ +const device_config_t ogc_m24_config[] = { +// clang-format off + { + /* Olivetti / ATT compatible displays */ + "rgb_type", "RGB type", CONFIG_SELECTION, "", CGA_RGB, "", { 0 }, { - /* Olivetti / ATT compatible displays */ - "rgb_type", "RGB type", CONFIG_SELECTION, "", CGA_RGB, "", { 0 }, - { - { - "Color", 0 - }, - { - "Green Monochrome", 1 - }, - { - "Amber Monochrome", 2 - }, - { - "Gray Monochrome", 3 - }, - { - "" - } - } - }, - { - "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1, - }, - { - "", "", -1 + { "Color", 0 }, + { "Green Monochrome", 1 }, + { "Amber Monochrome", 2 }, + { "Gray Monochrome", 3 }, + { "" } } + }, + { "snow_enabled", "Snow emulation", CONFIG_BINARY, "", 1, }, + { "", "", -1 } +// clang-format on }; const device_t ogc_m24_device = diff --git a/src/video/vid_paradise.c b/src/video/vid_paradise.c index 1042440b6..3fc5f5de2 100644 --- a/src/video/vid_paradise.c +++ b/src/video/vid_paradise.c @@ -826,25 +826,18 @@ const device_t paradise_wd90c11_device = NULL }; -static const device_config_t paradise_wd90c30_config[] = -{ +static const device_config_t paradise_wd90c30_config[] = { +// clang-format off + { + "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, - { - { - "512 kB", 512 - }, - { - "1 MB", 1024 - }, - { - "" - } - } - }, - { - "", "", -1 + { "512 kB", 512 }, + { "1 MB", 1024 }, + { "" } } + }, + { "", "", -1 } +// clang-format on }; const device_t paradise_wd90c30_device = diff --git a/src/video/vid_rtg310x.c b/src/video/vid_rtg310x.c index 18f577719..ec3275487 100644 --- a/src/video/vid_rtg310x.c +++ b/src/video/vid_rtg310x.c @@ -358,28 +358,19 @@ rtg_available(void) return rom_present(BIOS_ROM_PATH); } -static const device_config_t rtg_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, - { - { - "256 KB", 256 - }, - { - "512 KB", 512 - }, - { - "1 MB", 1024 - }, - { - "" - } - } - }, - { - "", "", -1 - } +static const device_config_t rtg_config[] = { +// clang-format off + { + "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, + { + { "256 KB", 256 }, + { "512 KB", 512 }, + { "1 MB", 1024 }, + { "" } + } + }, + { "", "", -1 } +// clang-format on }; const device_t realtek_rtg3106_device = { diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index 08bfe4aa6..e77817782 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -7609,124 +7609,73 @@ static void s3_force_redraw(void *p) s3->svga.fullchange = changeframecount; } -static const device_config_t s3_orchid_86c911_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 1, "", { 0 }, - { - { - "512 KB", 0 - }, - { - "1 MB", 1 - }, - { - "" - } - } - }, - { - "", "", -1 - } +// clang-format off +static const device_config_t s3_orchid_86c911_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 1, "", { 0 }, + { + { "512 KB", 0 }, + { "1 MB", 1 }, + { "" } + } + }, + { "", "", -1 } }; -static const device_config_t s3_9fx_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 2, "", { 0 }, - { - { - "1 MB", 1 - }, - { - "2 MB", 2 - }, - /*Trio64 also supports 4 MB, however the Number Nine BIOS does not*/ - { - "" - } - } - }, - { - "", "", -1 - } +static const device_config_t s3_9fx_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 2, "", { 0 }, + { + { "1 MB", 1 }, + { "2 MB", 2 }, + /*Trio64 also supports 4 MB, however the Number Nine BIOS does not*/ + { "" } + } + }, + { "", "", -1 } }; -static const device_config_t s3_phoenix_trio32_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 2, "", { 0 }, - { - { - "512 KB", 0 - }, - { - "1 MB", 1 - }, - { - "2 MB", 2 - }, - { - "" - } - } - }, - { - "", "", -1 - } +static const device_config_t s3_phoenix_trio32_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 2, "", { 0 }, + { + { "512 KB", 0 }, + { "1 MB", 1 }, + { "2 MB", 2 }, + { "" } + } + }, + { "", "", -1 } }; -static const device_config_t s3_standard_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, - { - { - "1 MB", 1 - }, - { - "2 MB", 2 - }, - { - "4 MB", 4 - }, - { - "" - } - } - }, - { - "", "", -1 - } +static const device_config_t s3_standard_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, + { + { "1 MB", 1 }, + { "2 MB", 2 }, + { "4 MB", 4 }, + { "" } + } + }, + { "", "", -1 } }; -static const device_config_t s3_968_config[] = -{ - { - "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, - { - { - "1 MB", 1 - }, - { - "2 MB", 2 - }, - { - "4 MB", 4 - }, - { - "8 MB", 8 - }, - { - "" - } - } - }, - { - "", "", -1 - } +static const device_config_t s3_968_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, + { + { "1 MB", 1 }, + { "2 MB", 2 }, + { "4 MB", 4 }, + { "8 MB", 8 }, + { "" } + } + }, + { "", "", -1 } }; +// clang-format on const device_t s3_orchid_86c911_isa_device = { @@ -8384,7 +8333,7 @@ const device_t s3_elsa_winner2000_pro_x_964_pci_device = S3_ELSAWIN2KPROX_964, s3_init, s3_close, - s3_reset, + s3_reset, { s3_elsa_winner2000_pro_x_964_available }, s3_speed_changed, s3_force_redraw, @@ -8399,7 +8348,7 @@ const device_t s3_elsa_winner2000_pro_x_pci_device = S3_ELSAWIN2KPROX, s3_init, s3_close, - s3_reset, + s3_reset, { s3_elsa_winner2000_pro_x_available }, s3_speed_changed, s3_force_redraw, @@ -8414,7 +8363,7 @@ const device_t s3_trio64v2_dx_pci_device = S3_TRIO64V2_DX, s3_init, s3_close, - s3_reset, + s3_reset, { s3_trio64v2_dx_available }, s3_speed_changed, s3_force_redraw, @@ -8430,7 +8379,7 @@ const device_t s3_trio64v2_dx_onboard_pci_device = S3_TRIO64V2_DX_ONBOARD, s3_init, s3_close, - NULL, + NULL, { NULL }, s3_speed_changed, s3_force_redraw, diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c index 7f2a37253..4acaa0aa0 100644 --- a/src/video/vid_s3_virge.c +++ b/src/video/vid_s3_virge.c @@ -4216,102 +4216,60 @@ static void s3_virge_force_redraw(void *p) virge->svga.fullchange = changeframecount; } +// clang-format off static const device_config_t s3_virge_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, - { - { - "2 MB", 2 - }, - { - "4 MB", 4 - }, - { - "" - } - } - }, - { - "bilinear", "Bilinear filtering", CONFIG_BINARY, "", 1 - }, - { - "dithering", "Dithering", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 + { "2 MB", 2 }, + { "4 MB", 4 }, + { "" } } + }, + { "bilinear", "Bilinear filtering", CONFIG_BINARY, "", 1 }, + { "dithering", "Dithering", CONFIG_BINARY, "", 1 }, + { "", "", -1 } }; static const device_config_t s3_virge_stb_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, - { - { - "2 MB", 2 - }, - { - "4 MB", 4 - }, - { - "8 MB", 8 - }, - { - "" - } - } - }, - { - "bilinear", "Bilinear filtering", CONFIG_BINARY, "", 1 - }, - { - "dithering", "Dithering", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 + { "2 MB", 2 }, + { "4 MB", 4 }, + { "8 MB", 8 }, + { "" } } + }, + { "bilinear", "Bilinear filtering", CONFIG_BINARY, "", 1 }, + { "dithering", "Dithering", CONFIG_BINARY, "", 1 }, + { "", "", -1 } }; static const device_config_t s3_virge_357_config[] = { - { - "bilinear", "Bilinear filtering", CONFIG_BINARY, "", 1 - }, - { - "dithering", "Dithering", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 - } + { "bilinear", "Bilinear filtering", CONFIG_BINARY, "", 1 }, + { "dithering", "Dithering", CONFIG_BINARY, "", 1 }, + { "", "", -1 } }; static const device_config_t s3_trio3d2x_config[] = { + { + "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 4, "", { 0 }, - { - { - "4 MB", 4 - }, - { - "8 MB", 8 - }, - { - "" - } - } - }, - { - "bilinear", "Bilinear filtering", CONFIG_BINARY, "", 1 - }, - { - "dithering", "Dithering", CONFIG_BINARY, "", 1 - }, - { - "", "", -1 + { "4 MB", 4 }, + { "8 MB", 8 }, + { "" } } + }, + { "bilinear", "Bilinear filtering", CONFIG_BINARY, "", 1 }, + { "dithering", "Dithering", CONFIG_BINARY, "", 1 }, + { "", "", -1 } }; +// clang-format on const device_t s3_virge_325_pci_device = { @@ -4321,7 +4279,7 @@ const device_t s3_virge_325_pci_device = S3_VIRGE_325, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_325_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4336,7 +4294,7 @@ const device_t s3_diamond_stealth_2000_pci_device = S3_DIAMOND_STEALTH3D_2000, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_325_diamond_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4351,7 +4309,7 @@ const device_t s3_diamond_stealth_3000_pci_device = S3_DIAMOND_STEALTH3D_3000, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_988_diamond_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4366,7 +4324,7 @@ const device_t s3_stb_velocity_3d_pci_device = S3_STB_VELOCITY_3D, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_988_stb_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4381,7 +4339,7 @@ const device_t s3_virge_375_pci_device = S3_VIRGE_DX, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_375_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4396,7 +4354,7 @@ const device_t s3_diamond_stealth_2000pro_pci_device = S3_DIAMOND_STEALTH3D_2000PRO, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_375_diamond_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4411,7 +4369,7 @@ const device_t s3_virge_385_pci_device = S3_VIRGE_GX, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_385_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4426,7 +4384,7 @@ const device_t s3_virge_357_pci_device = S3_VIRGE_GX2, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_357_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4441,7 +4399,7 @@ const device_t s3_virge_357_agp_device = S3_VIRGE_GX2, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_357_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4456,7 +4414,7 @@ const device_t s3_diamond_stealth_4000_pci_device = S3_DIAMOND_STEALTH3D_4000, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_357_diamond_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4471,7 +4429,7 @@ const device_t s3_diamond_stealth_4000_agp_device = S3_DIAMOND_STEALTH3D_4000, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_virge_357_diamond_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4486,7 +4444,7 @@ const device_t s3_trio3d2x_pci_device = S3_TRIO_3D2X, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_trio3d2x_available }, s3_virge_speed_changed, s3_virge_force_redraw, @@ -4501,7 +4459,7 @@ const device_t s3_trio3d2x_agp_device = S3_TRIO_3D2X, s3_virge_init, s3_virge_close, - s3_virge_reset, + s3_virge_reset, { s3_trio3d2x_available }, s3_virge_speed_changed, s3_virge_force_redraw, diff --git a/src/video/vid_sigma.c b/src/video/vid_sigma.c index e7b154ba4..3472e9f1a 100644 --- a/src/video/vid_sigma.c +++ b/src/video/vid_sigma.c @@ -881,78 +881,39 @@ sigma_speed_changed(void *p) } -device_config_t sigma_config[] = -{ +device_config_t sigma_config[] = { +// clang-format off { - "rgb_type", "RGB type", CONFIG_SELECTION, "", 0, "", { 0 }, - { - { - "Color", 0 - }, - { - "Green Monochrome", 1 - }, - { - "Amber Monochrome", 2 - }, - { - "Gray Monochrome", 3 - }, - { - "Color (no brown)", 4 - }, - { - "" - } - } + "rgb_type", "RGB type", CONFIG_SELECTION, "", 0, "", { 0 }, + { + { "Color", 0 }, + { "Green Monochrome", 1 }, + { "Amber Monochrome", 2 }, + { "Gray Monochrome", 3 }, + { "Color (no brown)", 4 }, + { "" } + } }, + { "enable_nmi", "Enable NMI for CGA emulation", CONFIG_BINARY, "", 1 }, { - "enable_nmi", "Enable NMI for CGA emulation", CONFIG_BINARY, "", 1 + "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xc0000, "", { 0 }, + { + { "C000H", 0xc0000 }, + { "C800H", 0xc8000 }, + { "CC00H", 0xcc000 }, + { "D000H", 0xd0000 }, + { "D400H", 0xd4000 }, + { "D800H", 0xd8000 }, + { "DC00H", 0xdc000 }, + { "E000H", 0xe0000 }, + { "E400H", 0xe4000 }, + { "E800H", 0xe8000 }, + { "EC00H", 0xec000 }, + { "" } + }, }, - { - "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xc0000, "", { 0 }, - { - { - "C000H", 0xc0000 - }, - { - "C800H", 0xc8000 - }, - { - "CC00H", 0xcc000 - }, - { - "D000H", 0xd0000 - }, - { - "D400H", 0xd4000 - }, - { - "D800H", 0xd8000 - }, - { - "DC00H", 0xdc000 - }, - { - "E000H", 0xe0000 - }, - { - "E400H", 0xe4000 - }, - { - "E800H", 0xe8000 - }, - { - "EC00H", 0xec000 - }, - { - "" - } - }, - }, - { - "", "", -1 - } + { "", "", -1 } +// clang-format on }; const device_t sigma_device = diff --git a/src/video/vid_table.c b/src/video/vid_table.c index f3797e730..ccd9c4071 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -1,20 +1,20 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Define all known video cards. + * Define all known video cards. * * * - * Authors: Miran Grca, - * Fred N. van Kempen, + * Authors: Miran Grca, + * Fred N. van Kempen, * - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. */ #include #include @@ -39,7 +39,7 @@ typedef struct { - const device_t *device; + const device_t *device; } VIDEO_CARD; @@ -51,193 +51,204 @@ static int was_reset = 0; static const device_t vid_none_device = { "None", "none", - 0, 0, - NULL, NULL, NULL, - { NULL }, NULL, NULL, + 0, + 0, + NULL, + NULL, + NULL, + { NULL }, + NULL, + NULL, NULL }; static const device_t vid_internal_device = { "Internal", "internal", - 0, 0, - NULL, NULL, NULL, - { NULL }, NULL, NULL, + 0, + 0, + NULL, + NULL, NULL, + { NULL }, + NULL, + NULL, NULL }; static const VIDEO_CARD video_cards[] = { - { &vid_none_device }, - { &vid_internal_device }, - { &atiega_device }, - { &mach64gx_isa_device }, - { &ati28800k_device }, - { &ati18800_vga88_device }, - { &ati28800_device }, - { &compaq_ati28800_device }, +// clang-format off + { &vid_none_device }, + { &vid_internal_device }, + { &atiega_device }, + { &mach64gx_isa_device }, + { &ati28800k_device }, + { &ati18800_vga88_device }, + { &ati28800_device }, + { &compaq_ati28800_device }, #if defined(DEV_BRANCH) && defined(USE_XL24) - { &ati28800_wonderxl24_device }, + { &ati28800_wonderxl24_device }, #endif - { &ati18800_device }, + { &ati18800_device }, #if defined(DEV_BRANCH) && defined(USE_VGAWONDER) - { &ati18800_wonder_device }, + { &ati18800_wonder_device }, #endif - { &cga_device }, - { &sega_device }, - { &gd5401_isa_device }, - { &gd5402_isa_device }, - { &gd5420_isa_device }, - { &gd5422_isa_device }, - { &gd5426_isa_device }, - { &gd5426_diamond_speedstar_pro_a1_isa_device }, - { &gd5428_isa_device }, - { &gd5429_isa_device }, - { &gd5434_isa_device }, - { &gd5434_diamond_speedstar_64_a3_isa_device }, - { &compaq_cga_device }, - { &compaq_cga_2_device }, - { &cpqega_device }, - { &ega_device }, - { &g2_gc205_device }, - { &hercules_device }, - { &herculesplus_device }, - { &incolor_device }, - { &im1024_device }, - { &iskra_ega_device }, - { &et4000_kasan_isa_device }, - { &mda_device }, - { &genius_device }, - { &nga_device }, - { &ogc_device }, - { &oti037c_device }, - { &oti067_device }, - { &oti077_device }, - { ¶dise_pvga1a_device }, - { ¶dise_wd90c11_device }, - { ¶dise_wd90c30_device }, - { &colorplus_device }, - { &pgc_device }, - { &radius_svga_multiview_isa_device }, - { &realtek_rtg3106_device }, - { &s3_diamond_stealth_vram_isa_device }, - { &s3_orchid_86c911_isa_device }, - { &s3_ami_86c924_isa_device }, - { &s3_metheus_86c928_isa_device }, - { &s3_phoenix_86c801_isa_device }, - { &s3_spea_mirage_86c801_isa_device }, - { &sigma_device }, - { &tvga8900b_device }, - { &tvga8900d_device }, - { &tvga9000b_device }, - { &et4000k_isa_device }, - { &et2000_device }, - { &et4000_isa_device }, - { &et4000w32_device }, - { &et4000w32i_isa_device }, - { &vga_device }, - { &v7_vga_1024i_device }, - { &wy700_device }, - { &gd5428_mca_device }, - { &et4000_mca_device }, - { &radius_svga_multiview_mca_device }, - { &mach64gx_pci_device }, - { &mach64vt2_device }, - { &et4000w32p_videomagic_revb_pci_device }, - { &et4000w32p_revc_pci_device }, - { &et4000w32p_cardex_pci_device }, - { &et4000w32p_noncardex_pci_device }, - { &et4000w32p_pci_device }, - { &gd5430_pci_device, }, - { &gd5434_pci_device }, - { &gd5436_pci_device }, - { &gd5440_pci_device }, - { &gd5446_pci_device }, - { &gd5446_stb_pci_device }, - { &gd5480_pci_device }, - { &s3_spea_mercury_lite_86c928_pci_device }, - { &s3_diamond_stealth64_964_pci_device }, - { &s3_elsa_winner2000_pro_x_964_pci_device }, - { &s3_mirocrystal_20sv_964_pci_device }, - { &s3_bahamas64_pci_device }, - { &s3_phoenix_vision864_pci_device }, - { &s3_diamond_stealth_se_pci_device }, - { &s3_phoenix_trio32_pci_device }, - { &s3_diamond_stealth64_pci_device }, - { &s3_9fx_pci_device }, - { &s3_phoenix_trio64_pci_device }, - { &s3_elsa_winner2000_pro_x_pci_device }, - { &s3_mirovideo_40sv_ergo_968_pci_device }, - { &s3_9fx_771_pci_device }, - { &s3_phoenix_vision968_pci_device }, - { &s3_spea_mercury_p64v_pci_device }, - { &s3_9fx_531_pci_device }, - { &s3_phoenix_vision868_pci_device }, - { &s3_phoenix_trio64vplus_pci_device }, - { &s3_trio64v2_dx_pci_device }, - { &s3_virge_325_pci_device }, - { &s3_diamond_stealth_2000_pci_device }, - { &s3_diamond_stealth_3000_pci_device }, - { &s3_stb_velocity_3d_pci_device }, - { &s3_virge_375_pci_device }, - { &s3_diamond_stealth_2000pro_pci_device }, - { &s3_virge_385_pci_device }, - { &s3_virge_357_pci_device }, - { &s3_diamond_stealth_4000_pci_device }, - { &s3_trio3d2x_pci_device }, + { &cga_device }, + { &sega_device }, + { &gd5401_isa_device }, + { &gd5402_isa_device }, + { &gd5420_isa_device }, + { &gd5422_isa_device }, + { &gd5426_isa_device }, + { &gd5426_diamond_speedstar_pro_a1_isa_device }, + { &gd5428_isa_device }, + { &gd5429_isa_device }, + { &gd5434_isa_device }, + { &gd5434_diamond_speedstar_64_a3_isa_device }, + { &compaq_cga_device }, + { &compaq_cga_2_device }, + { &cpqega_device }, + { &ega_device }, + { &g2_gc205_device }, + { &hercules_device }, + { &herculesplus_device }, + { &incolor_device }, + { &im1024_device }, + { &iskra_ega_device }, + { &et4000_kasan_isa_device }, + { &mda_device }, + { &genius_device }, + { &nga_device }, + { &ogc_device }, + { &oti037c_device }, + { &oti067_device }, + { &oti077_device }, + { ¶dise_pvga1a_device }, + { ¶dise_wd90c11_device }, + { ¶dise_wd90c30_device }, + { &colorplus_device }, + { &pgc_device }, + { &radius_svga_multiview_isa_device }, + { &realtek_rtg3106_device }, + { &s3_diamond_stealth_vram_isa_device }, + { &s3_orchid_86c911_isa_device }, + { &s3_ami_86c924_isa_device }, + { &s3_metheus_86c928_isa_device }, + { &s3_phoenix_86c801_isa_device }, + { &s3_spea_mirage_86c801_isa_device }, + { &sigma_device }, + { &tvga8900b_device }, + { &tvga8900d_device }, + { &tvga9000b_device }, + { &et4000k_isa_device }, + { &et2000_device }, + { &et4000_isa_device }, + { &et4000w32_device }, + { &et4000w32i_isa_device }, + { &vga_device }, + { &v7_vga_1024i_device }, + { &wy700_device }, + { &gd5428_mca_device }, + { &et4000_mca_device }, + { &radius_svga_multiview_mca_device }, + { &mach64gx_pci_device }, + { &mach64vt2_device }, + { &et4000w32p_videomagic_revb_pci_device }, + { &et4000w32p_revc_pci_device }, + { &et4000w32p_cardex_pci_device }, + { &et4000w32p_noncardex_pci_device }, + { &et4000w32p_pci_device }, + { &gd5430_pci_device, }, + { &gd5434_pci_device }, + { &gd5436_pci_device }, + { &gd5440_pci_device }, + { &gd5446_pci_device }, + { &gd5446_stb_pci_device }, + { &gd5480_pci_device }, + { &s3_spea_mercury_lite_86c928_pci_device }, + { &s3_diamond_stealth64_964_pci_device }, + { &s3_elsa_winner2000_pro_x_964_pci_device }, + { &s3_mirocrystal_20sv_964_pci_device }, + { &s3_bahamas64_pci_device }, + { &s3_phoenix_vision864_pci_device }, + { &s3_diamond_stealth_se_pci_device }, + { &s3_phoenix_trio32_pci_device }, + { &s3_diamond_stealth64_pci_device }, + { &s3_9fx_pci_device }, + { &s3_phoenix_trio64_pci_device }, + { &s3_elsa_winner2000_pro_x_pci_device }, + { &s3_mirovideo_40sv_ergo_968_pci_device }, + { &s3_9fx_771_pci_device }, + { &s3_phoenix_vision968_pci_device }, + { &s3_spea_mercury_p64v_pci_device }, + { &s3_9fx_531_pci_device }, + { &s3_phoenix_vision868_pci_device }, + { &s3_phoenix_trio64vplus_pci_device }, + { &s3_trio64v2_dx_pci_device }, + { &s3_virge_325_pci_device }, + { &s3_diamond_stealth_2000_pci_device }, + { &s3_diamond_stealth_3000_pci_device }, + { &s3_stb_velocity_3d_pci_device }, + { &s3_virge_375_pci_device }, + { &s3_diamond_stealth_2000pro_pci_device }, + { &s3_virge_385_pci_device }, + { &s3_virge_357_pci_device }, + { &s3_diamond_stealth_4000_pci_device }, + { &s3_trio3d2x_pci_device }, #if defined(DEV_BRANCH) && defined(USE_MGA) - { &millennium_device }, - { &mystique_device }, - { &mystique_220_device }, + { &millennium_device }, + { &mystique_device }, + { &mystique_220_device }, #endif - { &tgui9440_pci_device }, - { &tgui9660_pci_device }, - { &tgui9680_pci_device }, - { &voodoo_banshee_device }, - { &creative_voodoo_banshee_device }, - { &voodoo_3_2000_device }, - { &voodoo_3_3000_device }, - { &mach64gx_vlb_device }, - { &et4000w32i_vlb_device }, - { &et4000w32p_videomagic_revb_vlb_device }, - { &et4000w32p_revc_vlb_device }, - { &et4000w32p_cardex_vlb_device }, - { &et4000w32p_vlb_device }, - { &et4000w32p_noncardex_vlb_device }, - { &gd5424_vlb_device }, - { &gd5426_vlb_device }, - { &gd5428_vlb_device }, - { &gd5428_diamond_speedstar_pro_b1_vlb_device }, - { &gd5429_vlb_device }, - { &gd5430_diamond_speedstar_pro_se_a8_vlb_device }, - { &gd5434_vlb_device }, - { &s3_metheus_86c928_vlb_device }, - { &s3_mirocrystal_8s_805_vlb_device }, - { &s3_mirocrystal_10sd_805_vlb_device }, - { &s3_phoenix_86c805_vlb_device }, - { &s3_spea_mirage_86c805_vlb_device }, - { &s3_diamond_stealth64_964_vlb_device }, - { &s3_mirocrystal_20sv_964_vlb_device }, - { &s3_mirocrystal_20sd_864_vlb_device }, - { &s3_bahamas64_vlb_device }, - { &s3_phoenix_vision864_vlb_device }, - { &s3_diamond_stealth_se_vlb_device }, - { &s3_phoenix_trio32_vlb_device }, - { &s3_diamond_stealth64_vlb_device }, - { &s3_9fx_vlb_device }, - { &s3_phoenix_trio64_vlb_device }, - { &s3_spea_mirage_p64_vlb_device }, - { &s3_phoenix_vision968_vlb_device }, - { &s3_phoenix_vision868_vlb_device }, - { &ht216_32_standalone_device }, - { &tgui9400cxi_device }, - { &tgui9440_vlb_device }, - { &s3_virge_357_agp_device }, - { &s3_diamond_stealth_4000_agp_device }, - { &s3_trio3d2x_agp_device }, - { &velocity_100_agp_device }, - { &voodoo_3_2000_agp_device }, - { &voodoo_3_3000_agp_device }, - { NULL } + { &tgui9440_pci_device }, + { &tgui9660_pci_device }, + { &tgui9680_pci_device }, + { &voodoo_banshee_device }, + { &creative_voodoo_banshee_device }, + { &voodoo_3_2000_device }, + { &voodoo_3_3000_device }, + { &mach64gx_vlb_device }, + { &et4000w32i_vlb_device }, + { &et4000w32p_videomagic_revb_vlb_device }, + { &et4000w32p_revc_vlb_device }, + { &et4000w32p_cardex_vlb_device }, + { &et4000w32p_vlb_device }, + { &et4000w32p_noncardex_vlb_device }, + { &gd5424_vlb_device }, + { &gd5426_vlb_device }, + { &gd5428_vlb_device }, + { &gd5428_diamond_speedstar_pro_b1_vlb_device }, + { &gd5429_vlb_device }, + { &gd5430_diamond_speedstar_pro_se_a8_vlb_device }, + { &gd5434_vlb_device }, + { &s3_metheus_86c928_vlb_device }, + { &s3_mirocrystal_8s_805_vlb_device }, + { &s3_mirocrystal_10sd_805_vlb_device }, + { &s3_phoenix_86c805_vlb_device }, + { &s3_spea_mirage_86c805_vlb_device }, + { &s3_diamond_stealth64_964_vlb_device }, + { &s3_mirocrystal_20sv_964_vlb_device }, + { &s3_mirocrystal_20sd_864_vlb_device }, + { &s3_bahamas64_vlb_device }, + { &s3_phoenix_vision864_vlb_device }, + { &s3_diamond_stealth_se_vlb_device }, + { &s3_phoenix_trio32_vlb_device }, + { &s3_diamond_stealth64_vlb_device }, + { &s3_9fx_vlb_device }, + { &s3_phoenix_trio64_vlb_device }, + { &s3_spea_mirage_p64_vlb_device }, + { &s3_phoenix_vision968_vlb_device }, + { &s3_phoenix_vision868_vlb_device }, + { &ht216_32_standalone_device }, + { &tgui9400cxi_device }, + { &tgui9440_vlb_device }, + { &s3_virge_357_agp_device }, + { &s3_diamond_stealth_4000_agp_device }, + { &s3_trio3d2x_agp_device }, + { &velocity_100_agp_device }, + { &voodoo_3_2000_agp_device }, + { &voodoo_3_3000_agp_device }, + { NULL } +// clang-format off }; @@ -251,9 +262,9 @@ vid_table_log(const char *fmt, ...) va_list ap; if (vid_table_do_log) { - va_start(ap, fmt); - pclog_ex(fmt, ap); - va_end(ap); + va_start(ap, fmt); + pclog_ex(fmt, ap); + va_end(ap); } } #else @@ -274,8 +285,8 @@ video_prepare(void) { /* Reset (deallocate) the video font arrays. */ if (fontdatksc5601) { - free(fontdatksc5601); - fontdatksc5601 = NULL; + free(fontdatksc5601); + fontdatksc5601 = NULL; } /* Reset the CGA palette. */ @@ -295,8 +306,8 @@ void video_pre_reset(int card) { if ((card == VID_NONE) || \ - (card == VID_INTERNAL) || machine_has_flags(machine, MACHINE_VIDEO_ONLY)) - video_prepare(); + (card == VID_INTERNAL) || machine_has_flags(machine, MACHINE_VIDEO_ONLY)) + video_prepare(); } @@ -305,27 +316,27 @@ video_reset(int card) { /* This is needed to avoid duplicate resets. */ if ((video_get_type() != VIDEO_FLAG_TYPE_NONE) && was_reset) - return; + return; vid_table_log("VIDEO: reset (gfxcard=%d, internal=%d)\n", - card, machine_has_flags(machine, MACHINE_VIDEO) ? 1 : 0); + card, machine_has_flags(machine, MACHINE_VIDEO) ? 1 : 0); loadfont("roms/video/mda/mda.rom", 0); /* Do not initialize internal cards here. */ if (!(card == VID_NONE) && \ - !(card == VID_INTERNAL) && !machine_has_flags(machine, MACHINE_VIDEO_ONLY)) { - vid_table_log("VIDEO: initializing '%s'\n", video_cards[card].name); + !(card == VID_INTERNAL) && !machine_has_flags(machine, MACHINE_VIDEO_ONLY)) { + vid_table_log("VIDEO: initializing '%s'\n", video_cards[card].name); - video_prepare(); + video_prepare(); - /* Initialize the video card. */ - device_add(video_cards[card].device); + /* Initialize the video card. */ + device_add(video_cards[card].device); } /* Enable the Voodoo if configured. */ if (voodoo_enabled) - device_add(&voodoo_device); + device_add(&voodoo_device); was_reset = 1; } @@ -335,7 +346,7 @@ int video_card_available(int card) { if (video_cards[card].device) - return(device_available(video_cards[card].device)); + return(device_available(video_cards[card].device)); return(1); } @@ -370,9 +381,9 @@ video_get_video_from_internal_name(char *s) int c = 0; while (video_cards[c].device != NULL) { - if (!strcmp((char *) video_cards[c].device->internal_name, s)) - return(c); - c++; + if (!strcmp((char *) video_cards[c].device->internal_name, s)) + return(c); + c++; } return(0); diff --git a/src/video/vid_tgui9440.c b/src/video/vid_tgui9440.c index a59a479b3..d56bc2038 100644 --- a/src/video/vid_tgui9440.c +++ b/src/video/vid_tgui9440.c @@ -3171,64 +3171,61 @@ void tgui_force_redraw(void *p) tgui->svga.fullchange = changeframecount; } - -static const device_config_t tgui9440_config[] = -{ - { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1 MB", - .value = 1 - }, - { - .description = "2 MB", - .value = 2 - }, - { - .description = "" - } - }, - .default_int = 2 +// clang-format off +static const device_config_t tgui9440_config[] = { + { + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1 MB", + .value = 1 + }, + { + .description = "2 MB", + .value = 2 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 2 + }, + { + .type = -1 + } }; -static const device_config_t tgui96xx_config[] = -{ - { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1 MB", - .value = 1 - }, - { - .description = "2 MB", - .value = 2 - }, - { - .description = "4 MB", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 4 +static const device_config_t tgui96xx_config[] = { + { + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1 MB", + .value = 1 + }, + { + .description = "2 MB", + .value = 2 + }, + { + .description = "4 MB", + .value = 4 + }, + { + .description = "" + } }, - { - .type = -1 - } + .default_int = 4 + }, + { + .type = -1 + } }; +// clang-format on const device_t tgui9400cxi_device = { @@ -3238,7 +3235,7 @@ const device_t tgui9400cxi_device = TGUI_9400CXI, tgui_init, tgui_close, - NULL, + NULL, { tgui9400cxi_available }, tgui_speed_changed, tgui_force_redraw, @@ -3250,10 +3247,10 @@ const device_t tgui9440_vlb_device = "Trident TGUI 9440AGi VLB", "tgui9440_vlb", DEVICE_VLB, - TGUI_9440, + TGUI_9440, tgui_init, tgui_close, - NULL, + NULL, { tgui9440_available }, tgui_speed_changed, tgui_force_redraw, @@ -3265,10 +3262,10 @@ const device_t tgui9440_pci_device = "Trident TGUI 9440AGi PCI", "tgui9440_pci", DEVICE_PCI, - TGUI_9440, + TGUI_9440, tgui_init, tgui_close, - NULL, + NULL, { tgui9440_available }, tgui_speed_changed, tgui_force_redraw, @@ -3280,10 +3277,10 @@ const device_t tgui9440_onboard_pci_device = "Trident TGUI 9440AGi On-Board PCI", "tgui9440_onboard_pci", DEVICE_PCI, - TGUI_9440 | ONBOARD, + TGUI_9440 | ONBOARD, tgui_init, tgui_close, - NULL, + NULL, { NULL }, tgui_speed_changed, tgui_force_redraw, @@ -3295,10 +3292,10 @@ const device_t tgui9660_pci_device = "Trident TGUI 9660XGi PCI", "tgui9660_pci", DEVICE_PCI, - TGUI_9660, + TGUI_9660, tgui_init, tgui_close, - NULL, + NULL, { tgui96xx_available }, tgui_speed_changed, tgui_force_redraw, @@ -3310,10 +3307,10 @@ const device_t tgui9680_pci_device = "Trident TGUI 9680XGi PCI", "tgui9680_pci", DEVICE_PCI, - TGUI_9680, + TGUI_9680, tgui_init, tgui_close, - NULL, + NULL, { tgui96xx_available }, tgui_speed_changed, tgui_force_redraw, diff --git a/src/video/vid_tvga.c b/src/video/vid_tvga.c index 9f4cae6f4..dd68829ef 100644 --- a/src/video/vid_tvga.c +++ b/src/video/vid_tvga.c @@ -445,27 +445,19 @@ void tvga_force_redraw(void *p) static const device_config_t tvga_config[] = { +// clang-format off + { + "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, { - "memory", "Memory size", CONFIG_SELECTION, "", 1024, "", { 0 }, - { - { - "256 kB", 256 - }, - { - "512 kB", 512 - }, - { - "1 MB", 1024 - }, - /*Chip supports 2mb, but drivers are buggy*/ - { - "" - } - } - }, - { - "", "", -1 + { "256 kB", 256 }, + { "512 kB", 512 }, + { "1 MB", 1024 }, + /*Chip supports 2mb, but drivers are buggy*/ + { "" } } + }, + { "", "", -1 } +// clang-format off }; const device_t tvga8900b_device = @@ -473,10 +465,10 @@ const device_t tvga8900b_device = "Trident TVGA 8900B", "tvga8900b", DEVICE_ISA, - TVGA8900B_ID, + TVGA8900B_ID, tvga_init, tvga_close, - NULL, + NULL, { tvga8900b_available }, tvga_speed_changed, tvga_force_redraw, @@ -488,10 +480,10 @@ const device_t tvga8900d_device = "Trident TVGA 8900D", "tvga8900d", DEVICE_ISA, - TVGA8900CLD_ID, + TVGA8900CLD_ID, tvga_init, tvga_close, - NULL, + NULL, { tvga8900d_available }, tvga_speed_changed, tvga_force_redraw, @@ -503,10 +495,10 @@ const device_t tvga9000b_device = "Trident TVGA 9000B", "tvga9000b", DEVICE_ISA, - TVGA9000B_ID, + TVGA9000B_ID, tvga_init, tvga_close, - NULL, + NULL, { tvga9000b_available }, tvga_speed_changed, tvga_force_redraw, diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c index 90aff23e2..473dab58b 100644 --- a/src/video/vid_vga.c +++ b/src/video/vid_vga.c @@ -186,10 +186,10 @@ const device_t vga_device = "VGA", "vga", DEVICE_ISA, - 0, + 0, vga_init, vga_close, - NULL, + NULL, { vga_available }, vga_speed_changed, vga_force_redraw, @@ -201,10 +201,10 @@ const device_t ps1vga_device = "PS/1 VGA", "ps1vga", DEVICE_ISA, - 0, + 0, ps1vga_init, vga_close, - NULL, + NULL, { vga_available }, vga_speed_changed, vga_force_redraw, @@ -216,10 +216,10 @@ const device_t ps1vga_mca_device = "PS/1 VGA", "ps1vga_mca", DEVICE_MCA, - 0, + 0, ps1vga_init, vga_close, - NULL, + NULL, { vga_available }, vga_speed_changed, vga_force_redraw, diff --git a/src/video/vid_voodoo.c b/src/video/vid_voodoo.c index 43d389353..76e6c4009 100644 --- a/src/video/vid_voodoo.c +++ b/src/video/vid_voodoo.c @@ -1299,131 +1299,128 @@ void voodoo_close(void *p) free(voodoo_set); } -static const device_config_t voodoo_config[] = -{ - { - .name = "type", - .description = "Voodoo type", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "Voodoo Graphics", - .value = VOODOO_1 - }, - { - .description = "Obsidian SB50 + Amethyst (2 TMUs)", - .value = VOODOO_SB50 - }, - { - .description = "Voodoo 2", - .value = VOODOO_2 - }, - { - .description = "" - } - }, - .default_int = 0 +static const device_config_t voodoo_config[] = { +// clang-format off + { + .name = "type", + .description = "Voodoo type", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "Voodoo Graphics", + .value = VOODOO_1 + }, + { + .description = "Obsidian SB50 + Amethyst (2 TMUs)", + .value = VOODOO_SB50 + }, + { + .description = "Voodoo 2", + .value = VOODOO_2 + }, + { + .description = "" + } }, - { - .name = "framebuffer_memory", - .description = "Framebuffer memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "2 MB", - .value = 2 - }, - { - .description = "4 MB", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 2 + .default_int = 0 + }, + { + .name = "framebuffer_memory", + .description = "Framebuffer memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "2 MB", + .value = 2 + }, + { + .description = "4 MB", + .value = 4 + }, + { + .description = "" + } }, - { - .name = "texture_memory", - .description = "Texture memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "2 MB", - .value = 2 - }, - { - .description = "4 MB", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 2 + .default_int = 2 + }, + { + .name = "texture_memory", + .description = "Texture memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "2 MB", + .value = 2 + }, + { + .description = "4 MB", + .value = 4 + }, + { + .description = "" + } }, - { - .name = "bilinear", - .description = "Bilinear filtering", - .type = CONFIG_BINARY, - .default_int = 1 - }, - { - .name = "dithersub", - .description = "Dither subtraction", - .type = CONFIG_BINARY, - .default_int = 1 - }, - { - .name = "dacfilter", - .description = "Screen Filter", - .type = CONFIG_BINARY, - .default_int = 0 - }, - { - .name = "render_threads", - .description = "Render threads", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1", - .value = 1 - }, - { - .description = "2", - .value = 2 - }, - { - .description = "4", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 2 - }, - { - .name = "sli", - .description = "SLI", - .type = CONFIG_BINARY, - .default_int = 0 + .default_int = 2 + }, + { + .name = "bilinear", + .description = "Bilinear filtering", + .type = CONFIG_BINARY, + .default_int = 1 + }, + { + .name = "dithersub", + .description = "Dither subtraction", + .type = CONFIG_BINARY, + .default_int = 1 + }, + { + .name = "dacfilter", + .description = "Screen Filter", + .type = CONFIG_BINARY, + .default_int = 0 + }, + { + .name = "render_threads", + .description = "Render threads", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1", + .value = 1 + }, + { + .description = "2", + .value = 2 + }, + { + .description = "4", + .value = 4 + }, + { + .description = "" + } }, + .default_int = 2 + }, + { + .name = "sli", + .description = "SLI", + .type = CONFIG_BINARY, + .default_int = 0 + }, #ifndef NO_CODEGEN - { - .name = "recompiler", - .description = "Recompiler", - .type = CONFIG_BINARY, - .default_int = 1 - }, + { + .name = "recompiler", + .description = "Recompiler", + .type = CONFIG_BINARY, + .default_int = 1 + }, #endif - { - .type = -1 - } + { + .type = -1 + } +// clang-format on }; const device_t voodoo_device = @@ -1431,10 +1428,10 @@ const device_t voodoo_device = "3DFX Voodoo Graphics", "voodoo", DEVICE_PCI, - 0, + 0, voodoo_init, voodoo_close, - NULL, + NULL, { NULL }, voodoo_speed_changed, voodoo_force_blit, diff --git a/src/video/vid_voodoo_banshee.c b/src/video/vid_voodoo_banshee.c index 933f521a0..b314cc152 100644 --- a/src/video/vid_voodoo_banshee.c +++ b/src/video/vid_voodoo_banshee.c @@ -2600,139 +2600,138 @@ static void banshee_pci_write(int func, int addr, uint8_t val, void *p) } } +// clang-format off static const device_config_t banshee_sgram_config[] = { - { - .name = "memory", - .description = "Memory size", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "8 MB", - .value = 8 - }, - { - .description = "16 MB", - .value = 16 - }, - { - .description = "" - } - }, - .default_int = 16 + { + .name = "memory", + .description = "Memory size", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "8 MB", + .value = 8 + }, + { + .description = "16 MB", + .value = 16 + }, + { + .description = "" + } }, - { - .name = "bilinear", - .description = "Bilinear filtering", - .type = CONFIG_BINARY, - .default_int = 1 - }, - { - .name = "dithersub", - .description = "Dither subtraction", - .type = CONFIG_BINARY, - .default_int = 1 - }, - { - .name = "dacfilter", - .description = "Screen Filter", - .type = CONFIG_BINARY, - .default_int = 0 - }, - { - .name = "render_threads", - .description = "Render threads", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1", - .value = 1 - }, - { - .description = "2", - .value = 2 - }, - { - .description = "4", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 2 + .default_int = 16 + }, + { + .name = "bilinear", + .description = "Bilinear filtering", + .type = CONFIG_BINARY, + .default_int = 1 + }, + { + .name = "dithersub", + .description = "Dither subtraction", + .type = CONFIG_BINARY, + .default_int = 1 + }, + { + .name = "dacfilter", + .description = "Screen Filter", + .type = CONFIG_BINARY, + .default_int = 0 + }, + { + .name = "render_threads", + .description = "Render threads", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1", + .value = 1 + }, + { + .description = "2", + .value = 2 + }, + { + .description = "4", + .value = 4 + }, + { + .description = "" + } }, + .default_int = 2 + }, #ifndef NO_CODEGEN - { - .name = "recompiler", - .description = "Recompiler", - .type = CONFIG_BINARY, - .default_int = 1 - }, + { + .name = "recompiler", + .description = "Recompiler", + .type = CONFIG_BINARY, + .default_int = 1 + }, #endif - { - .type = -1 - } + { + .type = -1 + } }; static const device_config_t banshee_sdram_config[] = { - { - .name = "bilinear", - .description = "Bilinear filtering", - .type = CONFIG_BINARY, - .default_int = 1 - }, - { - .name = "dithersub", - .description = "Dither subtraction", - .type = CONFIG_BINARY, - .default_int = 1 - }, - { - .name = "dacfilter", - .description = "Screen Filter", - .type = CONFIG_BINARY, - .default_int = 0 - }, - { - .name = "render_threads", - .description = "Render threads", - .type = CONFIG_SELECTION, - .selection = - { - { - .description = "1", - .value = 1 - }, - { - .description = "2", - .value = 2 - }, - { - .description = "4", - .value = 4 - }, - { - .description = "" - } - }, - .default_int = 2 + { + .name = "bilinear", + .description = "Bilinear filtering", + .type = CONFIG_BINARY, + .default_int = 1 + }, + { + .name = "dithersub", + .description = "Dither subtraction", + .type = CONFIG_BINARY, + .default_int = 1 + }, + { + .name = "dacfilter", + .description = "Screen Filter", + .type = CONFIG_BINARY, + .default_int = 0 + }, + { + .name = "render_threads", + .description = "Render threads", + .type = CONFIG_SELECTION, + .selection = { + { + .description = "1", + .value = 1 + }, + { + .description = "2", + .value = 2 + }, + { + .description = "4", + .value = 4 + }, + { + .description = "" + } }, + .default_int = 2 + }, #ifndef NO_CODEGEN - { - .name = "recompiler", - .description = "Recompiler", - .type = CONFIG_BINARY, - .default_int = 1 - }, + { + .name = "recompiler", + .description = "Recompiler", + .type = CONFIG_BINARY, + .default_int = 1 + }, #endif - { - .type = -1 - } + { + .type = -1 + } }; +// clang-format on static void *banshee_init_common(const device_t *info, char *fn, int has_sgram, int type, int voodoo_type, int agp) { diff --git a/src/video/vid_wy700.c b/src/video/vid_wy700.c index 75a78b3c1..e0333bf17 100644 --- a/src/video/vid_wy700.c +++ b/src/video/vid_wy700.c @@ -1014,9 +1014,9 @@ const device_t wy700_device = DEVICE_ISA, 0, wy700_init, wy700_close, - NULL, + NULL, { NULL }, wy700_speed_changed, - NULL, + NULL, NULL };