From d1b274ace24b8386b6fb00d29c74ffcaf1d0ebc6 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 2 Apr 2022 22:23:57 -0400 Subject: [PATCH] src/network --- src/network/net_3c503.c | 101 ++++++++----- src/network/net_dp8390.c | 1 - src/network/net_ne2000.c | 174 +++++++++++++++------- src/network/net_pcnet.c | 130 +++++++++++------ src/network/net_plip.c | 1 - src/network/net_wd8003.c | 304 +++++++++++++++++++++++++-------------- 6 files changed, 471 insertions(+), 240 deletions(-) diff --git a/src/network/net_3c503.c b/src/network/net_3c503.c index 03d224a4a..bb2ed1628 100644 --- a/src/network/net_3c503.c +++ b/src/network/net_3c503.c @@ -635,59 +635,88 @@ threec503_nic_close(void *priv) free(dev); } - 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 } + .name = "base", + .description = "Address", + .type = CONFIG_HEX16, + .default_string = "", + .default_int = 0x300, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "0x250", .value = 0x250 }, + { .description = "0x280", .value = 0x280 }, + { .description = "0x2a0", .value = 0x2a0 }, + { .description = "0x2e0", .value = 0x2e0 }, + { .description = "0x300", .value = 0x300 }, + { .description = "0x310", .value = 0x310 }, + { .description = "0x330", .value = 0x330 }, + { .description = "0x350", .value = 0x350 }, + { .description = "", .value = 0 } }, }, { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { "IRQ 2", 2 }, - { "IRQ 3", 3 }, - { "IRQ 4", 4 }, - { "IRQ 5", 5 }, - { "", 0 } + .name = "irq", + .description = "IRQ", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 3, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "IRQ 2", .value = 2 }, + { .description = "IRQ 3", .value = 3 }, + { .description = "IRQ 4", .value = 4 }, + { .description = "IRQ 5", .value = 5 }, + { .description = "", .value = 0 } }, }, { - "dma", "DMA", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { "DMA 1", 1 }, - { "DMA 2", 2 }, - { "DMA 3", 3 }, - { "", 0 } + .name = "dma", + .description = "DMA", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 3, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "DMA 1", .value = 1 }, + { .description = "DMA 2", .value = 2 }, + { .description = "DMA 3", .value = 3 }, + { .description = "", .value = 0 } }, }, { - "mac", "MAC Address", CONFIG_MAC, "", -1, "", { 0 }, - { - { "", 0 } + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "", .value = 0 } }, }, { - "bios_addr", "BIOS address", CONFIG_HEX20, "", 0xCC000, "", { 0 }, - { - { "DC00", 0xDC000 }, - { "D800", 0xD8000 }, - { "C800", 0xC8000 }, - { "CC00", 0xCC000 }, - { "", 0 } + .name = "bios_addr", + .description = "BIOS address", + .type = CONFIG_HEX20, + .default_string = "", + .default_int = 0xCC000, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "DC00", .value = 0xDC000 }, + { .description = "D800", .value = 0xD8000 }, + { .description = "C800", .value = 0xC8000 }, + { .description = "CC00", .value = 0xCC000 }, + { .description = "", .value = 0 } }, }, - { "", "", -1 } + { .name = "", .description = "", .type = CONFIG_END } // clang-format off }; diff --git a/src/network/net_dp8390.c b/src/network/net_dp8390.c index 7dfcf8c34..819412454 100644 --- a/src/network/net_dp8390.c +++ b/src/network/net_dp8390.c @@ -1110,7 +1110,6 @@ dp8390_close(void *priv) } } - const device_t dp8390_device = { .name = "DP8390 Network Interface Controller", .internal_name = "dp8390", diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c index 1161a5a9c..5c0a7ba61 100644 --- a/src/network/net_ne2000.c +++ b/src/network/net_ne2000.c @@ -1142,86 +1142,152 @@ nic_close(void *priv) // 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 }, - { "" } + .name = "base", + .description = "Address", + .type = CONFIG_HEX16, + .default_string = "", + .default_int = 0x300, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "0x280", .value = 0x280 }, + { .description = "0x300", .value = 0x300 }, + { .description = "0x320", .value = 0x320 }, + { .description = "0x340", .value = 0x340 }, + { .description = "0x360", .value = 0x360 }, + { .description = "0x380", .value = 0x380 }, + { .description = "" } }, }, { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { "IRQ 2", 2 }, - { "IRQ 3", 3 }, - { "IRQ 5", 5 }, - { "IRQ 7", 7 }, - { "IRQ 10", 10 }, - { "IRQ 11", 11 }, - { "" } + .name = "irq", + .description = "IRQ", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 3, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "IRQ 2", .value = 2 }, + { .description = "IRQ 3", .value = 3 }, + { .description = "IRQ 5", .value = 5 }, + { .description = "IRQ 7", .value = 7 }, + { .description = "IRQ 10", .value = 10 }, + { .description = "IRQ 11", .value = 11 }, + { .description = "" } }, }, - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; 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 }, - { "" } + .name = "base", + .description = "Address", + .type = CONFIG_HEX16, + .default_string = "", + .default_int = 0x300, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "0x280", .value = 0x280 }, + { .description = "0x300", .value = 0x300 }, + { .description = "0x320", .value = 0x320 }, + { .description = "0x340", .value = 0x340 }, + { .description = "0x360", .value = 0x360 }, + { .description = "0x380", .value = 0x380 }, + { .description = "" } }, }, { - "irq", "IRQ", CONFIG_SELECTION, "", 10, "", { 0 }, - { - { "IRQ 2", 2 }, - { "IRQ 3", 3 }, - { "IRQ 5", 5 }, - { "IRQ 7", 7 }, - { "IRQ 10", 10 }, - { "IRQ 11", 11 }, - { "" } + .name = "irq", + .description = "IRQ", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 10, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "IRQ 2", .value = 2 }, + { .description = "IRQ 3", .value = 3 }, + { .description = "IRQ 5", .value = 5 }, + { .description = "IRQ 7", .value = 7 }, + { .description = "IRQ 10", .value = 10 }, + { .description = "IRQ 11", .value = 11 }, + { .description = "" } }, }, - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, { - "bios_addr", "BIOS address", CONFIG_HEX20, "", 0, "", { 0 }, - { - { "Disabled", 0x00000 }, - { "D000", 0xD0000 }, - { "D800", 0xD8000 }, - { "C800", 0xC8000 }, - { "" } + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { + .name = "bios_addr", + .description = "BIOS address", + .type = CONFIG_HEX20, + .default_string = "", + .default_int = 0, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "Disabled", .value = 0x00000 }, + { .description = "D000", .value = 0xD0000 }, + { .description = "D800", .value = 0xD8000 }, + { .description = "C800", .value = 0xC8000 }, + { .description = "" } }, }, - { "", "", -1 } + { .name = "", .description = "", .type = CONFIG_END } }; static const device_config_t rtl8019as_config[] = { - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; static const device_config_t rtl8029as_config[] = { - { "bios", "Enable BIOS", CONFIG_BINARY, "", 0 }, - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "bios", + .description = "Enable BIOS", + .type = CONFIG_BINARY, + .default_string = "", + .default_int = 0 + }, + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; static const device_config_t mca_mac_config[] = { - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; // clang-format on diff --git a/src/network/net_pcnet.c b/src/network/net_pcnet.c index 6dd22315d..047624dad 100644 --- a/src/network/net_pcnet.c +++ b/src/network/net_pcnet.c @@ -3078,68 +3078,116 @@ pcnet_close(void *priv) // clang-format off static const device_config_t pcnet_pci_config[] = { - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; static const device_config_t pcnet_isa_config[] = { { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { "0x300", 0x300 }, - { "0x320", 0x320 }, - { "0x340", 0x340 }, - { "0x360", 0x360 }, - { "" } + .name = "base", + .description = "Address", + .type = CONFIG_HEX16, + .default_string = "", + .default_int = 0x300, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "0x300", .value = 0x300 }, + { .description = "0x320", .value = 0x320 }, + { .description = "0x340", .value = 0x340 }, + { .description = "0x360", .value = 0x360 }, + { .description = "" } }, }, { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { "IRQ 3", 3 }, - { "IRQ 4", 4 }, - { "IRQ 5", 5 }, - { "IRQ 9", 9 }, - { "" } + .name = "irq", + .description = "IRQ", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 3, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "IRQ 3", .value = 3 }, + { .description = "IRQ 4", .value = 4 }, + { .description = "IRQ 5", .value = 5 }, + { .description = "IRQ 9", .value = 9 }, + { .description = "" } }, }, { - "dma", "DMA channel", CONFIG_SELECTION, "", 5, "", { 0 }, - { - { "DMA 3", 3 }, - { "DMA 5", 5 }, - { "DMA 6", 6 }, - { "DMA 7", 7 }, - { "" } + .name = "dma", + .description = "DMA channel", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 5, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "DMA 3", .value = 3 }, + { .description = "DMA 5", .value = 5 }, + { .description = "DMA 6", .value = 6 }, + { .description = "DMA 7", .value = 7 }, + { .description = "" } }, }, - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; static const device_config_t pcnet_vlb_config[] = { { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { "0x300", 0x300 }, - { "0x320", 0x320 }, - { "0x340", 0x340 }, - { "0x360", 0x360 }, - { "" } + .name = "base", + .description = "Address", + .type = CONFIG_HEX16, + .default_string = "", + .default_int = 0x300, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "0x300", .value = 0x300 }, + { .description = "0x320", .value = 0x320 }, + { .description = "0x340", .value = 0x340 }, + { .description = "0x360", .value = 0x360 }, + { .description = "" } }, }, { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { "IRQ 3", 3 }, - { "IRQ 4", 4 }, - { "IRQ 5", 5 }, - { "IRQ 9", 9 }, - { "" } + .name = "irq", + .description = "IRQ", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 3, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "IRQ 3", .value = 3 }, + { .description = "IRQ 4", .value = 4 }, + { .description = "IRQ 5", .value = 5 }, + { .description = "IRQ 9", .value = 9 }, + { .description = "" } }, }, - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; // clang-format on diff --git a/src/network/net_plip.c b/src/network/net_plip.c index e8e7df008..6da355632 100644 --- a/src/network/net_plip.c +++ b/src/network/net_plip.c @@ -490,7 +490,6 @@ plip_close(void *priv) free(priv); } - const lpt_device_t lpt_plip_device = { .name = "Parallel Line Internet Protocol", .internal_name = "plip", diff --git a/src/network/net_wd8003.c b/src/network/net_wd8003.c index be6c46905..81e6d91ec 100644 --- a/src/network/net_wd8003.c +++ b/src/network/net_wd8003.c @@ -738,156 +738,246 @@ wd_close(void *priv) // clang-format off static const device_config_t wd8003_config[] = { { - "base", "Address", CONFIG_HEX16, "", 0x300, "", { 0 }, - { - { "0x240", 0x240 }, - { "0x280", 0x280 }, - { "0x300", 0x300 }, - { "0x380", 0x380 }, - { "" } + .name = "base", + .description = "Address", + .type = CONFIG_HEX16, + .default_string = "", + .default_int = 0x300, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "0x240", .value = 0x240 }, + { .description = "0x280", .value = 0x280 }, + { .description = "0x300", .value = 0x300 }, + { .description = "0x380", .value = 0x380 }, + { .description = "" } }, }, { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { "IRQ 2", 2 }, - { "IRQ 3", 3 }, - { "IRQ 5", 5 }, - { "IRQ 7", 7 }, - { "" } + .name = "irq", + .description = "IRQ", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 3, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "IRQ 2", .value = 2 }, + { .description = "IRQ 3", .value = 3 }, + { .description = "IRQ 5", .value = 5 }, + { .description = "IRQ 7", .value = 7 }, + { .description = "" } }, }, { - "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, - { - { "C800", 0xC8000 }, - { "CC00", 0xCC000 }, - { "D000", 0xD0000 }, - { "D400", 0xD4000 }, - { "D800", 0xD8000 }, - { "DC00", 0xDC000 }, - { "" } + .name = "ram_addr", + .description = "RAM address", + .type = CONFIG_HEX20, + .default_string = "", + .default_int = 0xD0000, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "C800", .value = 0xC8000 }, + { .description = "CC00", .value = 0xCC000 }, + { .description = "D000", .value = 0xD0000 }, + { .description = "D400", .value = 0xD4000 }, + { .description = "D800", .value = 0xD8000 }, + { .description = "DC00", .value = 0xDC000 }, + { .description = "" } }, }, - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; 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 }, - { "" } + .name = "base", + .description = "Address", + .type = CONFIG_HEX16, + .default_string = "", + .default_int = 0x280, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "0x200", .value = 0x200 }, + { .description = "0x220", .value = 0x220 }, + { .description = "0x240", .value = 0x240 }, + { .description = "0x260", .value = 0x260 }, + { .description = "0x280", .value = 0x280 }, + { .description = "0x2A0", .value = 0x2A0 }, + { .description = "0x2C0", .value = 0x2C0 }, + { .description = "0x300", .value = 0x300 }, + { .description = "0x340", .value = 0x340 }, + { .description = "0x380", .value = 0x380 }, + { .description = "" } }, }, { - "irq", "IRQ", CONFIG_SELECTION, "", 3, "", { 0 }, - { - { "IRQ 2/9", 9 }, - { "IRQ 3", 3 }, - { "IRQ 4", 4 }, - { "IRQ 7", 7 }, - { "" } + .name = "irq", + .description = "IRQ", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 3, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "IRQ 2/9", .value = 9 }, + { .description = "IRQ 3", .value = 3 }, + { .description = "IRQ 4", .value = 4 }, + { .description = "IRQ 7", .value = 7 }, + { .description = "" } }, }, { - "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, - { - { "C000", 0xC0000 }, - { "C400", 0xC4000 }, - { "C800", 0xC8000 }, - { "CC00", 0xCC000 }, - { "D000", 0xD0000 }, - { "D400", 0xD4000 }, - { "D800", 0xD8000 }, - { "DC00", 0xDC000 }, - { "" } + .name = "ram_addr", + .description = "RAM address", + .type = CONFIG_HEX20, + .default_string = "", + .default_int = 0xD0000, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "C000", .value = 0xC0000 }, + { .description = "C400", .value = 0xC4000 }, + { .description = "C800", .value = 0xC8000 }, + { .description = "CC00", .value = 0xCC000 }, + { .description = "D000", .value = 0xD0000 }, + { .description = "D400", .value = 0xD4000 }, + { .description = "D800", .value = 0xD8000 }, + { .description = "DC00", .value = 0xDC000 }, + { .description = "" } }, }, { - "ram_size", "RAM size", CONFIG_SELECTION, "", 8192, "", { 0 }, - { - { "8 kB", 8192 }, - { "32 kB", 32768 }, - { "" } + .name = "ram_size", + .description = "RAM size", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 8192, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "8 kB", .value = 8192 }, + { .description = "32 kB", .value = 32768 }, + { .description = "" } }, }, - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; /* 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 }, - { "" } + .name = "base", + .description = "Address", + .type = CONFIG_HEX16, + .default_string = "", + .default_int = 0x280, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "0x200", .value = 0x200 }, + { .description = "0x220", .value = 0x220 }, + { .description = "0x240", .value = 0x240 }, + { .description = "0x260", .value = 0x260 }, + { .description = "0x280", .value = 0x280 }, + { .description = "0x2A0", .value = 0x2A0 }, + { .description = "0x2C0", .value = 0x2C0 }, + { .description = "0x300", .value = 0x300 }, + { .description = "0x340", .value = 0x340 }, + { .description = "0x380", .value = 0x380 }, + { .description = "" } }, }, { - "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 }, - { "" } + .name = "irq", + .description = "IRQ", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 3, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "IRQ 2/9", .value = 9 }, + { .description = "IRQ 3", .value = 3 }, + { .description = "IRQ 4", .value = 4 }, + { .description = "IRQ 5", .value = 5 }, + { .description = "IRQ 7", .value = 7 }, + { .description = "IRQ 10", .value = 10 }, + { .description = "IRQ 11", .value = 11 }, + { .description = "IRQ 15", .value = 15 }, + { .description = "" } }, }, { - "ram_addr", "RAM address", CONFIG_HEX20, "", 0xD0000, "", { 0 }, - { - { "C000", 0xC0000 }, - { "C400", 0xC4000 }, - { "C800", 0xC8000 }, - { "CC00", 0xCC000 }, - { "D000", 0xD0000 }, - { "D400", 0xD4000 }, - { "D800", 0xD8000 }, - { "DC00", 0xDC000 }, - { "" } + .name = "ram_addr", + .description = "RAM address", + .type = CONFIG_HEX20, + .default_string = "", + .default_int = 0xD0000, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "C000", .value = 0xC0000 }, + { .description = "C400", .value = 0xC4000 }, + { .description = "C800", .value = 0xC8000 }, + { .description = "CC00", .value = 0xCC000 }, + { .description = "D000", .value = 0xD0000 }, + { .description = "D400", .value = 0xD4000 }, + { .description = "D800", .value = 0xD8000 }, + { .description = "DC00", .value = 0xDC000 }, + { .description = "" } }, }, { - "ram_size", "RAM size", CONFIG_SELECTION, "", 16384, "", { 0 }, - { - { "16 kB", 16384 }, - { "64 kB", 65536 }, - { "" } + .name = "ram_size", + .description = "RAM size", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 16384, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "16 kB", .value = 16384 }, + { .description = "64 kB", .value = 65536 }, + { .description = "" } }, }, - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; static const device_config_t mca_mac_config[] = { - { "mac", "MAC Address", CONFIG_MAC, "", -1 }, - { "", "", -1 } + { + .name = "mac", + .description = "MAC Address", + .type = CONFIG_MAC, + .default_string = "", + .default_int = -1 + }, + { .name = "", .description = "", .type = CONFIG_END } }; // clang-format on