The PS/2 Model 80 memory expansion board initialization now correctly sets up the RAM mappings;

The per-device log functions now all call pclog().

src/cdrom/cdrom.c

@@ -726,13 +726,13 @@ static void
 cdrom_log(const char *format, ...)
 {
 #ifdef ENABLE_CDROM_LOG
+	va_list ap;
+
 	if (cdrom_do_log)
 	{
-		va_list ap;
 		va_start(ap, format);
-		vfprintf(stdlog, format, ap);
+		pclog(format, ap);
 		va_end(ap);
-		fflush(stdlog);
 	}
 #endif
 }

src/disk/hdc_ide.c

@@ -113,13 +113,13 @@ int ide_do_log = ENABLE_IDE_LOG;
 static void ide_log(const char *format, ...)
 {
 #ifdef ENABLE_IDE_LOG
+   va_list ap;
+
    if (ide_do_log)
    {
-	va_list ap;
 	va_start(ap, format);
-	vfprintf(stdlog, format, ap);
+	pclog(format, ap);
 	va_end(ap);
-	fflush(stdlog);
    }
 #endif
 }

src/disk/hdd_image.c

@@ -58,13 +58,13 @@ static void
 hdd_image_log(const char *format, ...)
 {
 #ifdef ENABLE_HDD_LOG
+	va_list ap;
+
 	if (hdd_image_do_log)
 	{
-		va_list ap;
 		va_start(ap, format);
-		vfprintf(stdlog, format, ap);
+		pclog(format, ap);
 		va_end(ap);
-		fflush(stdlog);
 	}
 #endif
 }

src/floppy/fdc.c

@@ -176,13 +176,13 @@ static void
 fdc_log(const char *format, ...)
 {
 #ifdef ENABLE_FDC_LOG
+   va_list ap;
+
    if (fdc_do_log)
    {
 	va_list ap;
-	va_start(ap, format);
-	vfprintf(stdlog, format, ap);
+	pclog(format, ap);
 	va_end(ap);
-	fflush(stdlog);
    }
 #endif
 }

src/floppy/floppy_86f.c

@@ -249,13 +249,13 @@ static void
 d86f_log(const char *format, ...)
 {
 #ifdef ENABLE_D86F_LOG
+    va_list ap;
+
    if (d86f_do_log)
    {
-	va_list ap;
 	va_start(ap, format);
-	vfprintf(stdlog, format, ap);
+	pclog(format, ap);
 	va_end(ap);
-	fflush(stdlog);
    }
 #endif
 }

src/keyboard_at.c

@@ -458,12 +458,12 @@ static void
 kbdlog(const char *fmt, ...)
 {
 #ifdef ENABLE_KEYBOARD_AT_LOG
+    va_list ap;
+
     if (keyboard_at_do_log) {
-	va_list ap;
 	va_start(ap, fmt);
-	vfprintf(stdlog, fmt, ap);
+	pclog(fmt, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/machine/m_ps2_mca.c

@@ -756,7 +756,7 @@ static void ps2_mca_board_model_80_type2_init(int is486)
         if ((mem_size > 4096) && !is486)
         {
                 /* Only 4 MB supported on planar, create a memory expansion card for the rest */
-                mem_mapping_set_addr(&ram_high_mapping, 0x100000, 0x800000);
+                mem_mapping_set_addr(&ram_high_mapping, 0x100000, 0x400000);
 
                 ps2.mem_pos_regs[0] = 0xff;
                 ps2.mem_pos_regs[1] = 0xfc;

src/network/net_ne2000.c

@@ -232,9 +232,8 @@ nelog(int lvl, const char *fmt, ...)
 
     if (nic_do_log >= lvl) {
 	va_start(ap, fmt);
-	vfprintf(stdlog, fmt, ap);
+	pclog(fmt, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/pci.c

@@ -63,13 +63,13 @@ static void
 pcilog(const char *format, ...)
 {
 #ifdef ENABLE_PCI_LOG
+	va_list ap;
+
 	if (pci_do_log)
 	{
-		va_list ap;
 		va_start(ap, format);
-		vfprintf(stdlog, format, ap);
+		pclog(format, ap);
 		va_end(ap);
-		fflush(stdlog);
 	}
 #endif
 }

src/scsi/scsi_aha154x.c

@@ -91,9 +91,8 @@ aha_log(const char *fmt, ...)
 
     if (aha_do_log) {
 	va_start(ap, fmt);
-	vfprintf(stdlog, fmt, ap);
+	pclog(fmt, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/scsi/scsi_bus.c

@@ -47,12 +47,12 @@ static void
 scsi_bus_log(const char *format, ...)
 {
 #ifdef ENABLE_SCSI_BUS_LOG
+    va_list ap;
+
     if (scsi_bus_do_log) {
-	va_list ap;
 	va_start(ap, format);
-	vfprintf(stdlog, format, ap);
+	pclog(format, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/scsi/scsi_buslogic.c

@@ -250,9 +250,8 @@ buslogic_log(const char *format, ...)
 
     if (buslogic_do_log) {
 	va_start(ap, format);
-	vfprintf(stdlog, format, ap);
+	pclog(format, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/scsi/scsi_disk.c

@@ -460,12 +460,12 @@ static void
 scsi_hd_log(const char *format, ...)
 {
 #ifdef ENABLE_SCSI_DISK_LOG
+    va_list ap;
+
     if (scsi_hd_do_log) {
-	va_list ap;
 	va_start(ap, format);
-	vfprintf(stdlog, format, ap);
+	pclog(format, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/scsi/scsi_ncr5380.c

@@ -156,9 +156,8 @@ ncr_log(const char *fmt, ...)
 
     if (ncr5380_do_log) {
 	va_start(ap, fmt);
-	vfprintf(stdlog, fmt, ap);
+	pclog(fmt, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/scsi/scsi_x54x.c

@@ -81,9 +81,8 @@ x54x_log(const char *fmt, ...)
 
     if (x54x_do_log) {
 	va_start(ap, fmt);
-	vfprintf(stdlog, fmt, ap);
+	pclog(fmt, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/sound/snd_audiopci.c

@@ -134,12 +134,12 @@ static void
 audiopci_log(const char *format, ...)
 {
 #ifdef ENABLE_AUDIOPCI_LOG
+    va_list ap;
+
     if (audiopci_do_log) {
-	va_list ap;
 	va_start(ap, format);
-	vfprintf(stdlog, format, ap);
+	pclog(format, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }

src/sound/snd_emu8k.c

@@ -301,12 +301,12 @@ static void
 emu8k_log(const char *format, ...)
 {
 #ifdef ENABLE_EMU8K_LOG
+    va_list ap;
+
     if (emu8k_do_log) {
-	va_list ap;
 	va_start(ap, format);
-	vfprintf(stdlog, format, ap);
+	pclog(format, ap);
 	va_end(ap);
-	fflush(stdlog);
     }
 #endif
 }