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

Moved mem_add_bios() call to model code. Fixes Intel Flash.

Browse source
This commit is contained in:
TomW 2016-01-23 15:21:33 +00:00
commit 50dfd8b7a5
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/model.c
View file

@ -160,6 +160,7 @@ void common_init()
void xt_init() void xt_init()
{ {
common_init(); common_init();
mem_add_bios();
pit_set_out_func(1, pit_refresh_timer_xt); pit_set_out_func(1, pit_refresh_timer_xt);
keyboard_xt_init(); keyboard_xt_init();
mouse_serial_init(); mouse_serial_init();
@ -169,6 +170,7 @@ void xt_init()
void pcjr_init() void pcjr_init()
{ {
mem_add_bios();
fdc_add_pcjr(); fdc_add_pcjr();
pic_init(); pic_init();
pit_init(); pit_init();
@ -183,6 +185,7 @@ void tandy1k_init()
{ {
TANDY = 1; TANDY = 1;
common_init(); common_init();
mem_add_bios();
keyboard_tandy_init(); keyboard_tandy_init();
mouse_serial_init(); mouse_serial_init();
if (romset == ROM_TANDY) if (romset == ROM_TANDY)
@ -198,6 +201,7 @@ void tandy1ksl2_init()
{ {
// TANDY = 1; // TANDY = 1;
common_init(); common_init();
mem_add_bios();
keyboard_tandy_init(); keyboard_tandy_init();
mouse_serial_init(); mouse_serial_init();
device_add(&pssj_device); device_add(&pssj_device);
@ -211,6 +215,7 @@ void ams_init()
{ {
AMSTRAD = 1; AMSTRAD = 1;
common_init(); common_init();
mem_add_bios();
amstrad_init(); amstrad_init();
keyboard_amstrad_init(); keyboard_amstrad_init();
nvr_init(); nvr_init();
@ -222,6 +227,7 @@ void ams_init()
void europc_init() void europc_init()
{ {
common_init(); common_init();
mem_add_bios();
jim_init(); jim_init();
keyboard_xt_init(); keyboard_xt_init();
mouse_serial_init(); mouse_serial_init();
@ -232,6 +238,7 @@ void europc_init()
void olim24_init() void olim24_init()
{ {
common_init(); common_init();
mem_add_bios();
keyboard_olim24_init(); keyboard_olim24_init();
nvr_init(); nvr_init();
olivetti_m24_init(); olivetti_m24_init();
@ -241,7 +248,9 @@ void olim24_init()
void at_init() void at_init()
{ {
AT = 1;
common_init(); common_init();
mem_add_bios();
pit_set_out_func(1, pit_refresh_timer_at); pit_set_out_func(1, pit_refresh_timer_at);
dma16_init(); dma16_init();
ide_init(); ide_init();
@ -250,7 +259,6 @@ void at_init()
mouse_serial_init(); mouse_serial_init();
nvr_init(); nvr_init();
pic2_init(); pic2_init();
AT = 1;
} }
void deskpro386_init() void deskpro386_init()
@ -264,6 +272,7 @@ void ps1_init()
{ {
AT = 1; AT = 1;
common_init(); common_init();
mem_add_bios();
pit_set_out_func(1, pit_refresh_timer_at); pit_set_out_func(1, pit_refresh_timer_at);
dma16_init(); dma16_init();
ide_init(); ide_init();

1
src/pc.c
View file

@ -342,7 +342,6 @@ void resetpchard()
disc_reset(); disc_reset();
model_init(); model_init();
mem_add_bios();
video_init(); video_init();
speaker_init(); speaker_init();
sound_card_init(sound_card_current); sound_card_init(sound_card_current);