Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk

Browse source
This commit is contained in:
SarahW 2019-04-18 20:46:38 +01:00
commit 50e7de5214
282 changed files with 51494 additions and 22451 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/model.c
View file

@ -38,6 +38,7 @@
#include "lpt.h"
#include "mem.h"
#include "mouse_ps2.h"
#include "mvp3.h"
#include "neat.h"
#include "nmi.h"
#include "nvr.h"
@ -59,12 +60,15 @@
#include "sound_ps1.h"
#include "sound_pssj.h"
#include "sound_sn76489.h"
#include "sst39sf010.h"
#include "tandy_eeprom.h"
#include "tandy_rom.h"
#include "um8669f.h"
#include "vid_pcjr.h"
#include "vid_tandy.h"
#include "vid_t1000.h"
#include "vt82c586b.h"
#include "w83877tf.h"
#include "wd76c10.h"
#include "xi8088.h"
#include "zenith.h"
@ -116,6 +120,7 @@ void at_pb570_init();
void compaq_pip_init();
void xt_xi8088_init();
void xt_zenith_init();
void at_mvp3_init();
int model;
int AMSTRAD, AT, PCI, TANDY;
@ -208,6 +213,8 @@ MODEL models[] =
{"[Socket 7] Award 430VX PCI", ROM_430VX, "430vx", { {"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE|MODEL_AT|MODEL_PCI|MODEL_PS2|MODEL_HAS_IDE, 1, 256, 1, at_i430vx_init, NULL},
{"[Socket 7] Epox P55-VA", ROM_P55VA, "p55va", { {"Intel", cpus_Pentium}, {"IDT", cpus_WinChip}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE|MODEL_AT|MODEL_PCI|MODEL_PS2|MODEL_HAS_IDE, 1, 256, 1, at_p55va_init, NULL},
{"[Super 7] FIC VA-503+", ROM_FIC_VA503P, "fic_va503p", { {"Intel", cpus_Pentium}, {"AMD", cpus_K6_SS7}, {"IDT", cpus_WinChip_SS7}, {"Cyrix", cpus_6x86}}, MODEL_GFX_NONE|MODEL_AT|MODEL_PCI|MODEL_PS2|MODEL_HAS_IDE, 1, 512, 1, at_mvp3_init, NULL},
{"", -1, "", {{"", 0}, {"", 0}, {"", 0}}, 0,0,0, 0}
};
@ -752,11 +759,24 @@ void at_p55t2p4_init()
device_add(&intel_flash_bxt_device);
}
void at_mvp3_init()
{
at_init();
pci_init(PCI_CONFIG_TYPE_1);
pci_slot(8);
pci_slot(9);
pci_slot(10);
mvp3_init();
vt82c586b_init(7, 8, 9, 10, 0);
w83877tf_init();
device_add(&sst_39sf010_device);
}
void model_init()
{
pclog("Initting as %s\n", model_getname());
AMSTRAD = AT = PCI = TANDY = 0;
ide_set_bus_master(NULL, NULL, NULL);
ide_set_bus_master(NULL, NULL, NULL, NULL);
models[model].init();
if (models[model].device)