Applied all mainline PCem commits;

Added experimental NVidia Riva TNT2 emulation (patch from MoochMcGee);
ASUS P/I-P54TP4XE, ASUS P/I-P55T2P4, and ASUS P/I-P55TVP4 are back;
National Semiconductor PC87306 Super I/O chip now correctly reenables devices after a chip power cycle;
Several FDC improvements and the behavior is now a bit closer to real hardware (based on actual tests);
Added MR Intel Advanced/ATX with Microid Research BIOS with support for 4 floppy drives and up to 4 IDE controllers;
Added floppy drives 3 and 4, bringing the maximum to 4;
You can now connect hard disks to the tertiary IDE controller;
Correct undocumented behavior of the LEA instruction with register is back on 286 and later CPU's;
Pentium-rea models with Intel chipsets now have port 92 (with alternate reset and alternate A20 toggle);
Overhauled DMA channel read and write routines and fixed cascading;
Improved IMG detection of a bad BPB (or complete lack of a BPB);
Added preliminary emulation of PS/2 1.44 MB and PC-98 1.25 MB 3-mode drives (both have an inverted DENSEL pin);
Removed the incorrect Amstrad mouse patch from TheCollector1995;
Fixed ATAPI CD-ROM disk change detection;
Windows IOCTL CD-ROM handler now tries to use direct SCSI passthrough for more things, including obtaining CD-ROM capacity;
The Diamond Stealth32 (ET4000/W32p) now also works correctly on the two Award SiS 496/497 boxes;
The (S)VGA handler now converts 6-bit RAMDAC RGB channels to standard 8-bit RGB using a lookup table generated at emulator start, calculated using the correct intensity conversion method and treating intensity 64 as equivalent to 63;
Moved a few options from the Configuration dialog box to the menu;
SIO, PIIX, and PIIX3 now have the reset control register on port CF9 as they should;
Several bugfixes.

src/mouse.c

@@ -1,7 +1,50 @@
-/* Copyright holders: Sarah Walker
-   see COPYING for more details
-*/
 #include "ibm.h"
 #include "mouse.h"
+#include "amstrad.h"
+#include "mouse_ps2.h"
+#include "mouse_serial.h"
+#include "keyboard_olim24.h"
 
-void (*mouse_poll)(int x, int y, int b);
+static mouse_t *mouse_list[] =
+{
+        &mouse_serial_microsoft,
+        &mouse_ps2_2_button,
+        &mouse_intellimouse,
+        &mouse_amstrad,
+        &mouse_olim24,
+        NULL
+};
+
+static mouse_t *cur_mouse;
+static void *mouse_p;
+int mouse_type = 0;
+
+void mouse_emu_init()
+{
+        cur_mouse = mouse_list[mouse_type];
+        mouse_p = cur_mouse->init();
+}
+
+void mouse_emu_close()
+{
+        if (cur_mouse)
+                cur_mouse->close(mouse_p);
+        cur_mouse = NULL;
+}
+
+void mouse_poll(int x, int y, int z, int b)
+{
+        if (cur_mouse)
+                cur_mouse->poll(x, y, z, b, mouse_p);
+}
+
+char *mouse_get_name(int mouse)
+{
+        if (!mouse_list[mouse])
+                return NULL;
+        return mouse_list[mouse]->name;
+}
+int mouse_get_type(int mouse)
+{
+        return mouse_list[mouse]->type;
+}