Added the Catalyst 28F010 Flash chip needed by the ASUS P5MP3, fixed a memory leak in the Intel Flash close code (it was not free'ing dev->array), and unified all the flash chip header files into one single flash.h.

src/machine/m_at_386dx_486.c

@@ -38,8 +38,7 @@
 #include <86box/sio.h>
 #include <86box/hdc.h>
 #include <86box/video.h>
-#include <86box/intel_flash.h>
-#include <86box/sst_flash.h>
+#include <86box/flash.h>
 #include <86box/scsi_ncr53c8xx.h>
 #include <86box/machine.h>
 

src/machine/m_at_slot1.c

@@ -29,9 +29,8 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
-#include <86box/intel_flash.h>
+#include <86box/flash.h>
 #include <86box/sio.h>
-#include <86box/sst_flash.h>
 #include <86box/hwm.h>
 #include <86box/spd.h>
 #include <86box/video.h>

src/machine/m_at_slot2.c

@@ -30,8 +30,7 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
-#include <86box/intel_flash.h>
-#include <86box/sst_flash.h>
+#include <86box/flash.h>
 #include <86box/sio.h>
 #include <86box/hwm.h>
 #include <86box/spd.h>

src/machine/m_at_socket370.c

@@ -29,9 +29,8 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
-#include <86box/intel_flash.h>
+#include <86box/flash.h>
 #include <86box/sio.h>
-#include <86box/sst_flash.h>
 #include <86box/hwm.h>
 #include <86box/spd.h>
 #include <86box/video.h>

src/machine/m_at_socket4_5.c

@@ -34,8 +34,7 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/keyboard.h>
-#include <86box/intel_flash.h>
-#include <86box/sst_flash.h>
+#include <86box/flash.h>
 #include <86box/nvr.h>
 #include <86box/sio.h>
 #include <86box/video.h>
@@ -100,7 +99,6 @@ machine_at_award_common_init(const machine_t *model)
     device_add(&fdc_at_device);
     device_add(&keyboard_ps2_pci_device);
     device_add(&sio_device);
-    device_add(&intel_flash_bxt_device);
 }
 
 
@@ -162,6 +160,7 @@ machine_at_valuepointp60_init(const machine_t *model)
 }
 #endif
 
+
 int
 machine_at_p5mp3_init(const machine_t *model)
 {
@@ -175,11 +174,13 @@ machine_at_p5mp3_init(const machine_t *model)
 
     machine_at_award_common_init(model);
 
+    device_add(&catalyst_flash_device);
     device_add(&i430lx_device);
 
     return ret;
 }
 
+
 int
 machine_at_586mc1_init(const machine_t *model)
 {
@@ -193,6 +194,7 @@ machine_at_586mc1_init(const machine_t *model)
 
     machine_at_award_common_init(model);
 
+    device_add(&intel_flash_bxt_device);
     device_add(&i430lx_device);
 
     return ret;
@@ -250,6 +252,7 @@ machine_at_430nx_init(const machine_t *model)
 
     machine_at_award_common_init(model);
 
+    device_add(&intel_flash_bxt_device);
     device_add(&i430nx_device);
 
     return ret;
@@ -416,6 +419,7 @@ machine_at_mb500n_init(const machine_t *model)
     return ret;
 }
 
+
 #if defined(DEV_BRANCH) && defined(USE_VECTRA54)
 int
 machine_at_vectra54_init(const machine_t *model)

src/machine/m_at_socket7_s7.c

@@ -33,9 +33,8 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
-#include <86box/intel_flash.h>
+#include <86box/flash.h>
 #include <86box/sio.h>
-#include <86box/sst_flash.h>
 #include <86box/hwm.h>
 #include <86box/video.h>
 #include <86box/spd.h>

src/machine/m_at_socket8.c

@@ -29,10 +29,8 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
-#include <86box/intel_flash.h>
-#include <86box/sst_flash.h>
+#include <86box/flash.h>
 #include <86box/sio.h>
-#include <86box/sst_flash.h>
 #include <86box/hwm.h>
 #include <86box/spd.h>
 #include <86box/video.h>

src/machine/m_at_sockets7.c

@@ -33,9 +33,8 @@
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
 #include <86box/keyboard.h>
-#include <86box/intel_flash.h>
+#include <86box/flash.h>
 #include <86box/sio.h>
-#include <86box/sst_flash.h>
 #include <86box/spd.h>
 #include <86box/hwm.h>
 #include <86box/video.h>