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/disc.h

@@ -1,6 +1,8 @@
 /* Copyright holders: Sarah Walker, Tenshi
    see COPYING for more details
 */
+#define FDD_NUM		4
+
 typedef struct
 {
         void (*seek)(int drive, int track);
@@ -15,7 +17,7 @@ typedef struct
         void (*poll)(int drive);
 } DRIVE;
 
-extern DRIVE drives[2];
+extern DRIVE drives[FDD_NUM];
 
 extern int curdrive;
 
@@ -39,13 +41,12 @@ void disc_stop(int drive);
 int disc_empty(int drive);
 void disc_set_rate(int drive, int drvden, int rate);
 extern int disc_time;
-extern int disc_poll_time[2];
+extern int disc_poll_time[FDD_NUM];
 
 void fdc_callback();
 int  fdc_data(uint8_t dat);
 void fdc_spindown();
 void fdc_finishread();
-void fdc_notfound();
 void fdc_datacrcerror();
 void fdc_headercrcerror();
 void fdc_writeprotect();
@@ -57,7 +58,7 @@ extern int fdc_ready;
 extern int fdc_indexcount;*/
 
 extern int motorspin;
-extern int motoron[2];
+extern int motoron[FDD_NUM];
 
 extern int swwp;
 extern int disable_write;
@@ -65,16 +66,17 @@ extern int disable_write;
 extern int defaultwriteprot;
 //extern char discfns[4][260];
 
-extern int writeprot[2], fwriteprot[2];
-extern int disc_track[2];
-extern int disc_changed[2];
-extern int drive_empty[2];
-extern int drive_type[2];
+extern int writeprot[FDD_NUM], fwriteprot[FDD_NUM];
+extern int disc_track[FDD_NUM];
+extern int disc_changed[FDD_NUM];
+extern int drive_empty[FDD_NUM];
+extern int drive_type[FDD_NUM];
 
 /*Used in the Read A Track command. Only valid for disc_readsector(). */
 #define SECTOR_FIRST -2
 #define SECTOR_NEXT  -1
 
+#if 0
 /* Bits 0-3 define byte type, bit 5 defines whether it is a per-track (0) or per-sector (1) byte, if bit 7 is set, the byte is the index hole. */
 #define BYTE_GAP0		0x00
 #define BYTE_GAP1		0x10
@@ -108,6 +110,7 @@ extern int drive_type[2];
 #define BYTE_TYPE_AM		0x03
 #define BYTE_TYPE_DATA		0x04
 #define BYTE_TYPE_CRC		0x05
+#endif
 
 typedef union {
 	uint16_t word;
@@ -133,7 +136,7 @@ typedef struct
 	uint8_t check_crc;
 } d86f_handler_t;
 
-d86f_handler_t d86f_handler[2];
+d86f_handler_t d86f_handler[FDD_NUM];
 
 void d86f_common_handlers(int drive);