From 50dfd8b7a5347593bf349616d0ba1cfeea77e8ad Mon Sep 17 00:00:00 2001
From: TomW <TomW@localhost>
Date: Sat, 23 Jan 2016 15:21:33 +0000
Subject: [PATCH] Moved mem_add_bios() call to model code. Fixes Intel Flash.

---
 src/model.c | 11 ++++++++++-
 src/pc.c    |  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/model.c b/src/model.c
index 2089946..adc3b70 100644
--- a/src/model.c
+++ b/src/model.c
@@ -160,6 +160,7 @@ void common_init()
 void xt_init()
 {
         common_init();
+        mem_add_bios();
         pit_set_out_func(1, pit_refresh_timer_xt);
         keyboard_xt_init();
         mouse_serial_init();
@@ -169,6 +170,7 @@ void xt_init()
 
 void pcjr_init()
 {
+        mem_add_bios();
         fdc_add_pcjr();
         pic_init();
         pit_init();
@@ -183,6 +185,7 @@ void tandy1k_init()
 {
         TANDY = 1;
         common_init();
+        mem_add_bios();
         keyboard_tandy_init();
         mouse_serial_init();
         if (romset == ROM_TANDY)
@@ -198,6 +201,7 @@ void tandy1ksl2_init()
 {
 //        TANDY = 1;
         common_init();
+        mem_add_bios();
         keyboard_tandy_init();
         mouse_serial_init();
         device_add(&pssj_device);
@@ -211,6 +215,7 @@ void ams_init()
 {
         AMSTRAD = 1;
         common_init();
+        mem_add_bios();
         amstrad_init();
         keyboard_amstrad_init();
         nvr_init();
@@ -222,6 +227,7 @@ void ams_init()
 void europc_init()
 {
         common_init();
+        mem_add_bios();
         jim_init();
         keyboard_xt_init();
         mouse_serial_init();
@@ -232,6 +238,7 @@ void europc_init()
 void olim24_init()
 {
         common_init();
+        mem_add_bios();
         keyboard_olim24_init();
         nvr_init();
         olivetti_m24_init();
@@ -241,7 +248,9 @@ void olim24_init()
 
 void at_init()
 {
+        AT = 1;
         common_init();
+        mem_add_bios();
         pit_set_out_func(1, pit_refresh_timer_at);
         dma16_init();
         ide_init();
@@ -250,7 +259,6 @@ void at_init()
            mouse_serial_init();
         nvr_init();
         pic2_init();
-        AT = 1;
 }
 
 void deskpro386_init()
@@ -264,6 +272,7 @@ void ps1_init()
 {
         AT = 1;
         common_init();
+        mem_add_bios();
         pit_set_out_func(1, pit_refresh_timer_at);
         dma16_init();
         ide_init();
diff --git a/src/pc.c b/src/pc.c
index cf36b41..e07ddd1 100644
--- a/src/pc.c
+++ b/src/pc.c
@@ -342,7 +342,6 @@ void resetpchard()
 	disc_reset();
         
         model_init();
-        mem_add_bios();
         video_init();
         speaker_init();        
         sound_card_init(sound_card_current);