claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up device_config_t formatting

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-02-26 23:31:28 -05:00
parent f4587949a7
commit 801f81fbda
61 changed files with 2679 additions and 4300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/bugger.c
View File

@@ -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);
}

809
src/device/isamem.c
View File

@@ -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)
{

176
src/device/isartc.c
View File

@@ -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)
{

22
src/device/mouse.c
View File

@@ -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
};

169
src/device/mouse_bus.c
View File

@@ -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",

25
src/device/mouse_ps2.c
View File

@@ -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",

85
src/device/mouse_serial.c
View File

@@ -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",