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

Named initializers in machine table

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-07-19 18:51:18 -04:00
parent 184dc4c5f2
commit 6233027c9e
22 changed files with 10383 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/machine/m_amstrad.c
View File

@@ -670,7 +670,7 @@ vid_speed_change_1512(void *priv)
recalc_timings_1512(vid);
}
device_config_t vid_1512_config[] = {
const device_config_t vid_1512_config[] = {
{
.name = "display_type",
.description = "Display type",
@@ -723,7 +723,7 @@ device_config_t vid_1512_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t vid_1512_device = {
const device_t vid_1512_device = {
.name = "Amstrad PC1512 (video)",
.internal_name = "vid_1512",
.flags = 0,
@@ -737,13 +737,6 @@ static const device_t vid_1512_device = {
.config = vid_1512_config
};
const device_t *
pc1512_get_device(void)
{
return(&vid_1512_device);
}
static void
recalc_timings_1640(amsvid_t *vid)
{
@@ -882,7 +875,7 @@ vid_speed_changed_1640(void *priv)
recalc_timings_1640(vid);
}
device_config_t vid_1640_config[] = {
const device_config_t vid_1640_config[] = {
{
.name = "language",
.description = "BIOS language",
@@ -906,7 +899,7 @@ device_config_t vid_1640_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t vid_1640_device = {
const device_t vid_1640_device = {
.name = "Amstrad PC1640 (video)",
.internal_name = "vid_1640",
.flags = 0,
@@ -920,12 +913,6 @@ static const device_t vid_1640_device = {
.config = vid_1640_config
};
const device_t *
pc1640_get_device(void)
{
return(&vid_1640_device);
}
/* Display type */
#define PC200_CGA 0 /* CGA monitor */
#define PC200_MDA 1 /* MDA monitor */
@@ -1715,7 +1702,7 @@ vid_close_200(void *priv)
}
device_config_t vid_200_config[] = {
const device_config_t vid_200_config[] = {
/* TODO: Should have options here for:
*
* > Display port (TTL or RF)
@@ -1791,7 +1778,7 @@ device_config_t vid_200_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t vid_200_device = {
const device_t vid_200_device = {
.name = "Amstrad PC200 (video)",
.internal_name = "vid_200",
.flags = 0,
@@ -1805,13 +1792,7 @@ static const device_t vid_200_device = {
.config = vid_200_config
};
const device_t *
pc200_get_device(void)
{
return(&vid_200_device);
}
device_config_t vid_ppc512_config[] = {
const device_config_t vid_ppc512_config[] = {
/* TODO: Should have options here for:
*
* > Display port (TTL or RF)
@@ -1895,7 +1876,7 @@ device_config_t vid_ppc512_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t vid_ppc512_device = {
const device_t vid_ppc512_device = {
.name = "Amstrad PPC512 (video)",
.internal_name = "vid_ppc512",
.flags = 0,
@@ -1909,13 +1890,7 @@ static const device_t vid_ppc512_device = {
.config = vid_ppc512_config
};
const device_t *
ppc512_get_device(void)
{
return(&vid_ppc512_device);
}
device_config_t vid_pc2086_config[] = {
const device_config_t vid_pc2086_config[] = {
{
.name = "language",
.description = "BIOS language",
@@ -1933,7 +1908,7 @@ device_config_t vid_pc2086_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t vid_pc2086_device = {
const device_t vid_pc2086_device = {
.name = "Amstrad PC2086",
.internal_name = "vid_pc2086",
.flags = 0,
@@ -1947,13 +1922,7 @@ static const device_t vid_pc2086_device = {
.config = vid_pc2086_config
};
const device_t *
pc2086_get_device(void)
{
return(&vid_pc2086_device);
}
device_config_t vid_pc3086_config[] = {
const device_config_t vid_pc3086_config[] = {
{
.name = "language",
.description = "BIOS language",
@@ -1971,7 +1940,7 @@ device_config_t vid_pc3086_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t vid_pc3086_device = {
const device_t vid_pc3086_device = {
.name = "Amstrad PC3086",
.internal_name = "vid_pc3086",
.flags = 0,
@@ -1985,13 +1954,6 @@ static const device_t vid_pc3086_device = {
.config = vid_pc3086_config
};
const device_t *
pc3086_get_device(void)
{
return(&vid_pc3086_device);
}
static void
ms_write(uint16_t addr, uint8_t val, void *priv)
{

16
src/machine/m_at_286_386sx.c
View File

@@ -99,14 +99,6 @@ machine_at_tg286m_init(const machine_t *model)
return ret;
}
const device_t *
at_ama932j_get_device(void)
{
return &oti067_ama932j_device;
}
int
machine_at_ama932j_init(const machine_t *model)
{
@@ -418,14 +410,6 @@ machine_at_spc4216p_init(const machine_t *model)
return ret;
}
const device_t *
at_spc4620p_get_device(void)
{
return &ati28800k_spc4620p_device;
}
int
machine_at_spc4620p_init(const machine_t *model)
{

39
src/machine/m_at_386dx_486.c
View File

@@ -186,14 +186,6 @@ machine_at_valuepoint433_init(const machine_t *model) // hangs without the PS/2
return ret;
}
const device_t *
at_valuepoint433_get_device(void)
{
return &et4000w32_onboard_device;
}
int
machine_at_ecs386_init(const machine_t *model)
{
@@ -361,13 +353,6 @@ machine_at_vect486vl_init(const machine_t *model) // has HDC problems
return ret;
}
const device_t *
at_vect486vl_get_device(void)
{
return &gd5428_onboard_device;
}
int
machine_at_d824_init(const machine_t *model)
{
@@ -392,14 +377,6 @@ machine_at_d824_init(const machine_t *model)
return ret;
}
const device_t *
at_d824_get_device(void)
{
return &gd5428_onboard_device;
}
int
machine_at_acera1g_init(const machine_t *model)
{
@@ -426,14 +403,6 @@ machine_at_acera1g_init(const machine_t *model)
return ret;
}
const device_t *
at_acera1g_get_device(void)
{
return &gd5428_onboard_device;
}
int
machine_at_acerv10_init(const machine_t *model)
{
@@ -1453,14 +1422,6 @@ machine_at_sbc490_init(const machine_t *model)
return ret;
}
const device_t *
at_sbc490_get_device(void)
{
return &tgui9440_onboard_pci_device;
}
int
machine_at_tf486_init(const machine_t *model)
{

8
src/machine/m_at_compaq.c
View File

@@ -719,7 +719,7 @@ const device_config_t compaq_plasma_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t compaq_plasma_device = {
const device_t compaq_plasma_device = {
.name = "Compaq Plasma",
.internal_name = "compaq_plasma",
.flags = 0,
@@ -792,12 +792,6 @@ write_raml(uint32_t addr, uint32_t val, void *priv)
mem_write_raml_page(addr, val, &pages[addr >> 12]);
}
const device_t *
at_cpqiii_get_device(void)
{
return &compaq_plasma_device;
}
static void
machine_at_compaq_init(const machine_t *model, int type)
{

8
src/machine/m_at_slot1.c
View File

@@ -481,14 +481,6 @@ machine_at_s1846_init(const machine_t *model)
return ret;
}
const device_t *
at_s1846_get_device(void)
{
return &es1371_onboard_device;
}
int
machine_at_ficka6130_init(const machine_t *model)
{

8
src/machine/m_at_socket370.c
View File

@@ -436,14 +436,6 @@ machine_at_cuv4xls_init(const machine_t *model)
return ret;
}
const device_t *
at_cuv4xls_get_device(void)
{
return &cmi8738_onboard_device;
}
int
machine_at_6via90ap_init(const machine_t *model)
{

8
src/machine/m_at_socket4.c
View File

@@ -363,14 +363,6 @@ machine_at_pb520r_init(const machine_t *model)
return ret;
}
const device_t *
at_pb520r_get_device(void)
{
return &gd5434_onboard_pci_device;
}
int
machine_at_excalibur_init(const machine_t *model)
{

7
src/machine/m_at_socket7.c
View File

@@ -418,13 +418,6 @@ machine_at_presario2240_init(const machine_t *model)
}
const device_t *
at_presario2240_get_device(void)
{
return &s3_trio64v2_dx_onboard_pci_device;
}
int
machine_at_presario4500_init(const machine_t *model)
{

24
src/machine/m_at_socket7_3v.c
View File

@@ -159,14 +159,6 @@ machine_at_thor_init(const machine_t *model)
return ret;
}
const device_t *
at_thor_get_device(void)
{
return &s3_phoenix_trio64vplus_onboard_pci_device;
}
int
machine_at_mrthor_init(const machine_t *model)
{
@@ -218,14 +210,6 @@ machine_at_endeavor_init(const machine_t *model)
return ret;
}
const device_t *
at_endeavor_get_device(void)
{
return &s3_phoenix_trio64_onboard_pci_device;
}
int
machine_at_ms5119_init(const machine_t *model)
{
@@ -289,14 +273,6 @@ machine_at_pb640_init(const machine_t *model)
return ret;
}
const device_t *
at_pb640_get_device(void)
{
return &gd5440_onboard_pci_device;
}
int
machine_at_fmb_init(const machine_t *model)
{

9
src/machine/m_pcjr.c
View File

@@ -788,7 +788,7 @@ static const device_config_t pcjr_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t pcjr_device = {
const device_t pcjr_device = {
"IBM PCjr",
"pcjr",
0,
@@ -802,13 +802,6 @@ static const device_t pcjr_device = {
pcjr_config
};
const device_t *
pcjr_get_device(void)
{
return &pcjr_device;
}
int
machine_pcjr_init(const machine_t *model)
{

1
src/machine/m_ps2_isa.c
View File

@@ -217,4 +217,3 @@ machine_ps2_m30_286_init(const machine_t *model)
return ret;
}

2
src/machine/m_ps2_mca.c
View File

@@ -1521,5 +1521,3 @@ machine_ps2_model_80_axx_init(const machine_t *model)
return ret;
}

28
src/machine/m_tandy.c
View File

@@ -1143,7 +1143,7 @@ vid_init(tandy_t *dev)
}
static const device_config_t vid_config[] = {
const device_config_t vid_config[] = {
{
.name = "display_type",
.description = "Display type",
@@ -1161,7 +1161,7 @@ static const device_config_t vid_config[] = {
{ .name = "", .description = "", .type = CONFIG_END }
};
static const device_t vid_device = {
const device_t vid_device = {
.name = "Tandy 1000",
.internal_name = "tandy1000_video",
.flags = 0,
@@ -1175,7 +1175,7 @@ static const device_t vid_device = {
.config = vid_config
};
static const device_t vid_device_hx = {
const device_t vid_device_hx = {
.name = "Tandy 1000 HX",
.internal_name = "tandy1000_hx_video",
.flags = 0,
@@ -1189,7 +1189,7 @@ static const device_t vid_device_hx = {
.config = vid_config
};
static const device_t vid_device_sl = {
const device_t vid_device_sl = {
.name = "Tandy 1000SL2",
.internal_name = "tandy1000_sl_video",
.flags = 0,
@@ -1203,26 +1203,6 @@ static const device_t vid_device_sl = {
.config = NULL
};
const device_t *
tandy1k_get_device(void)
{
return &vid_device;
}
const device_t *
tandy1k_hx_get_device(void)
{
return &vid_device_hx;
}
const device_t *
tandy1k_sl_get_device(void)
{
return &vid_device_sl;
}
static void
eep_write(uint16_t addr, uint8_t val, void *priv)
{

15
src/machine/m_xt_olivetti.c
View File

@@ -642,13 +642,6 @@ const device_t m19_vid_device = {
.config = m19_vid_config
};
const device_t *
m19_get_device(void)
{
return &m19_vid_device;
}
static uint8_t
m24_read(uint16_t port, void *priv)
{
@@ -738,14 +731,6 @@ m24_read(uint16_t port, void *priv)
return(ret);
}
const device_t *
m24_get_device(void)
{
return &ogc_m24_device;
}
int
machine_xt_m24_init(const machine_t *model)
{

8
src/machine/m_xt_t1000.c
View File

@@ -841,14 +841,6 @@ t1000_read_roml(uint32_t addr, void *priv)
return(*(uint32_t *)(&sys->romdrive[sys->rom_offset + (addr & 0xffff)]));
}
const device_t *
t1000_get_device(void)
{
return(&t1000_video_device);
}
int
machine_xt_t1000_init(const machine_t *model)
{

7
src/machine/m_xt_xi8088.c
View File

@@ -177,13 +177,6 @@ const device_t xi8088_device = {
.config = xi8088_config
};
const device_t *
xi8088_get_device(void)
{
return &xi8088_device;
}
int
machine_xt_xi8088_init(const machine_t *model)
{

6
src/machine/m_xt_zenith.c
View File

@@ -130,12 +130,6 @@ machine_zenith_init(const machine_t *model){
}
const device_t *
z184_get_device(void)
{
return &cga_device;
}
/*
* Current bugs and limitations:
* - missing NVRAM implementation

10553
src/machine/machine_table.c
View File

File diff suppressed because it is too large Load Diff