WARNING: CONFIGS MIGHT PARTIALLY BREAK WHERE DEVICE NAMES HAVE CHANGED.

Changes to device_t struct to accomodate the upcoming PCI IRQ arbitration rewrite;
Added device.c/h API to obtain name from the device_t struct;
Significant changes to win/win_settings.c to clean up the code a bit and fix bugs;
Ported all the CPU and AudioPCI commits from PCem;
Added an API call to allow ACPI soft power off to gracefully stop the emulator;
Removed the Siemens PCD-2L from the Dev branch because it now works;
Removed the Socket 5 HP Vectra from the Dev branch because it now works;
Fixed the Compaq Presario and the Micronics Spitfire;
Give the IBM PC330 its own list of 486 CPU so it can have DX2's with CPUID 0x470;
SMM fixes;
Rewrote the SYSENTER, SYSEXIT, SYSCALL, and SYSRET instructions;
Changed IDE reset period to match the specification, fixes #929;
The keyboard input and output ports are now forced in front of the queue when read, fixes a number of bugs, including the AMI Apollo hanging on soft reset;
Added the Intel AN430TX but Dev branched because it does not work;
The network code no longer drops packets if the emulated network card has failed to receive them (eg. when the buffer is full);
Changes to PCI card adding and renamed some PCI slot types, also added proper AGP bridge slot types;
USB UHCI emulation is no longer a stub (still doesn't fully work, but at least Windows XP chk with Debug no longer ASSERT's on it);
Fixed NVR on the the SMC FDC37C932QF and APM variants;
A number of fixes to Intel 4x0 chipsets, including fixing every register of the 440LX and 440EX;
Some ACPI changes.

src/floppy/fdc.c

@@ -102,19 +102,19 @@ fdc_log(const char *fmt, ...)
 
 
 typedef const struct {
-    const char		*name;
     const char  *internal_name;
     const device_t    *device;
 } fdc_cards_t;
 
 /* All emulated machines have at least one integrated FDC controller */
 static fdc_cards_t fdc_cards[] = {
-    { "Internal controller", 	"internal",	NULL,				},
-    { "DTK PII-151B",		"dtk_pii151b",	&fdc_pii151b_device,		},
-    { "DTK PII-158B",		"dtk_pii158b",	&fdc_pii158b_device,		},
-    { "",			"",		NULL,				},
+    { "internal",	NULL			},
+    { "dtk_pii151b",	&fdc_pii151b_device	},
+    { "dtk_pii158b",	&fdc_pii158b_device	},
+    { "",		NULL			},
 };
 
+
 int
 fdc_card_available(int card)
 {
@@ -125,13 +125,6 @@ fdc_card_available(int card)
 }
 
 
-char *
-fdc_card_getname(int card)
-{
-    return((char *) fdc_cards[card].name);
-}
-
-
 const device_t *
 fdc_card_getdevice(int card)
 {
@@ -2336,7 +2329,7 @@ const device_t fdc_xt_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_xt_t1x00_device = {
@@ -2346,7 +2339,7 @@ const device_t fdc_xt_t1x00_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_xt_amstrad_device = {
@@ -2356,7 +2349,7 @@ const device_t fdc_xt_amstrad_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 
@@ -2367,7 +2360,7 @@ const device_t fdc_pcjr_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_at_device = {
@@ -2377,7 +2370,7 @@ const device_t fdc_at_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_at_actlow_device = {
@@ -2387,7 +2380,7 @@ const device_t fdc_at_actlow_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_at_ps1_device = {
@@ -2397,7 +2390,7 @@ const device_t fdc_at_ps1_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_at_smc_device = {
@@ -2407,7 +2400,7 @@ const device_t fdc_at_smc_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_at_winbond_device = {
@@ -2417,7 +2410,7 @@ const device_t fdc_at_winbond_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_at_nsc_device = {
@@ -2427,7 +2420,7 @@ const device_t fdc_at_nsc_device = {
     fdc_init,
     fdc_close,
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };
 
 const device_t fdc_dp8473_device = {
@@ -2437,5 +2430,5 @@ const device_t fdc_dp8473_device = {
     fdc_init,
     fdc_close, 
     fdc_reset,
-    NULL, NULL, NULL
+    { NULL }, NULL, NULL
 };

src/floppy/fdc_pii15xb.c

@@ -165,7 +165,7 @@ static int pii_158_available(void)
 
 static const device_config_t pii_config[] = {
     {
-	"bios_addr", "BIOS address", CONFIG_HEX20, "", 0x0ce000,
+	"bios_addr", "BIOS address", CONFIG_HEX20, "", 0x0ce000, "", { 0 },
 	{
 		{
 			"Disabled", 0
@@ -194,7 +194,7 @@ const device_t fdc_pii151b_device = {
     DEVICE_ISA,
     151,
     pii_init, pii_close, NULL,
-    pii_151b_available, NULL, NULL,
+    { pii_151b_available }, NULL, NULL,
     pii_config
 };
 
@@ -203,6 +203,6 @@ const device_t fdc_pii158b_device = {
     DEVICE_ISA,
     158,
     pii_init, pii_close, NULL,
-    pii_158_available, NULL, NULL,
+    { pii_158_available }, NULL, NULL,
     pii_config
 };