Added the IBM 5161 ISA expansion for PC and XT;

Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port;
Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX);
Finished the 586MC1;
Added 8087 emulation;
Moved Cyrix 6x86'es to the Dev branch;
Sanitized/cleaned up memregs.c/h and intel.c/h;
Split the chipsets from machines and sanitized Port 92 emulation;
Added support for the 15bpp mode to the Compaq ATI 28800;
Moved the MR 386DX and 486 machines to the Dev branch;
Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00;
Ported the new timer code from PCem;
Cleaned up the CPU table of unused stuff and better optimized its structure;
Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch;
Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem;
Added the AHA-1540A and the BusTek BT-542B;
Moved the Sumo SCSI-AT to the Dev branch;
Minor IDE, FDC, and floppy drive code clean-ups;
Made NCR 5380/53C400-based cards' BIOS address configurable;
Got rid of the legacy romset variable;
Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit;
Added the Amstead PPC512 per PCem patch by John Elliott;
Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages);
Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing;
Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem;
Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit;
Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement;
Amstrad MegaPC does now works correctly with non-internal graphics card;
The SLiRP code no longer casts a packed struct type to a non-packed struct type;
The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present;
The S3 Virge on BeOS is no longer broken (was broken by build #1591);
OS/2 2.0 build 6.167 now sees key presses again;
Xi8088 now work on CGA again;
86F images converted from either the old or new variants of the HxC MFM format now work correctly;
Hardware interrupts with a vector of 0xFF are now handled correctly;
OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct;
Fixed VNC keyboard input bugs;
Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g  / 81 MIDI play no longer hangs with the build's own VTD driver;
Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly;
Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4;
Compaq Portable now works with all graphics cards;
Fixed various MDSI Genius bugs;
Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly;
Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355;
OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400.
Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391.
Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389.
Fixed a minor IDE timing bug, fixes #388.
Fixed Toshiba T1000 RAM issues, fixes #379.
Fixed EGA/(S)VGA overscan border handling, fixes #378;
Got rid of the now long useless IDE channel 2 auto-removal, fixes #370;
Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366;
Ported the Unicode CD image file name fix from VARCem, fixes #365;
Fixed high density floppy disks on the Xi8088, fixes #359;
Fixed some bugs in the Hercules emulation, fixes #346, fixes #358;
Fixed the SCSI hard disk mode sense pages, fixes #356;
Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349;
Fixed bugs in the serial mouse emulation, fixes #344;
Compiled 86Box binaries now include all the required .DLL's, fixes #341;
Made some combo boxes in the Settings dialog slightly wider, fixes #276.

src/machine/m_at.c

@@ -41,6 +41,7 @@
 #include <string.h>
 #include <wchar.h>
 #include "../86box.h"
+#include "../timer.h"
 #include "../pic.h"
 #include "../pit.h"
 #include "../dma.h"
@@ -52,12 +53,13 @@
 #include "../game/gameport.h"
 #include "../keyboard.h"
 #include "../lpt.h"
+#include "../rom.h"
 #include "../disk/hdc.h"
 #include "machine.h"
 
 
 void
-machine_at_common_init(const machine_t *model)
+machine_at_common_init_ex(const machine_t *model, int is_ibm)
 {
     machine_common_init(model);
 
@@ -65,16 +67,23 @@ machine_at_common_init(const machine_t *model)
     pic2_init();
     dma16_init();
 
-    if (lpt_enabled)
-	lpt2_remove();
-
-    device_add(&at_nvr_device);
+    if (is_ibm)
+	device_add(&ibmat_nvr_device);
+    else
+	device_add(&at_nvr_device);
 
     if (joystick_type != 7)
 	device_add(&gameport_device);
 }
 
 
+void
+machine_at_common_init(const machine_t *model)
+{
+    machine_at_common_init_ex(model, 0);
+}
+
+
 void
 machine_at_init(const machine_t *model)
 {
@@ -84,22 +93,10 @@ machine_at_init(const machine_t *model)
 }
 
 
-void
-machine_at_ibm_init(const machine_t *model)
+static void
+machine_at_ibm_common_init(const machine_t *model)
 {
-    machine_common_init(model);
-
-    pit_set_out_func(&pit, 1, pit_refresh_timer_at);
-    pic2_init();
-    dma16_init();
-
-    if (lpt_enabled)
-	lpt2_remove();
-
-    device_add(&ibmat_nvr_device);
-
-    if (joystick_type != 7)
-	device_add(&gameport_device);
+    machine_at_common_init_ex(model, 1);
 
     device_add(&keyboard_at_device);
 
@@ -108,6 +105,7 @@ machine_at_ibm_init(const machine_t *model)
     device_add(&fdc_at_device);
 }
 
+
 void
 machine_at_ps2_init(const machine_t *model)
 {
@@ -122,7 +120,16 @@ machine_at_common_ide_init(const machine_t *model)
 {
     machine_at_common_init(model);
 
-    device_add(&ide_isa_2ch_opt_device);
+    device_add(&ide_isa_device);
+}
+
+
+void
+machine_at_ibm_common_ide_init(const machine_t *model)
+{
+    machine_at_common_init_ex(model, 1);
+
+    device_add(&ide_isa_device);
 }
 
 
@@ -131,7 +138,7 @@ machine_at_ide_init(const machine_t *model)
 {
     machine_at_init(model);
 
-    device_add(&ide_isa_2ch_opt_device);
+    device_add(&ide_isa_device);
 }
 
 
@@ -140,5 +147,60 @@ machine_at_ps2_ide_init(const machine_t *model)
 {
     machine_at_ps2_init(model);
 
-    device_add(&ide_isa_2ch_opt_device);
+    device_add(&ide_isa_device);
 }
+
+
+int
+machine_at_ibm_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved(L"roms/machines/ibmat/62x0820.u27",
+				L"roms/machines/ibmat/62x0821.u47",
+				0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_ibm_common_init(model);
+
+    return ret;
+}
+
+
+int
+machine_at_ibmxt286_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_interleaved(L"roms/machines/ibmxt286/bios_5162_21apr86_u34_78x7460_27256.bin",
+				L"roms/machines/ibmxt286/bios_5162_21apr86_u35_78x7461_27256.bin",
+				0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_ibm_common_init(model);
+
+    return ret;
+}
+
+
+#if defined(DEV_BRANCH) && defined(USE_OPEN_AT)
+int
+machine_at_open_at_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear(L"roms/machines/open_at/bios.bin",
+			   0x000f0000, 65536, 0);
+
+    if (bios_only || !ret)
+	return ret;
+
+    machine_at_ibm_common_init(model);
+
+    return ret;
+}
+#endif