From e659efd4ac1a1a7de04c33b8b7a20b34166f45d9 Mon Sep 17 00:00:00 2001 From: waltje Date: Fri, 28 Sep 2018 14:46:38 -0400 Subject: [PATCH] Small fixes. --- src/machines/machine_table.c | 4 ++-- src/pc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/machines/machine_table.c b/src/machines/machine_table.c index 018b436..d3ac697 100644 --- a/src/machines/machine_table.c +++ b/src/machines/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.25 2018/08/28 + * Version: @(#)machine_table.c 1.0.26 2018/09/28 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -106,7 +106,7 @@ const machine_t machines[] = { { "[386SX ISA] AMI 386SX clone", ROM_AMI386SX, "ami_386", L"generic/ami/386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512,16384, 128, 128, machine_at_headland_init, NULL, NULL }, { "[386SX ISA] Amstrad MegaPC", ROM_MEGAPC, "amstrad_megapc", L"amstrad/megapc", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_VIDEO | MACHINE_HDC, 1, 16, 1, 128, machine_at_wd76c10_init, NULL, NULL }, - { "[386SX ISA] Award 386SX clone", ROM_AWARD386SX_OPTI495, "award_386sx", L"generic/award/opti495", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 128, machine_at_opti495_init, NULL, NULL }, + { "[386SX ISA] Award 386SX clone", ROM_AWARD386SX_OPTI495, "award_386sx", L"generic/award/opti495", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 16, 1, 128, machine_at_opti495_init, NULL, NULL }, { "[386SX ISA] DTK 386SX clone", ROM_DTK386, "dtk_386", L"dtk/386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512, 8192, 128, 128, machine_at_neat_init, NULL, NULL }, { "[386SX ISA] IBM PS/1 model 2121", ROM_IBMPS1_2121, "ibm_ps1_2121", L"ibm/ps1_2121", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 1, 6, 1, 64, machine_ps1_m2121_init, &m_ps1_device, NULL }, { "[386SX ISA] IBM PS/1 m.2121+ISA", ROM_IBMPS1_2121_ISA, "ibm_ps1_2121_isa", L"ibm/ps1_2121", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 1, 6, 1, 64, machine_ps1_m2121_init, &m_ps1_device, NULL }, diff --git a/src/pc.c b/src/pc.c index d2d7d03..dd33226 100644 --- a/src/pc.c +++ b/src/pc.c @@ -8,7 +8,7 @@ * * Main emulator module where most things are controlled. * - * Version: @(#)pc.c 1.0.54 2018/09/22 + * Version: @(#)pc.c 1.0.55 2018/09/28 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -490,7 +490,7 @@ pc_setup(int argc, wchar_t *argv[]) int c, ret = 0; /* Grab the executable's full path. */ - plat_get_exe_name(emu_path, sizeof(emu_path)-1); + plat_get_exe_name(emu_path, sizeof_w(emu_path)); if ((p = plat_get_basename(emu_path)) != NULL) *p = L'\0'; wcscpy(exe_path, emu_path); @@ -528,7 +528,7 @@ pc_setup(int argc, wchar_t *argv[]) * a shortcut (desktop icon), however, the CWD * could have been set to something else. */ - plat_getcwd(usr_path, sizeof_w(usr_path)-1); + plat_getcwd(usr_path, sizeof_w(usr_path)); memset(path, 0x00, sizeof(path)); for (c = 1; c < argc; c++) {