diff --git a/src/intel_flash.c b/src/intel_flash.c index d27835870..19d7a7864 100644 --- a/src/intel_flash.c +++ b/src/intel_flash.c @@ -176,9 +176,11 @@ void *intel_flash_init(uint8_t type) case ROM_MB500N: strcpy(flash_path, "roms/mb500n/"); break; +#if 0 case ROM_POWERMATE_V: strcpy(flash_path, "roms/powermate_v/"); break; +#endif case ROM_P54TP4XE: strcpy(flash_path, "roms/p54tp4xe/"); break; @@ -203,9 +205,11 @@ void *intel_flash_init(uint8_t type) case ROM_440FX: strcpy(flash_path, "roms/440fx/"); break; +#if 0 case ROM_MARL: strcpy(flash_path, "roms/marl/"); break; +#endif case ROM_THOR: strcpy(flash_path, "roms/thor/"); break; diff --git a/src/mem.c b/src/mem.c index b9f3d6eec..460a4b204 100644 --- a/src/mem.c +++ b/src/mem.c @@ -677,6 +677,7 @@ int loadbios() biosmask = 0x1ffff; return 1; +#if 0 case ROM_POWERMATE_V: f = romfopen("roms/powermate_v/BIOS.ROM", "rb"); /* Works */ if (!f) break; @@ -684,6 +685,7 @@ int loadbios() fclose(f); biosmask = 0x1ffff; return 1; +#endif case ROM_P54TP4XE: f = romfopen("roms/p54tp4xe/T15I0302.AWD", "rb"); @@ -741,6 +743,7 @@ int loadbios() biosmask = 0x1ffff; return 1; +#if 0 case ROM_MARL: f = romfopen("roms/marl/1008DB0_.BIO", "rb"); if (!f) break; @@ -755,6 +758,7 @@ int loadbios() biosmask = 0x1ffff; //is486=1; return 1; +#endif case ROM_THOR: f = romfopen("roms/thor/1006CN0_.BIO", "rb"); diff --git a/src/memregs.c b/src/memregs.c index de269223d..ec832225a 100644 --- a/src/memregs.c +++ b/src/memregs.c @@ -11,7 +11,7 @@ #include "io.h" #include "memregs.h" -static uint8_t mem_regs[2] = {0xFF, 0xFF}; +static uint8_t mem_regs[16] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; static uint8_t mem_reg_ffff = 0; @@ -22,7 +22,7 @@ void memregs_write(uint16_t port, uint8_t val, void *priv) mem_reg_ffff = 0; } - mem_regs[(port & 1) ^ 1] = val; + mem_regs[port & 0xf] = val; } uint8_t memregs_read(uint16_t port, void *priv) @@ -32,7 +32,7 @@ uint8_t memregs_read(uint16_t port, void *priv) return mem_reg_ffff; } - return mem_regs[(port & 1) ^ 1]; + return mem_regs[port & 0xf]; } void memregs_init() diff --git a/src/model.c b/src/model.c index 2a33af2a5..c50523b3d 100644 --- a/src/model.c +++ b/src/model.c @@ -101,13 +101,13 @@ void at_r418_init(); void at_586mc1_init(); void at_plato_init(); void at_mb500n_init(); -void at_powermate_v_init(); +// void at_powermate_v_init(); void at_p54tp4xe_init(); void at_acerm3a_init(); void at_acerv35n_init(); void at_p55t2p4_init(); void at_p55tvp4_init(); -void at_marl_init(); +// void at_marl_init(); void at_p55va_init(); void at_i440fx_init(); @@ -166,7 +166,7 @@ MODEL models[] = {"Intel Premiere/PCI II",ROM_PLATO, { "Intel", cpus_PentiumS5,"IDT", cpus_WinChip, "AMD", cpus_K5, "", NULL}, 0, MODEL_AT|MODEL_PS2, 1, 128, 1, at_plato_init, NULL}, {"Intel Advanced/EV", ROM_ENDEAVOR, { "Intel", cpus_PentiumS5,"IDT", cpus_WinChip, "AMD", cpus_K5, "", NULL}, 0, MODEL_AT|MODEL_PS2, 1, 128, 1, at_endeavor_init, NULL}, {"PC Partner MB500N", ROM_MB500N, { "Intel", cpus_PentiumS5,"IDT", cpus_WinChip, "AMD", cpus_K5, "", NULL}, 0, MODEL_AT|MODEL_PS2, 1, 128, 1, at_mb500n_init, NULL}, - {"NEC PowerMate V", ROM_POWERMATE_V, { "Intel", cpus_PentiumS5,"IDT", cpus_WinChip, "AMD", cpus_K5, "", NULL}, 0, MODEL_AT|MODEL_PS2, 1, 128, 1, at_powermate_v_init, NULL}, +/* {"NEC PowerMate V", ROM_POWERMATE_V, { "Intel", cpus_PentiumS5,"IDT", cpus_WinChip, "AMD", cpus_K5, "", NULL}, 0, MODEL_AT|MODEL_PS2, 1, 128, 1, at_powermate_v_init, NULL}, */ {"Intel Advanced/ATX", ROM_THOR, { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT|MODEL_PS2, 1, 256, 1, at_endeavor_init, NULL}, {"MR Intel Advanced/ATX", ROM_MRTHOR, { "Intel", cpus_Pentium, "IDT", cpus_WinChip, "Cyrix", cpus_6x86, "AMD", cpus_K56, "", NULL}, 0, MODEL_AT|MODEL_PS2, 1, 256, 1, at_endeavor_init, NULL}, {"ASUS P/I-P54TP4XE", ROM_P54TP4XE, { "Intel", cpus_PentiumS5, "IDT", cpus_WinChip, "AMD", cpus_K5, "", NULL}, 0, MODEL_AT|MODEL_PS2, 1, 512, 1, at_p54tp4xe_init, NULL}, @@ -527,7 +527,7 @@ void at_mb500n_init() device_add(&intel_flash_bxt_device); } -void at_powermate_v_init() +/* void at_powermate_v_init() { at_init(); powermate_memregs_init(); @@ -537,7 +537,7 @@ void at_powermate_v_init() fdc37c665_init(); acerm3a_io_init(); device_add(&intel_flash_bxt_device); -} +} */ void at_p54tp4xe_init() { @@ -554,6 +554,7 @@ void at_acerm3a_init() { at_init(); memregs_init(); + powermate_memregs_init(); pci_init(PCI_CONFIG_TYPE_1, 0xd, 0x10); i430hx_init(); piix3_init(7); @@ -566,6 +567,7 @@ void at_acerv35n_init() { at_init(); memregs_init(); + powermate_memregs_init(); pci_init(PCI_CONFIG_TYPE_1, 0xd, 0x10); i430hx_init(); piix3_init(7); diff --git a/src/nvr.c b/src/nvr.c index 186e61f08..450d6faa2 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -233,7 +233,9 @@ void loadnvr() case ROM_586MC1: f = romfopen(nvr_concat("586mc1.nvr"), "rb"); nvrmask = 127; break; case ROM_PLATO: f = romfopen(nvr_concat("plato.nvr"), "rb"); nvrmask = 127; break; case ROM_MB500N: f = romfopen(nvr_concat("mb500n.nvr"), "rb"); nvrmask = 127; break; +#if 0 case ROM_POWERMATE_V: f = romfopen(nvr_concat("powermate_v.nvr"), "rb"); nvrmask = 127; break; +#endif case ROM_P54TP4XE: f = romfopen(nvr_concat("p54tp4xe.nvr"), "rb"); nvrmask = 127; break; case ROM_ACERM3A: f = romfopen(nvr_concat("acerm3a.nvr"), "rb"); nvrmask = 127; break; case ROM_ACERV35N: f = romfopen(nvr_concat("acerv35n.nvr"), "rb"); nvrmask = 127; break; @@ -241,7 +243,9 @@ void loadnvr() case ROM_P55T2P4: f = romfopen(nvr_concat("p55t2p4.nvr"), "rb"); nvrmask = 127; break; case ROM_P55TVP4: f = romfopen(nvr_concat("p55tvp4.nvr"), "rb"); nvrmask = 127; break; case ROM_440FX: f = romfopen(nvr_concat("440fx.nvr"), "rb"); nvrmask = 127; break; +#if 0 case ROM_MARL: f = romfopen(nvr_concat("marl.nvr"), "rb"); nvrmask = 127; break; +#endif case ROM_THOR: f = romfopen(nvr_concat("thor.nvr"), "rb"); nvrmask = 127; break; case ROM_MRTHOR: f = romfopen(nvr_concat("mrthor.nvr"), "rb"); nvrmask = 127; break; default: return; @@ -308,7 +312,9 @@ void savenvr() case ROM_586MC1: f = romfopen(nvr_concat("586mc1.nvr"), "wb"); break; case ROM_PLATO: f = romfopen(nvr_concat("plato.nvr"), "wb"); break; case ROM_MB500N: f = romfopen(nvr_concat("mb500n.nvr"), "wb"); break; +#if 0 case ROM_POWERMATE_V: f = romfopen(nvr_concat("powermate_v.nvr"), "wb"); break; +#endif case ROM_P54TP4XE: f = romfopen(nvr_concat("p54tp4xe.nvr"), "wb"); break; case ROM_ACERM3A: f = romfopen(nvr_concat("acerm3a.nvr"), "wb"); break; case ROM_ACERV35N: f = romfopen(nvr_concat("acerv35n.nvr"), "wb"); break; @@ -316,7 +322,9 @@ void savenvr() case ROM_P55T2P4: f = romfopen(nvr_concat("p55t2p4.nvr"), "wb"); break; case ROM_P55TVP4: f = romfopen(nvr_concat("p55tvp4.nvr"), "wb"); break; case ROM_440FX: f = romfopen(nvr_concat("440fx.nvr"), "wb"); break; +#if 0 case ROM_MARL: f = romfopen(nvr_concat("marl.nvr"), "wb"); break; +#endif case ROM_THOR: f = romfopen(nvr_concat("thor.nvr"), "wb"); break; case ROM_MRTHOR: f = romfopen(nvr_concat("mrthor.nvr"), "wb"); break; default: return;