diff --git a/src/disk/hdc_xtide.c b/src/disk/hdc_xtide.c index eaa71f7..347eba3 100644 --- a/src/disk/hdc_xtide.c +++ b/src/disk/hdc_xtide.c @@ -21,7 +21,7 @@ * already on their way out, the newer IDE standard based on the * PC/AT controller and 16b design became the IDE we now know. * - * Version: @(#)hdc_xtide.c 1.0.1 2018/02/14 + * Version: @(#)hdc_xtide.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -63,7 +63,7 @@ #define ROM_PATH_XT L"roms/hdd/xtide/ide_xt.bin" #define ROM_PATH_AT L"roms/hdd/xtide/ide_at.bin" -#define ROM_PATH_PS2 L"roms/hdd/xtide/SIDE1V12.BIN" +#define ROM_PATH_PS2 L"roms/hdd/xtide/side1v12.bin" #define ROM_PATH_PS2AT L"roms/hdd/xtide/ide_at_1_1_5.bin" diff --git a/src/intel_flash.c b/src/intel_flash.c index 9946c2f..0fce816 100644 --- a/src/intel_flash.c +++ b/src/intel_flash.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 2 Mbit 8-bit flash devices. * - * Version: @(#)intel_flash.c 1.0.2 2018/02/21 + * Version: @(#)intel_flash.c 1.0.3 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -270,27 +270,27 @@ void *intel_flash_init(uint8_t type) return flash; } -void *intel_flash_bxb_ami_init(void) +void *intel_flash_bxb_ami_init(device_t *info) { - return intel_flash_init(FLASH_IS_BXB | FLASH_INVERT); + return intel_flash_init(info->local); } /* For AMI BIOS'es - Intel 28F001BXT with high address pin inverted. */ -void *intel_flash_bxt_ami_init(void) +void *intel_flash_bxt_ami_init(device_t *info) { - return intel_flash_init(FLASH_INVERT); + return intel_flash_init(info->local); } /* For Award BIOS'es - Intel 28F001BXT with high address pin not inverted. */ -void *intel_flash_bxt_init(void) +void *intel_flash_bxt_init(device_t *info) { - return intel_flash_init(0); + return intel_flash_init(info->local); } /* For Acer BIOS'es - Intel 28F001BXB. */ -void *intel_flash_bxb_init(void) +void *intel_flash_bxb_init(device_t *info) { - return intel_flash_init(FLASH_IS_BXB); + return intel_flash_init(info->local); } void intel_flash_close(void *p) @@ -311,7 +311,7 @@ void intel_flash_close(void *p) device_t intel_flash_bxt_ami_device = { "Intel 28F001BXT Flash BIOS", - 0, 0, + 0, FLASH_INVERT, intel_flash_bxt_ami_init, intel_flash_close, NULL, @@ -321,7 +321,7 @@ device_t intel_flash_bxt_ami_device = device_t intel_flash_bxb_ami_device = { "Intel 28F001BXB Flash BIOS", - 0, 0, + 0, FLASH_IS_BXB | FLASH_INVERT, intel_flash_bxb_ami_init, intel_flash_close, NULL, @@ -341,7 +341,7 @@ device_t intel_flash_bxt_device = device_t intel_flash_bxb_device = { "Intel 28F001BXB Flash BIOS", - 0, 0, + 0, FLASH_IS_BXB, intel_flash_bxb_init, intel_flash_close, NULL, diff --git a/src/machine/machine.h b/src/machine/machine.h index b061cda..4041a23 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -8,7 +8,7 @@ * * Handling of the emulated machines. * - * Version: @(#)machine.h 1.0.1 2018/02/14 + * Version: @(#)machine.h 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -63,6 +63,7 @@ typedef struct _machine_ { const char *name; int id; const char *internal_name; + const char *bios_path; struct { const char *name; #ifdef EMU_CPU_H diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 45cea08..5fe6cb5 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.1 2018/02/14 + * Version: @(#)machine_table.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -53,139 +53,139 @@ machine_t machines[] = { - { "[8088] AMI XT clone", ROM_AMIXT, "amixt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, - { "[8088] Compaq Portable", ROM_PORTABLE, "portable", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO, 128, 640, 128, 0, machine_xt_compaq_init, NULL, NULL }, - { "[8088] DTK XT clone", ROM_DTKXT, "dtk", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, - { "[8088] IBM PC", ROM_IBMPC, "ibmpc", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 32, 0, machine_xt_init, NULL, NULL }, - { "[8088] IBM PCjr", ROM_IBMPCJR, "ibmpcjr", {{"", cpus_pcjr}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO, 128, 640, 128, 0, machine_pcjr_init, pcjr_get_device, NULL }, - { "[8088] IBM XT", ROM_IBMXT, "ibmxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, - { "[8088] Generic XT clone", ROM_GENXT, "genxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, - { "[8088] Juko XT clone", ROM_JUKOPC, "jukopc", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, - { "[8088] Phoenix XT clone", ROM_PXXT, "pxxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, - { "[8088] Schneider EuroPC", ROM_EUROPC, "europc", {{"Siemens",cpus_europc}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_HDC | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 0, machine_europc_init, NULL, NULL }, - { "[8088] Tandy 1000", ROM_TANDY, "tandy", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 128, 640, 128, 0, machine_tandy1k_init, tandy1k_get_device, NULL }, - { "[8088] Tandy 1000 HX", ROM_TANDY1000HX, "tandy1000hx", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 256, 640, 128, 0, machine_tandy1k_init, tandy1k_hx_get_device, NULL }, + { "[8088] AMI XT clone", ROM_AMIXT, "amixt", "generic/ami/amixt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, + { "[8088] Compaq Portable", ROM_PORTABLE, "portable", "compaq/portable", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO, 128, 640, 128, 0, machine_xt_compaq_init, NULL, NULL }, + { "[8088] DTK XT clone", ROM_DTKXT, "dtk", "dtk/dtk", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, + { "[8088] IBM PC", ROM_IBMPC, "ibmpc", "ibm/ibmpc", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 32, 0, machine_xt_init, NULL, NULL }, + { "[8088] IBM PCjr", ROM_IBMPCJR, "ibmpcjr", "ibm/ibmpcjr", {{"", cpus_pcjr}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO, 128, 640, 128, 0, machine_pcjr_init, pcjr_get_device, NULL }, + { "[8088] IBM XT", ROM_IBMXT, "ibmxt", "ibm/ibmxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, + { "[8088] Generic XT clone", ROM_GENXT, "genxt", "generic/genxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, + { "[8088] Juko XT clone", ROM_JUKOPC, "jukopc", "juko/jukopc", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, + { "[8088] Phoenix XT clone", ROM_PXXT, "pxxt", "generic/phoenix/pxxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL }, + { "[8088] Schneider EuroPC", ROM_EUROPC, "europc", "schneider/europc", {{"Siemens",cpus_europc}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_HDC | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 0, machine_europc_init, NULL, NULL }, + { "[8088] Tandy 1000", ROM_TANDY, "tandy", "tandy/tandy", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 128, 640, 128, 0, machine_tandy1k_init, tandy1k_get_device, NULL }, + { "[8088] Tandy 1000 HX", ROM_TANDY1000HX, "tandy1000hx", "tandy/tandy1000hx", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 256, 640, 128, 0, machine_tandy1k_init, tandy1k_hx_get_device, NULL }, #if defined(DEV_BRANCH) && defined(USE_LASERXT) - { "[8088] VTech Laser Turbo XT", ROM_LTXT, "ltxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 512, 512, 256, 0, machine_xt_laserxt_init, NULL, NULL }, + { "[8088] VTech Laser Turbo XT", ROM_LTXT, "ltxt", "vtech/ltxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 512, 512, 256, 0, machine_xt_laserxt_init, NULL, NULL }, #endif - { "[8086] Amstrad PC1512", ROM_PC1512, "pc1512", {{"", cpus_pc1512}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 63, machine_amstrad_init, NULL, nvr_at_close }, - { "[8086] Amstrad PC1640", ROM_PC1640, "pc1640", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 640, 640, 0, 63, machine_amstrad_init, NULL, nvr_at_close }, - { "[8086] Amstrad PC2086", ROM_PC2086, "pc2086", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 640, 640, 0, 63, machine_amstrad_init, NULL, nvr_at_close }, - { "[8086] Amstrad PC3086", ROM_PC3086, "pc3086", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 640, 640, 0, 63, machine_amstrad_init, NULL, nvr_at_close }, - { "[8086] Amstrad PC20(0)", ROM_PC200, "pc200", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 63, machine_amstrad_init, NULL, nvr_at_close }, - { "[8086] Olivetti M24", ROM_OLIM24, "olivetti_m24", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 128, 640, 128, 0, machine_olim24_init, NULL, NULL }, - { "[8086] Tandy 1000 SL/2", ROM_TANDY1000SL2, "tandy1000sl2", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 512, 768, 128, 0, machine_tandy1k_init, NULL, NULL }, + { "[8086] Amstrad PC1512", ROM_PC1512, "pc1512", "amstrad/pc1512", {{"", cpus_pc1512}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 63, machine_amstrad_init, NULL, nvr_at_close }, + { "[8086] Amstrad PC1640", ROM_PC1640, "pc1640", "amstrad/pc1640", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 640, 640, 0, 63, machine_amstrad_init, NULL, nvr_at_close }, + { "[8086] Amstrad PC2086", ROM_PC2086, "pc2086", "amstrad/pc2086", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 640, 640, 0, 63, machine_amstrad_init, NULL, nvr_at_close }, + { "[8086] Amstrad PC3086", ROM_PC3086, "pc3086", "amstrad/pc3086", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 640, 640, 0, 63, machine_amstrad_init, NULL, nvr_at_close }, + { "[8086] Amstrad PC20(0)", ROM_PC200, "pc200", "amstrad/pc200", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 512, 640, 128, 63, machine_amstrad_init, NULL, nvr_at_close }, + { "[8086] Olivetti M24", ROM_OLIM24, "olivetti_m24", "olivetti/olivetti_m24", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO | MACHINE_MOUSE, 128, 640, 128, 0, machine_olim24_init, NULL, NULL }, + { "[8086] Tandy 1000 SL/2", ROM_TANDY1000SL2, "tandy1000sl2", "tandy/tandy1000sl2", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA, 512, 768, 128, 0, machine_tandy1k_init, NULL, NULL }, #if defined(DEV_BRANCH) && defined(USE_LASERXT) - { "[8086] VTech Laser XT3", ROM_LXT3, "lxt3", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 256, 512, 256, 0, machine_xt_laserxt_init, NULL, NULL }, + { "[8086] VTech Laser XT3", ROM_LXT3, "lxt3", "vtech/lxt3", {{"", cpus_8086}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 256, 512, 256, 0, machine_xt_laserxt_init, NULL, NULL }, #endif - { "[286 ISA] AMI 286 clone", ROM_AMI286, "ami286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_neat_ami_init, NULL, nvr_at_close }, - { "[286 ISA] Award 286 clone", ROM_AWARD286, "award286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_scat_init, NULL, nvr_at_close }, - { "[286 ISA] Commodore PC 30 III", ROM_CMDPC30, "cmdpc30", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_cmdpc_init, NULL, nvr_at_close }, - { "[286 ISA] Compaq Portable II", ROM_PORTABLEII, "portableii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_compaq_init, NULL, nvr_at_close }, + { "[286 ISA] AMI 286 clone", ROM_AMI286, "ami286", "generic/ami/ami286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_neat_ami_init, NULL, nvr_at_close }, + { "[286 ISA] Award 286 clone", ROM_AWARD286, "award286", "generic/award/award286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_scat_init, NULL, nvr_at_close }, + { "[286 ISA] Commodore PC 30 III", ROM_CMDPC30, "cmdpc30", "commodore/cmdpc30", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_cmdpc_init, NULL, nvr_at_close }, + { "[286 ISA] Compaq Portable II", ROM_PORTABLEII, "portableii", "compaq/portableii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_compaq_init, NULL, nvr_at_close }, #if defined(DEV_BRANCH) && defined(USE_PORTABLE3) - { "[286 ISA] Compaq Portable III", ROM_PORTABLEIII, "portableiii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO, 640,16384, 128, 127, machine_at_compaq_init, NULL, nvr_at_close }, + { "[286 ISA] Compaq Portable III", ROM_PORTABLEIII, "portableiii", "compaq/portableiii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO, 640,16384, 128, 127, machine_at_compaq_init, NULL, nvr_at_close }, #endif - { "[286 ISA] Hyundai Super-286TR", ROM_SUPER286TR, "super286tr", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_scat_init, NULL, nvr_at_close }, - { "[286 ISA] IBM AT", ROM_IBMAT, "ibmat", {{"", cpus_ibmat}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 256,15872, 128, 63, machine_at_ibm_init, NULL, nvr_at_close }, - { "[286 ISA] IBM PS/1 model 2011", ROM_IBMPS1_2011, "ibmps1es", {{"", cpus_ps1_m2011}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 512,16384, 512, 127, machine_ps1_m2011_init, NULL, nvr_at_close }, - { "[286 ISA] IBM PS/2 model 30-286", ROM_IBMPS2_M30_286, "ibmps2_m30_286", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 16, 1, 127, machine_ps2_m30_286_init, NULL, nvr_at_close }, - { "[286 ISA] IBM XT Model 286", ROM_IBMXT286, "ibmxt286", {{"", cpus_ibmxt286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 256,15872, 128, 63, machine_at_ibm_init, NULL, nvr_at_close }, - { "[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, nvr_at_close }, + { "[286 ISA] Hyundai Super-286TR", ROM_SUPER286TR, "super286tr", "hyundai/super286tr", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_scat_init, NULL, nvr_at_close }, + { "[286 ISA] IBM AT", ROM_IBMAT, "ibmat", "ibm/ibmat", {{"", cpus_ibmat}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 256,15872, 128, 63, machine_at_ibm_init, NULL, nvr_at_close }, + { "[286 ISA] IBM PS/1 model 2011", ROM_IBMPS1_2011, "ibmps1es", "ibm/ibmps1es", {{"", cpus_ps1_m2011}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 512,16384, 512, 127, machine_ps1_m2011_init, NULL, nvr_at_close }, + { "[286 ISA] IBM PS/2 model 30-286", ROM_IBMPS2_M30_286, "ibmps2_m30_286", "ibm/ibmps2_m30_286", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 16, 1, 127, machine_ps2_m30_286_init, NULL, nvr_at_close }, + { "[286 ISA] IBM XT Model 286", ROM_IBMXT286, "ibmxt286", "ibm/ibmxt286", {{"", cpus_ibmxt286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 256,15872, 128, 63, machine_at_ibm_init, NULL, nvr_at_close }, + { "[286 ISA] Samsung SPC-4200P", ROM_SPC4200P, "spc4200p", "samsung/spc4200p", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_PS2, 512, 2048, 128, 127, machine_at_scat_init, NULL, nvr_at_close }, #ifdef WALTJE - { "[286 ISA] OpenAT 286", ROM_OPENAT, "open_at", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512, 4096, 128, 127, machine_at_init, NULL, nvr_at_close }, + { "[286 ISA] OpenAT 286", ROM_OPENAT, "open_at", "generic/open_at", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512, 4096, 128, 127, machine_at_init, NULL, nvr_at_close }, #endif - { "[286 ISA] Toshiba 3100e", 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, nvr_at_close }, + { "[286 ISA] Toshiba 3100e", ROM_T3100E, "t3100e", "toshiba/t3100e", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1024, 5120, 256, 63, machine_at_t3100e_init, NULL, nvr_at_close }, - { "[286 MCA] IBM PS/2 model 50", ROM_IBMPS2_M50, "ibmps2_m50", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 10, 1, 63, machine_ps2_model_50_init, NULL, nvr_at_close }, + { "[286 MCA] IBM PS/2 model 50", ROM_IBMPS2_M50, "ibmps2_m50", "ibm/ibmps2_m50", {{"", cpus_ps2_m30_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 10, 1, 63, machine_ps2_model_50_init, NULL, nvr_at_close }, - { "[386SX ISA] AMI 386SX clone", ROM_AMI386SX, "ami386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512,16384, 128, 127, machine_at_headland_init, NULL, nvr_at_close }, - { "[386SX ISA] Amstrad MegaPC", ROM_MEGAPC, "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, 127, machine_at_wd76c10_init, NULL, nvr_at_close }, - { "[386SX ISA] Award 386SX clone", ROM_AWARD386SX_OPTI495, "award386sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close }, - { "[386SX ISA] DTK 386SX clone", ROM_DTK386, "dtk386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512,16384, 128, 127, machine_at_neat_init, NULL, nvr_at_close }, - { "[386SX ISA] IBM PS/1 model 2121", ROM_IBMPS1_2121, "ibmps1_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, 127, machine_ps1_m2121_init, NULL, nvr_at_close }, - { "[386SX ISA] IBM PS/1 m.2121+ISA", ROM_IBMPS1_2121_ISA, "ibmps1_2121_isa", {{"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, 127, machine_ps1_m2121_init, NULL, nvr_at_close }, + { "[386SX ISA] AMI 386SX clone", ROM_AMI386SX, "ami386", "generic/ami/ami386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512,16384, 128, 127, machine_at_headland_init, NULL, nvr_at_close }, + { "[386SX ISA] Amstrad MegaPC", ROM_MEGAPC, "megapc", "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, 127, machine_at_wd76c10_init, NULL, nvr_at_close }, + { "[386SX ISA] Award 386SX clone", ROM_AWARD386SX_OPTI495, "award386sx", "generic/award/award495", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close }, + { "[386SX ISA] DTK 386SX clone", ROM_DTK386, "dtk386", "dtk/dtk386", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 512,16384, 128, 127, machine_at_neat_init, NULL, nvr_at_close }, + { "[386SX ISA] IBM PS/1 model 2121", ROM_IBMPS1_2121, "ibmps1_2121", "ibm/ibmps1_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, 127, machine_ps1_m2121_init, NULL, nvr_at_close }, + { "[386SX ISA] IBM PS/1 m.2121+ISA", ROM_IBMPS1_2121_ISA, "ibmps1_2121_isa", "ibm/ibmps1_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, 127, machine_ps1_m2121_init, NULL, nvr_at_close }, - { "[386SX MCA] IBM PS/2 model 55SX", ROM_IBMPS2_M55SX, "ibmps2_m55sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 8, 1, 63, machine_ps2_model_55sx_init, NULL, nvr_at_close }, + { "[386SX MCA] IBM PS/2 model 55SX", ROM_IBMPS2_M55SX, "ibmps2_m55sx", "ibm/ibmps2_m55sx", {{"Intel", cpus_i386SX}, {"AMD", cpus_Am386SX}, {"Cyrix", cpus_486SLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 8, 1, 63, machine_ps2_model_55sx_init, NULL, nvr_at_close }, - { "[386DX ISA] AMI 386DX clone", ROM_AMI386DX_OPTI495, "ami386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_ami_init, NULL, nvr_at_close }, - { "[386DX ISA] Amstrad MegaPC 386DX", ROM_MEGAPCDX, "megapcdx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 1, 32, 1, 127, machine_at_wd76c10_init, NULL, nvr_at_close }, - { "[386DX ISA] Award 386DX clone", ROM_AWARD386DX_OPTI495, "award386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close }, - { "[386DX ISA] MR 386DX clone", ROM_MR386DX_OPTI495, "mr386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_ami_init, NULL, nvr_at_close }, + { "[386DX ISA] AMI 386DX clone", ROM_AMI386DX_OPTI495, "ami386dx", "generic/ami/ami386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_ami_init, NULL, nvr_at_close }, + { "[386DX ISA] Amstrad MegaPC 386DX", ROM_MEGAPCDX, "megapcdx", "amstrad/megapc", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 1, 32, 1, 127, machine_at_wd76c10_init, NULL, nvr_at_close }, + { "[386DX ISA] Award 386DX clone", ROM_AWARD386DX_OPTI495, "award386dx", "generic/award/award495", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close }, + { "[386DX ISA] MR 386DX clone", ROM_MR386DX_OPTI495, "mr386dx", "generic/microid/mr386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_ami_init, NULL, nvr_at_close }, #if defined(DEV_BRANCH) && defined(USE_PORTABLE3) - { "[386DX ISA] Compaq Portable III (386)", ROM_PORTABLEIII386, "portableiii386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 1, 14, 1, 127, machine_at_compaq_init, NULL, nvr_at_close }, + { "[386DX ISA] Compaq Portable III (386)", ROM_PORTABLEIII386, "portableiii386", "compaq/deskpro386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 1, 14, 1, 127, machine_at_compaq_init, NULL, nvr_at_close }, #endif - { "[386DX MCA] IBM PS/2 model 80", ROM_IBMPS2_M80, "ibmps2_m80", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 12, 1, 63, machine_ps2_model_80_init, NULL, nvr_at_close }, + { "[386DX MCA] IBM PS/2 model 80", ROM_IBMPS2_M80, "ibmps2_m80", "ibm/ibmps2_m80", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 12, 1, 63, machine_ps2_model_80_init, NULL, nvr_at_close }, - { "[486 ISA] AMI 486 clone", ROM_AMI486, "ami486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_ali1429_init, NULL, nvr_at_close }, - { "[486 ISA] AMI WinBIOS 486", ROM_WIN486, "win486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_ali1429_init, NULL, nvr_at_close }, - { "[486 ISA] Award 486 clone", ROM_AWARD486_OPTI495, "award486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close }, - { "[486 ISA] DTK PKM-0038S E-2", ROM_DTK486, "dtk486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 128, 1, 127, machine_at_dtk486_init, NULL, nvr_at_close }, - { "[486 ISA] IBM PS/1 model 2133", ROM_IBMPS1_2133, "ibmps1_2133", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 1, 64, 1, 127, machine_ps1_m2133_init, NULL, nvr_at_close }, + { "[486 ISA] AMI 486 clone", ROM_AMI486, "ami486", "generic/ami/ami486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_ali1429_init, NULL, nvr_at_close }, + { "[486 ISA] AMI WinBIOS 486", ROM_WIN486, "win486", "generic/ami/win486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_ali1429_init, NULL, nvr_at_close }, + { "[486 ISA] Award 486 clone", ROM_AWARD486_OPTI495, "award486", "generic/award/award495", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close }, + { "[486 ISA] DTK PKM-0038S E-2", ROM_DTK486, "dtk486", "dtk/dtk486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 128, 1, 127, machine_at_dtk486_init, NULL, nvr_at_close }, + { "[486 ISA] IBM PS/1 model 2133", ROM_IBMPS1_2133, "ibmps1_2133", "ibm/ibmps1_2133", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 1, 64, 1, 127, machine_ps1_m2133_init, NULL, nvr_at_close }, #ifdef WALTJE - { "[486 MCA] IBM PS/2 model 80-486", ROM_IBMPS2_M80_486, "ibmps2_m80-486", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 32, 1, 63, machine_ps2_model_80_486_init, NULL, nvr_at_close }, + { "[486 MCA] IBM PS/2 model 80-486", ROM_IBMPS2_M80_486, "ibmps2_m80-486", "ibm/ibmps2_m80", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 32, 1, 63, machine_ps2_model_80_486_init, NULL, nvr_at_close }, #endif - { "[486 PCI] Rise Computer R418", ROM_R418, "r418", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 255, 1, 127, machine_at_r418_init, NULL, nvr_at_close }, + { "[486 PCI] Rise Computer R418", ROM_R418, "r418", "rise/r418", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 1, 255, 1, 127, machine_at_r418_init, NULL, nvr_at_close }, #if defined(DEV_BRANCH) && defined(USE_GREENB) - { "[486 VLB] Green-B 4GP V3.1", ROM_4GPV31, "4gpv31", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT, 1, 128, 1, 127, machine_at_4gpv31_init, NULL, nvr_at_close }, + { "[486 VLB] Green-B 4GP V3.1", ROM_4GPV31, "4gpv31", "addtech/green-b", {{"Intel", cpus_i486}, {"AMD", cpus_Am486}, {"Cyrix", cpus_Cx486}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VLB | MACHINE_AT, 1, 128, 1, 127, machine_at_4gpv31_init, NULL, nvr_at_close }, #endif - { "[Socket 4 LX] Intel Premiere/PCI", ROM_REVENGE, "revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_batman_init, NULL, nvr_at_close }, + { "[Socket 4 LX] Intel Premiere/PCI", ROM_REVENGE, "revenge", "intel/revenge", {{"Intel", cpus_Pentium5V}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_batman_init, NULL, nvr_at_close }, #if defined(DEV_BRANCH) && defined(USE_AMD_K) - { "[Socket 5 NX] Intel Premiere/PCI II", ROM_PLATO, "plato", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL, nvr_at_close }, + { "[Socket 5 NX] Intel Premiere/PCI II", ROM_PLATO, "plato", "intel/plato", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL, nvr_at_close }, - { "[Socket 5 FX] ASUS P/I-P54TP4XE", ROM_P54TP4XE, "p54tp4xe", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_p54tp4xe_init, NULL, nvr_at_close }, - { "[Socket 5 FX] Intel Advanced/EV", ROM_ENDEAVOR, "endeavor", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 8, 128, 8, 127, machine_at_endeavor_init, at_endeavor_get_device, nvr_at_close }, - { "[Socket 5 FX] Intel Advanced/ZP", ROM_ZAPPA, "zappa", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_zappa_init, NULL, nvr_at_close }, - { "[Socket 5 FX] PC Partner MB500N", ROM_MB500N, "mb500n", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_mb500n_init, NULL, nvr_at_close }, - { "[Socket 5 FX] President Award 430FX PCI",ROM_PRESIDENT, "president", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_president_init, NULL, nvr_at_close }, + { "[Socket 5 FX] ASUS P/I-P54TP4XE", ROM_P54TP4XE, "p54tp4xe", "asus/p54tp4xe", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_p54tp4xe_init, NULL, nvr_at_close }, + { "[Socket 5 FX] Intel Advanced/EV", ROM_ENDEAVOR, "endeavor", "intel/endeavor", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 8, 128, 8, 127, machine_at_endeavor_init, at_endeavor_get_device, nvr_at_close }, + { "[Socket 5 FX] Intel Advanced/ZP", ROM_ZAPPA, "zappa", "intel/zappa", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_zappa_init, NULL, nvr_at_close }, + { "[Socket 5 FX] PC Partner MB500N", ROM_MB500N, "mb500n", "pcpartner/mb500n", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_mb500n_init, NULL, nvr_at_close }, + { "[Socket 5 FX] President Award 430FX PCI",ROM_PRESIDENT, "president", "president/president", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"AMD", cpus_K5}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_president_init, NULL, nvr_at_close }, - { "[Socket 7 FX] Intel Advanced/ATX", ROM_THOR, "thor", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL, nvr_at_close }, - { "[Socket 7 FX] MR Intel Advanced/ATX", ROM_MRTHOR, "mrthor", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL, nvr_at_close }, + { "[Socket 7 FX] Intel Advanced/ATX", ROM_THOR, "thor", "intel/thor", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL, nvr_at_close }, + { "[Socket 7 FX] MR Intel Advanced/ATX", ROM_MRTHOR, "mrthor", "intel/mrthor", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL, nvr_at_close }, - { "[Socket 7 HX] Acer M3a", ROM_ACERM3A, "acerm3a", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_acerm3a_init, NULL, nvr_at_close }, - { "[Socket 7 HX] Acer V35n", ROM_ACERV35N, "acerv35n", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_acerv35n_init, NULL, nvr_at_close }, - { "[Socket 7 HX] AOpen AP53", ROM_AP53, "ap53", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_ap53_init, NULL, nvr_at_close }, - { "[Socket 7 HX] ASUS P/I-P55T2P4", ROM_P55T2P4, "p55t2p4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_p55t2p4_init, NULL, nvr_at_close }, - { "[Socket 7 HX] SuperMicro Super P55T2S", ROM_P55T2S, "p55t2s", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 768, 8, 127, machine_at_p55t2s_init, NULL, nvr_at_close }, + { "[Socket 7 HX] Acer M3a", ROM_ACERM3A, "acerm3a", "acer/acerm3a", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_acerm3a_init, NULL, nvr_at_close }, + { "[Socket 7 HX] Acer V35n", ROM_ACERV35N, "acerv35n", "acer/acerv35n", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_acerv35n_init, NULL, nvr_at_close }, + { "[Socket 7 HX] AOpen AP53", ROM_AP53, "ap53", "aopen/ap53", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_ap53_init, NULL, nvr_at_close }, + { "[Socket 7 HX] ASUS P/I-P55T2P4", ROM_P55T2P4, "p55t2p4", "asus/p55t2p4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_p55t2p4_init, NULL, nvr_at_close }, + { "[Socket 7 HX] SuperMicro Super P55T2S", ROM_P55T2S, "p55t2s", "supermicro/p55t2s", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 768, 8, 127, machine_at_p55t2s_init, NULL, nvr_at_close }, - { "[Socket 7 VX] ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55tvp4_init, NULL, nvr_at_close }, - { "[Socket 7 VX] Award 430VX PCI", ROM_430VX, "430vx", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_i430vx_init, NULL, nvr_at_close }, - { "[Socket 7 VX] Epox P55-VA", ROM_P55VA, "p55va", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55va_init, NULL, nvr_at_close }, + { "[Socket 7 VX] ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", "asus/p55tvp4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55tvp4_init, NULL, nvr_at_close }, + { "[Socket 7 VX] Award 430VX PCI", ROM_430VX, "430vx", "generic/award/430vx", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_i430vx_init, NULL, nvr_at_close }, + { "[Socket 7 VX] Epox P55-VA", ROM_P55VA, "p55va", "epox/p55va", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"AMD", cpus_K56}, {"Cyrix", cpus_6x86},{"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55va_init, NULL, nvr_at_close }, #else - { "[Socket 5 NX] Intel Premiere/PCI II", ROM_PLATO, "plato", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL, nvr_at_close }, + { "[Socket 5 NX] Intel Premiere/PCI II", ROM_PLATO, "plato", "intel/plato", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 2, 128, 2, 127, machine_at_plato_init, NULL, nvr_at_close }, - { "[Socket 5 FX] ASUS P/I-P54TP4XE", ROM_P54TP4XE, "p54tp4xe", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_p54tp4xe_init, NULL, nvr_at_close }, - { "[Socket 5 FX] Intel Advanced/EV", ROM_ENDEAVOR, "endeavor", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 8, 128, 8, 127, machine_at_endeavor_init, at_endeavor_get_device, nvr_at_close }, - { "[Socket 5 FX] Intel Advanced/ZP", ROM_ZAPPA, "zappa", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_zappa_init, NULL, nvr_at_close }, - { "[Socket 5 FX] PC Partner MB500N", ROM_MB500N, "mb500n", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_mb500n_init, NULL, nvr_at_close }, - { "[Socket 5 FX] President Award 430FX PCI",ROM_PRESIDENT, "president", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_president_init, NULL, nvr_at_close }, + { "[Socket 5 FX] ASUS P/I-P54TP4XE", ROM_P54TP4XE, "p54tp4xe", "asus/p54tp4xe", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_p54tp4xe_init, NULL, nvr_at_close }, + { "[Socket 5 FX] Intel Advanced/EV", ROM_ENDEAVOR, "endeavor", "intel/endeavor", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 8, 128, 8, 127, machine_at_endeavor_init, at_endeavor_get_device, nvr_at_close }, + { "[Socket 5 FX] Intel Advanced/ZP", ROM_ZAPPA, "zappa", "intel/zappa", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_zappa_init, NULL, nvr_at_close }, + { "[Socket 5 FX] PC Partner MB500N", ROM_MB500N, "mb500n", "pcpartner/mb500n", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_mb500n_init, NULL, nvr_at_close }, + { "[Socket 5 FX] President Award 430FX PCI",ROM_PRESIDENT, "president", "president/president", {{ "Intel", cpus_PentiumS5}, {"IDT", cpus_WinChip}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_HDC, 8, 128, 8, 127, machine_at_president_init, NULL, nvr_at_close }, - { "[Socket 7 FX] Intel Advanced/ATX", ROM_THOR, "thor", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL, nvr_at_close }, - { "[Socket 7 FX] MR Intel Advanced/ATX", ROM_MRTHOR, "mrthor", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL, nvr_at_close }, + { "[Socket 7 FX] Intel Advanced/ATX", ROM_THOR, "thor", "intel/thor", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL, nvr_at_close }, + { "[Socket 7 FX] MR Intel Advanced/ATX", ROM_MRTHOR, "mrthor", "intel/mrthor", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_thor_init, NULL, nvr_at_close }, - { "[Socket 7 HX] Acer M3a", ROM_ACERM3A, "acerm3a", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_acerm3a_init, NULL, nvr_at_close }, - { "[Socket 7 HX] Acer V35n", ROM_ACERV35N, "acerv35n", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_acerv35n_init, NULL, nvr_at_close }, - { "[Socket 7 HX] AOpen AP53", ROM_AP53, "ap53", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_ap53_init, NULL, nvr_at_close }, - { "[Socket 7 HX] ASUS P/I-P55T2P4", ROM_P55T2P4, "p55t2p4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_p55t2p4_init, NULL, nvr_at_close }, - { "[Socket 7 HX] SuperMicro Super P55T2S", ROM_P55T2S, "p55t2s", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 768, 8, 127, machine_at_p55t2s_init, NULL, nvr_at_close }, + { "[Socket 7 HX] Acer M3a", ROM_ACERM3A, "acerm3a", "acer/acerm3a", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_acerm3a_init, NULL, nvr_at_close }, + { "[Socket 7 HX] Acer V35n", ROM_ACERV35N, "acerv35n", "acer/acerv35n", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 192, 8, 127, machine_at_acerv35n_init, NULL, nvr_at_close }, + { "[Socket 7 HX] AOpen AP53", ROM_AP53, "ap53", "aopen/ap53", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_ap53_init, NULL, nvr_at_close }, + { "[Socket 7 HX] ASUS P/I-P55T2P4", ROM_P55T2P4, "p55t2p4", "asus/p55t2p4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 512, 8, 127, machine_at_p55t2p4_init, NULL, nvr_at_close }, + { "[Socket 7 HX] SuperMicro Super P55T2S", ROM_P55T2S, "p55t2s", "supermicro/p55t2s", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 768, 8, 127, machine_at_p55t2s_init, NULL, nvr_at_close }, - { "[Socket 7 VX] ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55tvp4_init, NULL, nvr_at_close }, - { "[Socket 7 VX] Award 430VX PCI", ROM_430VX, "430vx", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_i430vx_init, NULL, nvr_at_close }, - { "[Socket 7 VX] Epox P55-VA", ROM_P55VA, "p55va", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55va_init, NULL, nvr_at_close }, + { "[Socket 7 VX] ASUS P/I-P55TVP4", ROM_P55TVP4, "p55tvp4", "asus/p55tvp4", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55tvp4_init, NULL, nvr_at_close }, + { "[Socket 7 VX] Award 430VX PCI", ROM_430VX, "430vx", "generic/award/430vx", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_i430vx_init, NULL, nvr_at_close }, + { "[Socket 7 VX] Epox P55-VA", ROM_P55VA, "p55va", "epox/p55va", {{"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_VLB | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 128, 8, 127, machine_at_p55va_init, NULL, nvr_at_close }, #endif #if defined(DEV_BRANCH) && defined(USE_I686) - { "[Socket 8 FX] Tyan Titan-Pro AT", ROM_440FX, "440fx", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 1024, 8, 127, machine_at_i440fx_init, NULL, nvr_at_close }, - { "[Socket 8 FX] Tyan Titan-Pro ATX", ROM_S1668, "tpatx", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 1024, 8, 127, machine_at_s1668_init, NULL, nvr_at_close }, + { "[Socket 8 FX] Tyan Titan-Pro AT", ROM_440FX, "440fx", "tyan/440fx", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 1024, 8, 127, machine_at_i440fx_init, NULL, nvr_at_close }, + { "[Socket 8 FX] Tyan Titan-Pro ATX", ROM_S1668, "tpatx", "tyan/tpatx", {{"Intel", cpus_PentiumPro}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 1024, 8, 127, machine_at_s1668_init, NULL, nvr_at_close }, #endif - { "", -1, "", {{"", 0}, {"", 0}, {"", 0}}, 0,0,0,0, 0 } + { "", -1, "", NULL, {{"", 0}, {"", 0}, {"", 0}}, 0,0,0,0, 0 } }; diff --git a/src/network/network.c b/src/network/network.c index b3d17d8..80688af 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -12,7 +12,7 @@ * it should be malloc'ed and then linked to the NETCARD def. * Will be done later. * - * Version: @(#)network.c 1.0.1 2018/02/14 + * Version: @(#)network.c 1.0.2 2018/02/22 * * Author: Fred N. van Kempen, * @@ -106,6 +106,7 @@ static struct { # define is_print(c) (isalnum((int)(c)) || ((c) == ' ')) +#if 0 /* Dump a buffer in hex, standard output. */ static void hexdump(uint8_t *bufp, int len) @@ -139,6 +140,7 @@ hexdump(uint8_t *bufp, int len) printf(" | %s |\n", asci); } } +#endif /* Dump a buffer in hex to output buffer. */ diff --git a/src/rom.c b/src/rom.c index ef4e6bc..a969f8b 100644 --- a/src/rom.c +++ b/src/rom.c @@ -13,7 +13,7 @@ * - c386sx16 BIOS fails checksum * - the loadfont() calls should be done elsewhere * - * Version: @(#)rom.c 1.0.2 2018/02/21 + * Version: @(#)rom.c 1.0.3 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -195,13 +195,9 @@ rom_load_interleaved(wchar_t *fnl, wchar_t *fnh, uint32_t addr, int sz, int off, /* Make sure we only look at the base-256K offset. */ if (addr >= 0x40000) - { addr = 0; - } - else - { + else addr &= 0x03ffff; - } (void)fseek(fl, off, SEEK_SET); (void)fseek(fh, off, SEEK_SET); @@ -276,11 +272,6 @@ rom_load_bios(int rom_id) { FILE *f; - /* FIXME: do this in the video card driver. */ - loadfont(L"roms/video/mda/mda.rom", 0); - loadfont(L"roms/video/wyse700/wy700.rom", 3); - loadfont(L"roms/video/genius/8x12.bin", 4); - /* If not done yet, allocate a 128KB buffer for the BIOS ROM. */ if (rom == NULL) rom = (uint8_t *)malloc(131072); @@ -296,136 +287,136 @@ rom_load_bios(int rom_id) switch (rom_id) { case ROM_IBMPC: /* IBM PC */ if (! rom_load_linear( - L"roms/machines/ibmpc/pc102782.bin", + L"roms/machines/ibm/ibmpc/pc102782.bin", 0x00e000, 8192, 0, rom)) break; /* Try to load the (full) BASIC ROM. */ if (rom_load_linear( - L"roms/machines/ibmpc/ibm-basic-1.10.rom", + L"roms/machines/ibm/ibmpc/ibm-basic-1.10.rom", 0x006000, 32768, 0, rom)) return(1); /* Nope. Try to load the first BASIC ROM image. */ if (! rom_load_linear( - L"roms/machines/ibmpc/basicc11.f6", + L"roms/machines/ibm/ibmpc/basicc11.f6", 0x006000, 8192, 0, rom)) return(1); /* nope */ if (! rom_load_linear( - L"roms/machines/ibmpc/basicc11.f8", + L"roms/machines/ibm/ibmpc/basicc11.f8", 0x008000, 8192, 0, rom)) break; /* nope */ if (! rom_load_linear( - L"roms/machines/ibmpc/basicc11.fa", + L"roms/machines/ibm/ibmpc/basicc11.fa", 0x00a000, 8192, 0, rom)) break; /* nope */ if (! rom_load_linear( - L"roms/machines/ibmpc/basicc11.fc", + L"roms/machines/ibm/ibmpc/basicc11.fc", 0x00c000, 8192, 0, rom)) break; /* nope */ return(1); case ROM_IBMXT: /* IBM PX-XT */ if (rom_load_linear( - L"roms/machines/ibmxt/xt.rom", + L"roms/machines/ibm/ibmxt/xt.rom", 0x000000, 65536, 0, rom)) return(1); if (! rom_load_linear( - L"roms/machines/ibmxt/5000027.u19", + L"roms/machines/ibm/ibmxt/5000027.u19", 0x000000, 32768, 0, rom)) break; if (rom_load_linear( - L"roms/machines/ibmxt/1501512.u18", + L"roms/machines/ibm/ibmxt/1501512.u18", 0x008000, 32768, 0, rom)) return(1); break; case ROM_IBMXT286: /* IBM PX-XT 286 */ if (rom_load_interleaved( - L"roms/machines/ibmxt286/bios_5162_21apr86_u34_78x7460_27256.bin", - L"roms/machines/ibmxt286/bios_5162_21apr86_u35_78x7461_27256.bin", + L"roms/machines/ibm/ibmxt286/bios_5162_21apr86_u34_78x7460_27256.bin", + L"roms/machines/ibm/ibmxt286/bios_5162_21apr86_u35_78x7461_27256.bin", 0x000000, 65536, 0, rom)) return(1); break; case ROM_IBMPCJR: /* IBM PCjr */ if (rom_load_linear( - L"roms/machines/ibmpcjr/bios.rom", + L"roms/machines/ibm/ibmpcjr/bios.rom", 0x000000, 65536, 0, rom)) return(1); break; case ROM_IBMAT: /* IBM PC-AT */ if (rom_load_interleaved( - L"roms/machines/ibmat/62x0820.u27", - L"roms/machines/ibmat/62x0821.u47", + L"roms/machines/ibm/ibmat/62x0820.u27", + L"roms/machines/ibm/ibmat/62x0821.u47", 0x000000, 65536, 0, rom)) return(1); break; #ifdef WALTJE case ROM_OPENAT: /* PC/AT clone with OpenBIOS */ if (rom_load_linear( - L"roms/machines/open_at/bios.bin", + L"roms/machines/generic/open_at/bios.bin", 0x000000, 65536, 0, rom)) return(1); break; #endif case ROM_GENXT: /* Generic PC-XT clone */ if (rom_load_linear( - L"roms/machines/genxt/pcxt.rom", + L"roms/machines/generic/genxt/pcxt.rom", 0x00e000, 8192, 0, rom)) return(1); break; case ROM_PC1512: /* Amstrad PC-1512 */ if (! rom_load_interleaved( - L"roms/machines/pc1512/40044", - L"roms/machines/pc1512/40043", + L"roms/machines/amstrad/pc1512/40044v2.ic132", + L"roms/machines/amstrad/pc1512/40043v2.ic129", 0x00c000, 16384, 0, rom)) break; - f = rom_fopen(L"roms/machines/pc1512/40078", L"rb"); + f = rom_fopen(L"roms/machines/amstrad/pc1512/40078.ic127", L"rb"); if (f == NULL) break; (void)fclose(f); return(1); case ROM_PC1640: /* Amstrad PC-1640 */ if (! rom_load_interleaved( - L"roms/machines/pc1640/40044.v3", - L"roms/machines/pc1640/40043.v3", + L"roms/machines/amstrad/pc1640/40044.v3", + L"roms/machines/amstrad/pc1640/40043.v3", 0x00c000, 16384, 0, rom)) break; - f = rom_fopen(L"roms/machines/pc1640/40100", L"rb"); + f = rom_fopen(L"roms/machines/amstrad/pc1640/40100", L"rb"); if (f == NULL) break; (void)fclose(f); return(1); case ROM_PC200: if (! rom_load_interleaved( - L"roms/machines/pc200/pc20v2.1", - L"roms/machines/pc200/pc20v2.0", + L"roms/machines/amstrad/pc200/pc20v2.1", + L"roms/machines/amstrad/pc200/pc20v2.0", 0x00c000, 16384, 0, rom)) break; - f = rom_fopen(L"roms/machines/pc200/40109", L"rb"); + f = rom_fopen(L"roms/machines/amstrad/pc200/40109", L"rb"); if (f == NULL) break; (void)fclose(f); return(1); case ROM_TANDY: if (rom_load_linear( - L"roms/machines/tandy/tandy1t1.020", + L"roms/machines/tandy/tandy/tandy1t1.020", 0x000000, 65536, 0, rom)) return(1); break; case ROM_TANDY1000HX: if (! rom_load_linear( - L"roms/machines/tandy1000hx/v020000.u12", + L"roms/machines/tandy/tandy1000hx/v020000.u12", 0x000000, 0x20000, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_TANDY1000SL2: if (rom_load_interleaved( - L"roms/machines/tandy1000sl2/8079047.hu1", - L"roms/machines/tandy1000sl2/8079048.hu2", + L"roms/machines/tandy/tandy1000sl2/8079047.hu1", + L"roms/machines/tandy/tandy1000sl2/8079048.hu2", 0x000000, 65536, 0x30000/2, rom)) return(1); break; case ROM_PORTABLE: if (rom_load_linear( - L"roms/machines/portable/compaq portable plus 100666-001 rev c u47.bin", + L"roms/machines/compaq/portable/compaq portable plus 100666-001 rev c u47.bin", 0x00e000, 8192, 0, rom)) return(1); break; case ROM_PORTABLEII: if (! rom_load_interleaved( - L"roms/machines/portableii/109740-001.rom", - L"roms/machines/portableii/109739-001.rom", + L"roms/machines/compaq/portableii/109740-001.rom", + L"roms/machines/compaq/portableii/109739-001.rom", 0x008000, 32768, 0, rom)) break; biosmask = 0x7fff; return(1); @@ -434,31 +425,31 @@ rom_load_bios(int rom_id) case ROM_PORTABLEIII: case ROM_PORTABLEIII386: if (rom_load_interleaved( - L"roms/machines/portableiii/109738-002.bin", - L"roms/machines/portableiii/109737-002.bin", + L"roms/machines/compaq/portableiii/109738-002.bin", + L"roms/machines/compaq/portableiii/109737-002.bin", 0x000000, 65536, 0, rom)) return(1); break; #endif case ROM_DTKXT: if (rom_load_linear( - L"roms/machines/dtk/dtk_erso_2.42_2764.bin", + L"roms/machines/dtk/dtk/dtk_erso_2.42_2764.bin", 0x00e000, 8192, 0, rom)) return(1); break; case ROM_OLIM24: if (rom_load_interleaved( - L"roms/machines/olivetti_m24/olivetti_m24_version_1.43_low.bin", - L"roms/machines/olivetti_m24/olivetti_m24_version_1.43_high.bin", + L"roms/machines/olivetti/olivetti_m24/olivetti_m24_version_1.43_low.bin", + L"roms/machines/olivetti/olivetti_m24/olivetti_m24_version_1.43_high.bin", 0x00c000, 16384, 0, rom)) return(1); break; case ROM_PC2086: if (! rom_load_interleaved( - L"roms/machines/pc2086/40179.ic129", - L"roms/machines/pc2086/40180.ic132", + L"roms/machines/amstrad/pc2086/40179.ic129", + L"roms/machines/amstrad/pc2086/40180.ic132", 0x000000, 16384, 0, rom)) break; - f = rom_fopen(L"roms/machines/pc2086/40186.ic171", L"rb"); + f = rom_fopen(L"roms/machines/amstrad/pc2086/40186.ic171", L"rb"); if (f == NULL) break; (void)fclose(f); biosmask = 0x3fff; @@ -466,9 +457,9 @@ rom_load_bios(int rom_id) case ROM_PC3086: if (! rom_load_linear( - L"roms/machines/pc3086/fc00.bin", + L"roms/machines/amstrad/pc3086/fc00.bin", 0x000000, 16384, 0, rom)) break; - f = rom_fopen(L"roms/machines/pc3086/c000.bin", L"rb"); + f = rom_fopen(L"roms/machines/amstrad/pc3086/c000.bin", L"rb"); if (f == NULL) break; (void)fclose(f); biosmask = 0x3fff; @@ -476,27 +467,27 @@ rom_load_bios(int rom_id) case ROM_CMDPC30: if (! rom_load_interleaved( - L"roms/machines/cmdpc30/commodore pc 30 iii even.bin", - L"roms/machines/cmdpc30/commodore pc 30 iii odd.bin", + L"roms/machines/commodore/cmdpc30/commodore pc 30 iii even.bin", + L"roms/machines/commodore/cmdpc30/commodore pc 30 iii odd.bin", 0x000000, 32768, 0, rom)) break; biosmask = 0x7fff; return(1); case ROM_AMI386SX: if (rom_load_linear( - L"roms/machines/ami386/ami386.bin", + L"roms/machines/generic/ami/ami386/ami386.bin", 0x000000, 65536, 0, rom)) return(1); break; case ROM_AMI386DX_OPTI495: /* uses the OPTi 82C495 chipset */ if (rom_load_linear( - L"roms/machines/ami386dx/opt495sx.ami", + L"roms/machines/generic/ami/ami386dx/opt495sx.ami", 0x000000, 65536, 0, rom)) return(1); break; case ROM_MR386DX_OPTI495: /* uses the OPTi 82C495 chipset */ if (rom_load_linear( - L"roms/machines/mr386dx/opt495sx.mr", + L"roms/machines/generic/microid/mr386dx/opt495sx.mr", 0x000000, 65536, 0, rom)) return(1); break; @@ -504,78 +495,78 @@ rom_load_bios(int rom_id) case ROM_AWARD386DX_OPTI495: /* uses the OPTi 82C495 chipset */ case ROM_AWARD486_OPTI495: /* uses the OPTi 82C495 chipset */ if (rom_load_linear( - L"roms/machines/award495/opt495s.awa", + L"roms/machines/generic/award/award495/opt495s.awa", 0x000000, 65536, 0, rom)) return(1); break; case ROM_AMI286: if (rom_load_linear( - L"roms/machines/ami286/amic206.bin", + L"roms/machines/generic/ami/ami286/amic206.bin", 0x000000, 65536, 0, rom)) return(1); break; case ROM_AWARD286: if (rom_load_linear( - L"roms/machines/award286/award.bin", + L"roms/machines/generic/award/award286/award.bin", 0x000000, 65536, 0, rom)) return(1); break; case ROM_EUROPC: if (rom_load_linear( - L"roms/machines/europc/50145", + L"roms/machines/schneider/europc/50145", 0x008000, 32768, 0, rom)) return(1); break; case ROM_MEGAPC: case ROM_MEGAPCDX: if (rom_load_interleaved( - L"roms/machines/megapc/41651-bios lo.u18", - L"roms/machines/megapc/211253-bios hi.u19", + L"roms/machines/amstrad/megapc/41651-bios lo.u18", + L"roms/machines/amstrad/megapc/211253-bios hi.u19", 0x000000, 65536, 0x08000, rom)) return(1); break; case ROM_AMI486: if (rom_load_linear( - L"roms/machines/ami486/ami486.bin", + L"roms/machines/generic/ami/ami486/ami486.bin", 0x000000, 65536, 0, rom)) return(1); break; case ROM_WIN486: if (rom_load_linear( - L"roms/machines/win486/ali1429g.amw", + L"roms/machines/generic/ami/win486/ali1429g.amw", 0x000000, 65536, 0, rom)) return(1); break; case ROM_430VX: if (! rom_load_linear( - L"roms/machines/430vx/55xwuq0e.bin", + L"roms/machines/generic/award/430vx/55xwuq0e.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_REVENGE: if (! rom_load_linear( - L"roms/machines/revenge/1009af2_.bio", + L"roms/machines/intel/revenge/1009af2_.bio", 0x010000, 65536, 128, rom)) break; if (! rom_load_linear( - L"roms/machines/revenge/1009af2_.bi1", + L"roms/machines/intel/revenge/1009af2_.bi1", 0x000000, 0x00c000, 128, rom)) break; biosmask = 0x1ffff; return(1); case ROM_ENDEAVOR: if (! rom_load_linear( - L"roms/machines/endeavor/1006cb0_.bio", + L"roms/machines/intel/endeavor/1006cb0_.bio", 0x010000, 65536, 128, rom)) break; if (! rom_load_linear( - L"roms/machines/endeavor/1006cb0_.bi1", + L"roms/machines/intel/endeavor/1006cb0_.bi1", 0x000000, 0x00d000, 128, rom)) break; biosmask = 0x1ffff; return(1); case ROM_IBMPS1_2011: if (! rom_load_linear( - L"roms/machines/ibmps1es/f80000.bin", + L"roms/machines/ibm/ibmps1es/f80000.bin", 0x000000, 131072, 0x60000, rom)) break; biosmask = 0x1ffff; return(1); @@ -583,14 +574,14 @@ rom_load_bios(int rom_id) case ROM_IBMPS1_2121: case ROM_IBMPS1_2121_ISA: if (! rom_load_linear( - L"roms/machines/ibmps1_2121/fc0000.bin", + L"roms/machines/ibm/ibmps1_2121/fc0000.bin", 0x000000, 131072, 0x20000, rom)) break; biosmask = 0x1ffff; return(1); case ROM_IBMPS1_2133: if (! rom_load_linear( - L"roms/machines/ibmps1_2133/ps1_2133_52g2974_rom.bin", + L"roms/machines/ibm/ibmps1_2133/ps1_2133_52g2974_rom.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); @@ -598,8 +589,8 @@ rom_load_bios(int rom_id) #if defined(DEV_BRANCH) && defined(USE_PORTABLE3) case ROM_DESKPRO_386: if (! rom_load_interleaved( - L"roms/machines/deskpro386/109592-005.u11.bin", - L"roms/machines/deskpro386/109591-005.u13.bin", + L"roms/machines/compaq/deskpro386/109592-005.u11.bin", + L"roms/machines/compaq/deskpro386/109591-005.u13.bin", 0x000000, 32768, 0, rom)) break; biosmask = 0x7fff; return(1); @@ -607,70 +598,70 @@ rom_load_bios(int rom_id) case ROM_AMIXT: if (rom_load_linear( - L"roms/machines/amixt/ami_8088_bios_31jan89.bin", + L"roms/machines/generic/ami/amixt/ami_8088_bios_31jan89.bin", 0x00e000, 8192, 0, rom)) return(1); break; #if defined(DEV_BRANCH) && defined(USE_LASERXT) case ROM_LTXT: if (rom_load_linear( - L"roms/machines/ltxt/27c64.bin", + L"roms/machines/vtech/ltxt/27c64.bin", 0x00e000, 8192, 0, rom)) return(1); break; case ROM_LXT3: if (rom_load_linear( - L"roms/machines/lxt3/27c64d.bin", + L"roms/machines/vtech/lxt3/27c64d.bin", 0x00e000, 8192, 0, rom)) return(1); break; #endif case ROM_SPC4200P: /* Samsung SPC-4200P */ if (rom_load_linear( - L"roms/machines/spc4200p/u8.01", + L"roms/machines/samsung/spc4200p/u8.01", 0x000000, 65536, 0, rom)) return(1); break; case ROM_SUPER286TR: /* Hyundai Super-286TR */ if (rom_load_linear( - L"roms/machines/super286tr/hyundai_award286.bin", + L"roms/machines/hyundai/super286tr/hyundai_award286.bin", 0x000000, 65536, 0, rom)) return(1); break; case ROM_DTK386: /* uses NEAT chipset */ if (rom_load_linear( - L"roms/machines/dtk386/3cto001.bin", + L"roms/machines/dtk/dtk386/3cto001.bin", 0x000000, 65536, 0, rom)) return(1); break; case ROM_PXXT: if (rom_load_linear( - L"roms/machines/pxxt/000p001.bin", + L"roms/machines/generic/phoenix/pxxt/000p001.bin", 0x00e000, 8192, 0, rom)) return(1); break; case ROM_JUKOPC: if (rom_load_linear( - L"roms/machines/jukopc/000o001.bin", + L"roms/machines/juko/jukopc/000o001.bin", 0x00e000, 8192, 0, rom)) return(1); break; case ROM_IBMPS2_M30_286: if (! rom_load_linear( - L"roms/machines/ibmps2_m30_286/33f5381a.bin", + L"roms/machines/ibm/ibmps2_m30_286/33f5381a.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_DTK486: if (rom_load_linear( - L"roms/machines/dtk486/4siw005.bin", + L"roms/machines/dtk/dtk486/4siw005.bin", 0x000000, 65536, 0, rom)) return(1); break; case ROM_R418: if (! rom_load_linear( - L"roms/machines/r418/r418i.bin", + L"roms/machines/rise/r418/r418i.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); @@ -687,80 +678,80 @@ rom_load_bios(int rom_id) case ROM_PLATO: if (! rom_load_linear( - L"roms/machines/plato/1016ax1_.bio", + L"roms/machines/intel/plato/1016ax1_.bio", 0x010000, 65536, 128, rom)) break; if (! rom_load_linear( - L"roms/machines/plato/1016ax1_.bi1", + L"roms/machines/intel/plato/1016ax1_.bi1", 0x000000, 0x00d000, 128, rom)) break; biosmask = 0x1ffff; return(1); case ROM_MB500N: if (! rom_load_linear( - L"roms/machines/mb500n/031396s.bin", + L"roms/machines/pcpartner/mb500n/031396s.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_AP53: if (! rom_load_linear( - L"roms/machines/ap53/ap53r2c0.rom", + L"roms/machines/aopen/ap53/ap53r2c0.rom", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_P55T2S: if (! rom_load_linear( - L"roms/machines/p55t2s/s6y08t.rom", + L"roms/machines/supermicro/p55t2s/s6y08t.rom", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_PRESIDENT: if (! rom_load_linear( - L"roms/machines/president/bios.bin", + L"roms/machines/president/president/bios.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_P54TP4XE: if (! rom_load_linear( - L"roms/machines/p54tp4xe/t15i0302.awd", + L"roms/machines/asus/p54tp4xe/t15i0302.awd", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_ACERM3A: if (! rom_load_linear( - L"roms/machines/acerm3a/r01-b3.bin", + L"roms/machines/acer/acerm3a/r01-b3.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_ACERV35N: if (! rom_load_linear( - L"roms/machines/acerv35n/v35nd1s1.bin", + L"roms/machines/acer/acerv35n/v35nd1s1.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_P55VA: if (! rom_load_linear( - L"roms/machines/p55va/va021297.bin", + L"roms/machines/epox/p55va/va021297.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_P55T2P4: if (! rom_load_linear( - L"roms/machines/p55t2p4/0207_j2.bin", + L"roms/machines/asus/p55t2p4/0207_j2.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_P55TVP4: if (! rom_load_linear( - L"roms/machines/p55tvp4/tv5i0204.awd", + L"roms/machines/asus/p55tvp4/tv5i0204.awd", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); @@ -768,14 +759,14 @@ rom_load_bios(int rom_id) #if defined(DEV_BRANCH) && defined(USE_I686) case ROM_440FX: /* working Tyan BIOS */ if (! rom_load_linear( - L"roms/machines/440fx/ntmaw501.bin", + L"roms/machines/tyan/440fx/ntmaw501.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_S1668: /* working Tyan BIOS */ if (! rom_load_linear( - L"roms/machines/tpatx/s1668p.rom", + L"roms/machines/tyan/tpatx/s1668p.rom", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); @@ -783,47 +774,47 @@ rom_load_bios(int rom_id) case ROM_THOR: if (! rom_load_linear( - L"roms/machines/thor/1006cn0_.bio", + L"roms/machines/intel/thor/1006cn0_.bio", 0x010000, 65536, 128, rom)) break; if (! rom_load_linear( - L"roms/machines/thor/1006cn0_.bi1", + L"roms/machines/intel/thor/1006cn0_.bi1", 0x000000, 65536, 128, rom)) break; biosmask = 0x1ffff; return(1); case ROM_MRTHOR: if (! rom_load_linear( - L"roms/machines/mrthor/mr_atx.bio", + L"roms/machines/intel/mrthor/mr_atx.bio", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_ZAPPA: if (! rom_load_linear( - L"roms/machines/zappa/1006bs0_.bio", + L"roms/machines/intel/zappa/1006bs0_.bio", 0x010000, 65536, 128, rom)) break; if (! rom_load_linear( - L"roms/machines/zappa/1006bs0_.bi1", + L"roms/machines/intel/zappa/1006bs0_.bi1", 0x000000, 65536, 128, rom)) break; biosmask = 0x1ffff; return(1); case ROM_IBMPS2_M50: if (! rom_load_interleaved( - L"roms/machines/ibmps2_m50/90x7423.zm14", - L"roms/machines/ibmps2_m50/90x7426.zm16", + L"roms/machines/ibm/ibmps2_m50/90x7423.zm14", + L"roms/machines/ibm/ibmps2_m50/90x7426.zm16", 0x000000, 65536, 0, rom)) break; if (! rom_load_interleaved( - L"roms/machines/ibmps2_m50/90x7420.zm13", - L"roms/machines/ibmps2_m50/90x7429.zm18", + L"roms/machines/ibm/ibmps2_m50/90x7420.zm13", + L"roms/machines/ibm/ibmps2_m50/90x7429.zm18", 0x010000, 65536, 0, rom)) break; biosmask = 0x1ffff; return(1); case ROM_IBMPS2_M55SX: if (! rom_load_interleaved( - L"roms/machines/ibmps2_m55sx/33f8146.zm41", - L"roms/machines/ibmps2_m55sx/33f8145.zm40", + L"roms/machines/ibm/ibmps2_m55sx/33f8146.zm41", + L"roms/machines/ibm/ibmps2_m55sx/33f8145.zm40", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); @@ -833,8 +824,8 @@ rom_load_bios(int rom_id) case ROM_IBMPS2_M80_486: #endif if (! rom_load_interleaved( - L"roms/machines/ibmps2_m80/15f6637.bin", - L"roms/machines/ibmps2_m80/15f6639.bin", + L"roms/machines/ibm/ibmps2_m80/15f6637.bin", + L"roms/machines/ibm/ibmps2_m80/15f6639.bin", 0x000000, 131072, 0, rom)) break; biosmask = 0x1ffff; return(1); @@ -842,15 +833,15 @@ rom_load_bios(int rom_id) #if defined(DEV_BRANCH) && defined(USE_GREENB) case ROM_4GPV31: if (! rom_load_linear( - L"roms/machines/green-b/4gpv31-ami-1993-8273517.bin", + L"roms/machines/addtech/green-b/4gpv31-ami-1993-8273517.bin", 0x000000, 65536, 0, rom)) break; return(1); #endif case ROM_T3100E: - loadfont(L"roms/machines/t3100e/t3100e_font.bin", 5); + loadfont(L"roms/machines/toshiba/t3100e/t3100e_font.bin", 5); if (rom_load_linear( - L"roms/machines/t3100e/t3100e.rom", + L"roms/machines/toshiba/t3100e/t3100e.rom", 0x000000, 65536, 0, rom)) return(1); break; diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c index cf89fda..7787792 100644 --- a/src/scsi/scsi_buslogic.c +++ b/src/scsi/scsi_buslogic.c @@ -13,7 +13,7 @@ * 1 - BT-545S ISA; * 2 - BT-958D PCI * - * Version: @(#)scsi_buslogic.c 1.0.2 2018/02/21 + * Version: @(#)scsi_buslogic.c 1.0.3 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -1542,7 +1542,7 @@ buslogic_init(device_t *info) { case CHIP_BUSLOGIC_ISA_542: strcpy(dev->name, "BT-542BH"); - bios_rom_name = L"roms/scsi/buslogic/BT-542BH_BIOS.rom"; + bios_rom_name = L"roms/scsi/buslogic/bt-542bh_bios.rom"; bios_rom_size = 0x4000; bios_rom_mask = 0x3fff; has_autoscsi_rom = 0; @@ -1552,18 +1552,18 @@ buslogic_init(device_t *info) case CHIP_BUSLOGIC_ISA: default: strcpy(dev->name, "BT-545S"); - bios_rom_name = L"roms/scsi/buslogic/BT-545S_BIOS.rom"; + bios_rom_name = L"roms/scsi/buslogic/bt-545s_bios.rom"; bios_rom_size = 0x4000; bios_rom_mask = 0x3fff; has_autoscsi_rom = 1; - autoscsi_rom_name = L"roms/scsi/buslogic/BT-545S_AutoSCSI.rom"; + autoscsi_rom_name = L"roms/scsi/buslogic/bt-545s_autoscsi.rom"; autoscsi_rom_size = 0x4000; has_scam_rom = 0; dev->fw_rev = "AA421E"; break; case CHIP_BUSLOGIC_MCA: strcpy(dev->name, "BT-640A"); - bios_rom_name = L"roms/scsi/buslogic/BT-640A_BIOS.rom"; + bios_rom_name = L"roms/scsi/buslogic/bt-640a_bios.rom"; bios_rom_size = 0x4000; bios_rom_mask = 0x3fff; has_autoscsi_rom = 0; @@ -1576,11 +1576,11 @@ buslogic_init(device_t *info) break; case CHIP_BUSLOGIC_VLB: strcpy(dev->name, "BT-445S"); - bios_rom_name = L"roms/scsi/buslogic/BT-445S_BIOS.rom"; + bios_rom_name = L"roms/scsi/buslogic/bt-445s_bios.rom"; bios_rom_size = 0x4000; bios_rom_mask = 0x3fff; has_autoscsi_rom = 1; - autoscsi_rom_name = L"roms/scsi/buslogic/BT-445S_AutoSCSI.rom"; + autoscsi_rom_name = L"roms/scsi/buslogic/bt-445s_autoscsi.rom"; autoscsi_rom_size = 0x4000; has_scam_rom = 0; dev->fw_rev = "AA421E"; @@ -1588,14 +1588,14 @@ buslogic_init(device_t *info) break; case CHIP_BUSLOGIC_PCI: strcpy(dev->name, "BT-958D"); - bios_rom_name = L"roms/scsi/buslogic/BT-958D_BIOS.rom"; + bios_rom_name = L"roms/scsi/buslogic/bt-958d_bios.rom"; bios_rom_size = 0x4000; bios_rom_mask = 0x3fff; has_autoscsi_rom = 1; - autoscsi_rom_name = L"roms/scsi/buslogic/BT-958D_AutoSCSI.rom"; + autoscsi_rom_name = L"roms/scsi/buslogic/bt-958d_autoscsi.rom"; autoscsi_rom_size = 0x8000; has_scam_rom = 1; - scam_rom_name = L"roms/scsi/buslogic/BT-958D_SCAM.rom"; + scam_rom_name = L"roms/scsi/buslogic/bt-958d_scam.rom"; scam_rom_size = 0x0200; dev->fw_rev = "AA507B"; dev->cdrom_boot = 1; diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c index 83f46cf..7406f04 100644 --- a/src/scsi/scsi_ncr5380.c +++ b/src/scsi/scsi_ncr5380.c @@ -9,7 +9,7 @@ * Implementation of the NCR 5380 series of SCSI Host Adapters * made by NCR. These controllers were designed for the ISA bus. * - * Version: @(#)scsi_ncr5380.c 1.0.1 2018/02/14 + * Version: @(#)scsi_ncr5380.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -62,8 +62,8 @@ #include "scsi_ncr5380.h" -#define LCS6821N_ROM L"roms/scsi/ncr5380/Longshine LCS-6821N - BIOS version 1.04.bin" -#define RT1000B_ROM L"roms/scsi/ncr5380/Rancho_RT1000_RTBios_version_8.10R.bin" +#define LCS6821N_ROM L"roms/scsi/ncr5380/longshine lcs-6821n - bios version 1.04.bin" +#define RT1000B_ROM L"roms/scsi/ncr5380/rancho_rt1000_rtbios_version_8.10r.bin" #define T130B_ROM L"roms/scsi/ncr5380/trantor_t130b_bios_v2.14.bin" #define SCSIAT_ROM L"roms/scsi/ncr5380/sumo_scsiat_bios_v6.3.bin" diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c index 9afc1ea..2e423cc 100644 --- a/src/sound/snd_audiopci.c +++ b/src/sound/snd_audiopci.c @@ -8,7 +8,7 @@ * * Implementation of the AudioPCI sound device. * - * Version: @(#)snd_audiopci.c 1.0.2 2018/02/21 + * Version: @(#)snd_audiopci.c 1.0.3 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -1139,7 +1139,7 @@ static void es1371_get_buffer(int32_t *buffer, int len, void *p) es1371->pos = 0; } -static void *es1371_init(void) +static void *es1371_init(device_t *info) { es1371_t *es1371 = malloc(sizeof(es1371_t)); memset(es1371, 0, sizeof(es1371_t)); diff --git a/src/video/vid_ati18800.c b/src/video/vid_ati18800.c index 534ddcf..1931f5e 100644 --- a/src/video/vid_ati18800.c +++ b/src/video/vid_ati18800.c @@ -8,7 +8,7 @@ * * ATI 18800 emulation (VGA Edge-16) * - * Version: @(#)vid_ati18800.c 1.0.1 2018/02/14 + * Version: @(#)vid_ati18800.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -53,9 +53,9 @@ #include "vid_svga.h" -#define BIOS_ROM_PATH_WONDER L"roms/video/ati18800/VGA_Wonder_V3-1.02.bin" -#define BIOS_ROM_PATH_VGA88 L"roms/video/ati18800/vga88.bin" -#define BIOS_ROM_PATH_EDGE16 L"roms/video/ati18800/vgaedge16.vbi" +#define BIOS_ROM_PATH_WONDER L"roms/video/ati/ati18800/vga_wonder_v3-1.02.bin" +#define BIOS_ROM_PATH_VGA88 L"roms/video/ati/ati18800/vga88.bin" +#define BIOS_ROM_PATH_EDGE16 L"roms/video/ati/ati18800/vgaedge16.vbi" enum { ATI18800_WONDER = 0, diff --git a/src/video/vid_ati28800.c b/src/video/vid_ati28800.c index 15f2fa2..1a20f26 100644 --- a/src/video/vid_ati28800.c +++ b/src/video/vid_ati28800.c @@ -8,7 +8,7 @@ * * ATI 28800 emulation (VGA Charger) * - * Version: @(#)vid_ati28800.c 1.0.1 2018/02/14 + * Version: @(#)vid_ati28800.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -56,15 +56,15 @@ #include "vid_svga_render.h" -#define BIOS_VGAXL_EVEN_PATH L"roms/video/ati28800/xleven.bin" -#define BIOS_VGAXL_ODD_PATH L"roms/video/ati28800/xlodd.bin" +#define BIOS_VGAXL_EVEN_PATH L"roms/video/ati/ati28800/xleven.bin" +#define BIOS_VGAXL_ODD_PATH L"roms/video/ati/ati28800/xlodd.bin" #if defined(DEV_BRANCH) && defined(USE_XL24) -#define BIOS_XL24_EVEN_PATH L"roms/video/ati28800/112-14318-102.bin" -#define BIOS_XL24_ODD_PATH L"roms/video/ati28800/112-14319-102.bin" +#define BIOS_XL24_EVEN_PATH L"roms/video/ati/ati28800/112-14318-102.bin" +#define BIOS_XL24_ODD_PATH L"roms/video/ati/ati28800/112-14319-102.bin" #endif -#define BIOS_ROM_PATH L"roms/video/ati28800/bios.bin" +#define BIOS_ROM_PATH L"roms/video/ati/ati28800/bios.bin" typedef struct ati28800_t diff --git a/src/video/vid_ati_mach64.c b/src/video/vid_ati_mach64.c index 140ef9e..584677a 100644 --- a/src/video/vid_ati_mach64.c +++ b/src/video/vid_ati_mach64.c @@ -8,7 +8,7 @@ * * ATi Mach64 graphics card emulation. * - * Version: @(#)vid_ati_mach64.c 1.0.1 2018/02/14 + * Version: @(#)vid_ati_mach64.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -60,10 +60,10 @@ #undef CLAMP #endif -#define BIOS_ROM_PATH L"roms/video/mach64/bios.bin" -#define BIOS_ISA_ROM_PATH L"roms/video/mach64/M64-1994.VBI" -#define BIOS_VLB_ROM_PATH L"roms/video/mach64/mach64_vlb_vram.bin" -#define BIOS_ROMVT2_PATH L"roms/video/mach64/atimach64vt2pci.bin" +#define BIOS_ROM_PATH L"roms/video/ati/mach64/bios.bin" +#define BIOS_ISA_ROM_PATH L"roms/video/ati/mach64/m64-1994.vbi" +#define BIOS_VLB_ROM_PATH L"roms/video/ati/mach64/mach64_vlb_vram.bin" +#define BIOS_ROMVT2_PATH L"roms/video/ati/mach64/atimach64vt2pci.bin" #define FIFO_SIZE 65536 diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c index 51d258d..b015379 100644 --- a/src/video/vid_cl54xx.c +++ b/src/video/vid_cl54xx.c @@ -9,7 +9,7 @@ * Emulation of select Cirrus Logic cards (currently only the * GD5428 is fully supported.) * - * Version: @(#)vid_cl54xx.c 1.0.1 2018/02/14 + * Version: @(#)vid_cl54xx.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -58,8 +58,8 @@ #include "vid_cl54xx.h" -#define BIOS_GD5428_PATH L"roms/video/cirruslogic/Diamond SpeedStar PRO VLB (Cirrus Logic 5428)_v3.04.bin" -#define BIOS_GD5429_PATH L"roms/video/cirruslogic/5429.vbi" +#define BIOS_GD5428_PATH L"roms/video/cirruslogic/diamond speedstar pro vlb (cirrus logic 5428)_v3.04.bin" +#define BIOS_GD5429_PATH L"roms/video/cirruslogic/5429.vbi" #define CIRRUS_ID_CLGD5428 0x98 #define CIRRUS_ID_CLGD5429 0x9c diff --git a/src/video/vid_ega.c b/src/video/vid_ega.c index fa70d66..26ffb0d 100644 --- a/src/video/vid_ega.c +++ b/src/video/vid_ega.c @@ -9,7 +9,7 @@ * Emulation of the EGA, Chips & Technologies SuperEGA, and * AX JEGA graphics cards. * - * Version: @(#)vid_ega.c 1.0.1 2018/02/14 + * Version: @(#)vid_ega.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -55,9 +55,9 @@ #include "vid_ega_render.h" -#define BIOS_IBM_PATH L"roms/video/ega/ibm_6277356_ega_card_u44_27128.bin" -#define BIOS_CPQ_PATH L"roms/video/ega/108281-001.bin" -#define BIOS_SEGA_PATH L"roms/video/ega/lega.vbi" +#define BIOS_IBM_PATH L"roms/video/ibm/ega/ibm_6277356_ega_card_u44_27128.bin" +#define BIOS_CPQ_PATH L"roms/video/compaq/ega/108281-001.bin" +#define BIOS_SEGA_PATH L"roms/video/phoenix/ega/lega.vbi" enum { @@ -1157,8 +1157,8 @@ void *jega_standalone_init(device_t *info) { ega_t *ega = (ega_t *)ega_standalone_init(info); - LoadFontxFile(L"roms/video/ega/JPNHN19X.FNT"); - LoadFontxFile(L"roms/video/ega/JPNZN16X.FNT"); + LoadFontxFile(L"roms/video/ibm/ega/JPNHN19X.FNT"); + LoadFontxFile(L"roms/video/ibm/ega/JPNZN16X.FNT"); ega->is_jega = 1; diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c index a13827e..cb457f7 100644 --- a/src/video/vid_et4000.c +++ b/src/video/vid_et4000.c @@ -8,7 +8,7 @@ * * Emulation of the Tseng Labs ET4000. * - * Version: @(#)vid_et4000.c 1.0.1 2018/02/14 + * Version: @(#)vid_et4000.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -52,7 +52,7 @@ #include "vid_et4000.h" -#define BIOS_ROM_PATH L"roms/video/et4000/et4000.bin" +#define BIOS_ROM_PATH L"roms/video/tseng/et4000/et4000.bin" typedef struct et4000_t diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c index 5dd389b..57dac7d 100644 --- a/src/video/vid_et4000w32.c +++ b/src/video/vid_et4000w32.c @@ -10,7 +10,7 @@ * * Known bugs: Accelerator doesn't work in planar modes * - * Version: @(#)vid_et4000w32.c 1.0.1 2018/02/14 + * Version: @(#)vid_et4000w32.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -60,9 +60,9 @@ #if defined(DEV_BRANCH) && defined(USE_STEALTH32) -#define BIOS_ROM_PATH_DIAMOND L"roms/video/et4000w32/et4000w32.bin" +# define BIOS_ROM_PATH_DIAMOND L"roms/video/tseng/et4000w32/et4000w32.bin" #endif -#define BIOS_ROM_PATH_CARDEX L"roms/video/et4000w32/cardex.vbi" +#define BIOS_ROM_PATH_CARDEX L"roms/video/tseng/et4000w32/cardex.vbi" #define FIFO_SIZE 65536 diff --git a/src/video/vid_genius.c b/src/video/vid_genius.c index 14e0357..1c1f257 100644 --- a/src/video/vid_genius.c +++ b/src/video/vid_genius.c @@ -63,7 +63,7 @@ * reducing the height of characters so they fit in an 8x12 cell * if necessary. * - * Version: @(#)vid_genius.c 1.0.1 2018/02/14 + * Version: @(#)vid_genius.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -108,7 +108,7 @@ #include "vid_genius.h" -#define BIOS_ROM_PATH L"roms/video/genius/8x12.bin" +#define BIOS_ROM_PATH L"roms/video/mdsi/genius/8x12.bin" #define GENIUS_XSIZE 728 diff --git a/src/video/vid_oti067.c b/src/video/vid_oti067.c index 0e7bdd5..83c9056 100644 --- a/src/video/vid_oti067.c +++ b/src/video/vid_oti067.c @@ -8,7 +8,7 @@ * * Oak OTI067/077 emulation. * - * Version: @(#)vid_oti067.c 1.0.1 2018/02/14 + * Version: @(#)vid_oti067.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/video/vid_paradise.c b/src/video/vid_paradise.c index d136112..da48c65 100644 --- a/src/video/vid_paradise.c +++ b/src/video/vid_paradise.c @@ -10,7 +10,10 @@ * PC2086, PC3086 use PVGA1A * MegaPC uses W90C11A * - * Version: @(#)vid_paradise.c 1.0.1 2018/02/14 + * NOTE: The MegaPC video device should be moved to the MegaPC + * machine file. + * + * Version: @(#)vid_paradise.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -432,14 +435,14 @@ static void *paradise_pvga1a_standalone_init(device_t *info) paradise = paradise_pvga1a_init(info, memory); if (paradise) - rom_init(¶dise->bios_rom, L"roms/video/pvga1a/BIOS.BIN", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(¶dise->bios_rom, L"roms/video/paradise/pvga1a/bios.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; } static int paradise_pvga1a_standalone_available(void) { - return rom_present(L"roms/video/pvga1a/BIOS.BIN"); + return rom_present(L"roms/video/paradise/pvga1a/bios.bin"); } static void *paradise_wd90c11_megapc_init(device_t *info) @@ -448,8 +451,8 @@ static void *paradise_wd90c11_megapc_init(device_t *info) if (paradise) rom_init_interleaved(¶dise->bios_rom, - L"roms/machines/megapc/41651-bios lo.u18", - L"roms/machines/megapc/211253-bios hi.u19", + L"roms/machines/amstrad/megapc/41651-bios lo.u18", + L"roms/machines/amstrad/megapc/211253-bios hi.u19", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; @@ -460,14 +463,14 @@ static void *paradise_wd90c11_standalone_init(device_t *info) paradise_t *paradise = paradise_wd90c11_init(info); if (paradise) - rom_init(¶dise->bios_rom, L"roms/video/wd90c11/WD90C11.VBI", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(¶dise->bios_rom, L"roms/video/wd/wd90c11/wd90c11.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; } static int paradise_wd90c11_standalone_available(void) { - return rom_present(L"roms/video/wd90c11/WD90C11.VBI"); + return rom_present(L"roms/video/wd/wd90c11/wd90c11.vbi"); } static void *paradise_wd90c30_standalone_init(device_t *info) @@ -481,14 +484,14 @@ static void *paradise_wd90c30_standalone_init(device_t *info) paradise = paradise_wd90c30_init(info, memory); if (paradise) - rom_init(¶dise->bios_rom, L"roms/video/wd90c30/90C30-LR.VBI", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(¶dise->bios_rom, L"roms/video/wd/wd90c30/90c30-lr.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); return paradise; } static int paradise_wd90c30_standalone_available(void) { - return rom_present(L"roms/video/wd90c30/90C30-LR.VBI"); + return rom_present(L"roms/video/wd/wd90c30/90c30-lr.vbi"); } void paradise_close(void *p) diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index 3d31a82..1a270fa 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -8,7 +8,9 @@ * * S3 emulation. * - * Version: @(#)vid_s3.c 1.0.1 2018/02/14 + * NOTE: ROM images need more/better organization per chipset. + * + * Version: @(#)vid_s3.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -2296,29 +2298,29 @@ void *s3_vision864_init(device_t *info, wchar_t *bios_fn) static void *s3_bahamas64_init(device_t *info) { - s3_t *s3 = s3_vision864_init(info, L"roms/video/s3/bahamas64.bin"); + s3_t *s3 = s3_vision864_init(info, L"roms/video/s3/s3/bahamas64.bin"); return s3; } static void *s3_phoenix_vision864_init(device_t *info) { - s3_t *s3 = s3_vision864_init(info, L"roms/video/s3/86c864p.bin"); + s3_t *s3 = s3_vision864_init(info, L"roms/video/s3/s3/86c864p.bin"); return s3; } static int s3_bahamas64_available(void) { - return rom_present(L"roms/video/s3/bahamas64.bin"); + return rom_present(L"roms/video/s3/s3/bahamas64.bin"); } static int s3_phoenix_vision864_available(void) { - return rom_present(L"roms/video/s3/86c864p.bin"); + return rom_present(L"roms/video/s3/s3/86c864p.bin"); } static void *s3_phoenix_trio32_init(device_t *info) { - s3_t *s3 = s3_init(info, L"roms/video/s3/86c732p.bin", S3_TRIO32); + s3_t *s3 = s3_init(info, L"roms/video/s3/s3/86c732p.bin", S3_TRIO32); s3->id = 0xe1; /*Trio32*/ s3->id_ext = 0x10; @@ -2333,7 +2335,7 @@ static void *s3_phoenix_trio32_init(device_t *info) static int s3_phoenix_trio32_available(void) { - return rom_present(L"roms/video/s3/86c732p.bin"); + return rom_present(L"roms/video/s3/s3/86c732p.bin"); } static void *s3_trio64_init(device_t *info, wchar_t *bios_fn) @@ -2352,13 +2354,13 @@ static void *s3_trio64_init(device_t *info, wchar_t *bios_fn) static void *s3_9fx_init(device_t *info) { - s3_t *s3 = s3_trio64_init(info, L"roms/video/s3/s3_764.bin"); + s3_t *s3 = s3_trio64_init(info, L"roms/video/s3/s3/s3_764.bin"); return s3; } static void *s3_phoenix_trio64_init(device_t *info) { - s3_t *s3 = s3_trio64_init(info, L"roms/video/s3/86c764x1.bin"); + s3_t *s3 = s3_trio64_init(info, L"roms/video/s3/s3/86c764x1.bin"); if (device_get_config_int("memory") == 1) s3->svga.vram_max = 1 << 20; /*Phoenix BIOS does not expect VRAM to be mirrored*/ return s3; @@ -2374,7 +2376,7 @@ static void *s3_phoenix_trio64_onboard_init(device_t *info) static void *s3_diamond_stealth64_init(device_t *info) { - s3_t *s3 = s3_trio64_init(info, L"roms/video/s3/stealt64.bin"); + s3_t *s3 = s3_trio64_init(info, L"roms/video/s3/s3/stealt64.bin"); if (device_get_config_int("memory") == 1) s3->svga.vram_max = 1 << 20; /*Phoenix BIOS does not expect VRAM to be mirrored*/ return s3; @@ -2382,17 +2384,17 @@ static void *s3_diamond_stealth64_init(device_t *info) static int s3_9fx_available(void) { - return rom_present(L"roms/video/s3/s3_764.bin"); + return rom_present(L"roms/video/s3/s3/s3_764.bin"); } static int s3_phoenix_trio64_available(void) { - return rom_present(L"roms/video/s3/86c764x1.bin"); + return rom_present(L"roms/video/s3/s3/86c764x1.bin"); } static int s3_diamond_stealth64_available(void) { - return rom_present(L"roms/video/s3/stealt64.bin"); + return rom_present(L"roms/video/s3/s3/stealt64.bin"); } static void s3_close(void *p) diff --git a/src/video/vid_s3_virge.c b/src/video/vid_s3_virge.c index e399ac4..1ca09b2 100644 --- a/src/video/vid_s3_virge.c +++ b/src/video/vid_s3_virge.c @@ -8,7 +8,7 @@ * * S3 ViRGE emulation. * - * Version: @(#)vid_s3_virge.c 1.0.1 2018/02/14 + * Version: @(#)vid_s3_virge.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -3811,7 +3811,7 @@ static void *s3_virge_init(device_t *info) virge->pci = !!(info->flags & DEVICE_PCI); - rom_init(&virge->bios_rom, L"roms/video/s3virge/s3virge.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&virge->bios_rom, L"roms/video/s3/s3virge/s3virge.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (info->flags & DEVICE_PCI) mem_mapping_disable(&virge->bios_rom.mapping); @@ -3910,7 +3910,7 @@ static void *s3_virge_988_init(device_t *info) virge->pci = !!(info->flags & DEVICE_PCI); - rom_init(&virge->bios_rom, L"roms/video/s3virge/diamondstealth3000.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&virge->bios_rom, L"roms/video/s3/s3virge/diamondstealth3000.vbi", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); if (info->flags & DEVICE_PCI) mem_mapping_disable(&virge->bios_rom.mapping); @@ -4094,12 +4094,12 @@ static void *s3_virge_375_init(device_t *info, wchar_t *romfn) static void *s3_virge_375_1_init(device_t *info) { - return s3_virge_375_init(info, L"roms/video/s3virge/86c375_1.bin"); + return s3_virge_375_init(info, L"roms/video/s3/s3virge/86c375_1.bin"); } static void *s3_virge_375_4_init(device_t *info) { - return s3_virge_375_init(info, L"roms/video/s3virge/86c375_4.bin"); + return s3_virge_375_init(info, L"roms/video/s3/s3virge/86c375_4.bin"); } static void s3_virge_close(void *p) @@ -4127,22 +4127,22 @@ static void s3_virge_close(void *p) static int s3_virge_available(void) { - return rom_present(L"roms/video/s3virge/s3virge.bin"); + return rom_present(L"roms/video/s3/s3virge/s3virge.bin"); } static int s3_virge_988_available(void) { - return rom_present(L"roms/video/s3virge/diamondstealth3000.vbi"); + return rom_present(L"roms/video/s3/s3virge/diamondstealth3000.vbi"); } static int s3_virge_375_1_available(void) { - return rom_present(L"roms/video/s3virge/86c375_1.bin"); + return rom_present(L"roms/video/s3/s3virge/86c375_1.bin"); } static int s3_virge_375_4_available(void) { - return rom_present(L"roms/video/s3virge/86c375_4.bin"); + return rom_present(L"roms/video/s3/s3virge/86c375_4.bin"); } static void s3_virge_speed_changed(void *p) diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 54a66b0..842088b 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -8,7 +8,7 @@ * * Define all known video cards. * - * Version: @(#)vid_table.c 1.0.2 2018/02/22 + * Version: @(#)vid_table.c 1.0.3 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -182,6 +182,11 @@ video_reset(int card) (card == GFX_INTERNAL) || machines[machine].fixed_gfxcard) return; pclog("VIDEO: initializing '%s'\n", video_cards[video_old_to_new(card)].name); + /* Initialize the video font tables. */ + loadfont(L"roms/video/ibm/mda/mda.rom", 0); + loadfont(L"roms/video/wyse/wyse700/wy700.rom", 3); + loadfont(L"roms/video/mdsi/genius/8x12.bin", 4); + /* Initialize the video card. */ device_add(video_cards[video_old_to_new(card)].device); diff --git a/src/video/vid_tgui9440.c b/src/video/vid_tgui9440.c index d975bf7..df84564 100644 --- a/src/video/vid_tgui9440.c +++ b/src/video/vid_tgui9440.c @@ -47,7 +47,7 @@ * access size or host data has any affect, but the Windows 3.1 * driver always reads bytes and write words of 0xffff. * - * Version: @(#)vid_tgui9440.c 1.0.1 2018/02/14 + * Version: @(#)vid_tgui9440.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -832,22 +832,22 @@ static void *tgui_init(device_t *info, wchar_t *bios_fn, int type) static void *tgui9400cxi_init(device_t *info) { - return tgui_init(info, L"roms/video/tgui9440/9400CXI.vbi", TGUI_9400CXI); + return tgui_init(info, L"roms/video/trident/tgui9440/9400cxi.vbi", TGUI_9400CXI); } static void *tgui9440_init(device_t *info) { - return tgui_init(info, L"roms/video/tgui9440/9440.vbi", TGUI_9440); + return tgui_init(info, L"roms/video/trident/tgui9440/9440.vbi", TGUI_9440); } static int tgui9400cxi_available() { - return rom_present(L"roms/video/tgui9440/9400CXI.vbi"); + return rom_present(L"roms/video/trident/tgui9440/9400cxi.vbi"); } static int tgui9440_available() { - return rom_present(L"roms/video/tgui9440/9440.vbi"); + return rom_present(L"roms/video/trident/tgui9440/9440.vbi"); } void tgui_close(void *p) diff --git a/src/video/vid_tvga.c b/src/video/vid_tvga.c index 8fb593b..0bda89a 100644 --- a/src/video/vid_tvga.c +++ b/src/video/vid_tvga.c @@ -8,7 +8,7 @@ * * Trident TVGA (8900D) emulation. * - * Version: @(#)vid_tvga.c 1.0.1 2018/02/14 + * Version: @(#)vid_tvga.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -325,7 +325,7 @@ static void *tvga8900d_init(device_t *info) tvga->vram_size = device_get_config_int("memory") << 10; tvga->vram_mask = tvga->vram_size - 1; - rom_init(&tvga->bios_rom, L"roms/video/tvga/trident.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); + rom_init(&tvga->bios_rom, L"roms/video/trident/tvga/trident.bin", 0xc0000, 0x8000, 0x7fff, 0, MEM_MAPPING_EXTERNAL); svga_init(&tvga->svga, tvga, tvga->vram_size, tvga_recalctimings, @@ -340,7 +340,7 @@ static void *tvga8900d_init(device_t *info) static int tvga8900d_available(void) { - return rom_present(L"roms/video/tvga/trident.bin"); + return rom_present(L"roms/video/trident/tvga/trident.bin"); } void tvga_close(void *p) diff --git a/src/video/vid_vga.c b/src/video/vid_vga.c index 66fb213..8013a8f 100644 --- a/src/video/vid_vga.c +++ b/src/video/vid_vga.c @@ -8,7 +8,7 @@ * * IBM VGA emulation. * - * Version: @(#)vid_vga.c 1.0.1 2018/02/14 + * Version: @(#)vid_vga.c 1.0.2 2018/02/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -122,7 +122,7 @@ static void *vga_init(device_t *info) vga_t *vga = malloc(sizeof(vga_t)); memset(vga, 0, sizeof(vga_t)); - rom_init(&vga->bios_rom, L"roms/video/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL); + rom_init(&vga->bios_rom, L"roms/video/ibm/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL); svga_init(&vga->svga, vga, 1 << 18, /*256kb*/ NULL, @@ -145,7 +145,7 @@ static void *trigem_unk_init(device_t *info) vga_t *vga = malloc(sizeof(vga_t)); memset(vga, 0, sizeof(vga_t)); - rom_init(&vga->bios_rom, L"roms/video/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL); + rom_init(&vga->bios_rom, L"roms/video/ibm/vga/ibm_vga.bin", 0xc0000, 0x8000, 0x7fff, 0x2000, MEM_MAPPING_EXTERNAL); svga_init(&vga->svga, vga, 1 << 18, /*256kb*/ NULL, @@ -188,7 +188,7 @@ void *ps1vga_init(device_t *info) static int vga_available(void) { - return rom_present(L"roms/video/vga/ibm_vga.bin"); + return rom_present(L"roms/video/ibm/vga/ibm_vga.bin"); } void vga_close(void *p)