From 3b8d5f6b8777734bbe76c6085ff7f70ac6cf3316 Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 9 Oct 2018 05:53:09 +0200 Subject: [PATCH] The TriGem 286M now correctly has IDE; The TriGem 286M no longer has an internal graphics card - the TriGem Korean VGA card is an ISA card; Changed the configuration of the AMA-932J's internal OTI-067 to default to 256 kB of memory as that's what the card seems to have. --- src/machine/m_at_headland.c | 12 +----------- src/machine/machine.h | 1 - src/machine/machine_table.c | 4 ++-- src/video/vid_oak_oti.c | 26 ++++++++++++++++++++++++-- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/machine/m_at_headland.c b/src/machine/m_at_headland.c index dd49b3332..90e55bce0 100644 --- a/src/machine/m_at_headland.c +++ b/src/machine/m_at_headland.c @@ -540,22 +540,12 @@ machine_at_headland_init(const machine_t *model) } -const device_t * -at_tg286m_get_device(void) -{ - return &et4000k_tg286_isa_device; -} - - void machine_at_tg286m_init(const machine_t *model) { - machine_at_common_init(model); + machine_at_common_ide_init(model); machine_at_headland_common_init(0); - - if (gfxcard == VID_INTERNAL) - device_add(&et4000k_tg286_isa_device); } diff --git a/src/machine/machine.h b/src/machine/machine.h index 2124e2f08..710547911 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -210,7 +210,6 @@ extern const device_t *t1200_get_device(void); extern const device_t *at_endeavor_get_device(void); -extern const device_t *at_tg286m_get_device(void); extern const device_t *at_ama932j_get_device(void); #endif diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index ea4064475..4519dd824 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -11,7 +11,7 @@ * NOTES: OpenAT wip for 286-class machine with open BIOS. * PS2_M80-486 wip, pending receipt of TRM's for machine. * - * Version: @(#)machine_table.c 1.0.41 2018/09/24 + * Version: @(#)machine_table.c 1.0.42 2018/10/09 * * Authors: Sarah Walker, * Miran Grca, @@ -80,7 +80,7 @@ const machine_t machines[] = { { "[286 ISA] Samsung SPC-4200P", ROM_SPC4200P, "spc4200p", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_PS2, 512, 2048, 128, 127, machine_at_scat_init, NULL }, { "[286 ISA] Samsung SPC-4216P", ROM_SPC4216P, "spc4216p", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_PS2, 1, 5, 1, 127, machine_at_scat_init, NULL }, { "[286 ISA] Toshiba T3100e", ROM_T3100E, "t3100e", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1024, 5120, 256, 63, machine_at_t3100e_init, NULL }, - { "[286 ISA] Trigem 286M", ROM_TG286M, "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO, 512, 8192, 128, 127, machine_at_tg286m_init, at_tg286m_get_device }, + { "[286 ISA] Trigem 286M", ROM_TG286M, "tg286m", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 127, machine_at_tg286m_init, NULL }, { "[286 MCA] IBM PS/2 model 50", ROM_IBMPS2_M50, "ibmps2_m50", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2 | MACHINE_VIDEO, 1, 10, 1, 63, machine_ps2_model_50_init, NULL }, diff --git a/src/video/vid_oak_oti.c b/src/video/vid_oak_oti.c index bb6d077d2..e25b0f2c8 100644 --- a/src/video/vid_oak_oti.c +++ b/src/video/vid_oak_oti.c @@ -8,7 +8,7 @@ * * Oak OTI037C/67/077 emulation. * - * Version: @(#)vid_oak_oti.c 1.0.17 2018/10/08 + * Version: @(#)vid_oak_oti.c 1.0.18 2018/10/09 * * Authors: Sarah Walker, * Miran Grca, @@ -460,6 +460,28 @@ static const device_config_t oti067_config[] = }; +static const device_config_t oti067_ama932j_config[] = +{ + { + "memory", "Memory size", CONFIG_SELECTION, "", 256, + { + { + "256 kB", 256 + }, + { + "512 kB", 512 + }, + { + "" + } + } + }, + { + "", "", -1 + } +}; + + static const device_config_t oti077_config[] = { { @@ -516,7 +538,7 @@ const device_t oti067_ama932j_device = oti067_ama932j_available, oti_speed_changed, oti_force_redraw, - oti067_config + oti067_ama932j_config }; const device_t oti077_device =