diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c index e8f1f6d90..b6d5ea951 100644 --- a/src/cdrom/cdrom.c +++ b/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 } diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c index 6bd328737..01c551b7a 100644 --- a/src/disk/hdc_ide.c +++ b/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 } diff --git a/src/disk/hdd_image.c b/src/disk/hdd_image.c index cb8e5c5ec..6d766f4f7 100644 --- a/src/disk/hdd_image.c +++ b/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 } diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c index f15e50971..a5334d7d2 100644 --- a/src/floppy/fdc.c +++ b/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 } diff --git a/src/floppy/floppy_86f.c b/src/floppy/floppy_86f.c index 80c9aa9e0..9cecc3066 100644 --- a/src/floppy/floppy_86f.c +++ b/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 } diff --git a/src/keyboard_at.c b/src/keyboard_at.c index 9b275f9ee..76aaadc51 100644 --- a/src/keyboard_at.c +++ b/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 } diff --git a/src/machine/m_ps2_mca.c b/src/machine/m_ps2_mca.c index 8ad80130a..a910c0f87 100644 --- a/src/machine/m_ps2_mca.c +++ b/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; diff --git a/src/network/net_ne2000.c b/src/network/net_ne2000.c index b2cf3f022..a773af1ff 100644 --- a/src/network/net_ne2000.c +++ b/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 } diff --git a/src/pci.c b/src/pci.c index 94a8aa4e8..f4506f748 100644 --- a/src/pci.c +++ b/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 } diff --git a/src/scsi/scsi_aha154x.c b/src/scsi/scsi_aha154x.c index e569da503..322f65dea 100644 --- a/src/scsi/scsi_aha154x.c +++ b/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 } diff --git a/src/scsi/scsi_bus.c b/src/scsi/scsi_bus.c index ac6d9f0dc..c03211714 100644 --- a/src/scsi/scsi_bus.c +++ b/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 } diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c index 7cca0e60e..54ac282be 100644 --- a/src/scsi/scsi_buslogic.c +++ b/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 } diff --git a/src/scsi/scsi_disk.c b/src/scsi/scsi_disk.c index be58e1591..6f378ae2d 100644 --- a/src/scsi/scsi_disk.c +++ b/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 } diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c index 75a49ff9b..1a4bc4f54 100644 --- a/src/scsi/scsi_ncr5380.c +++ b/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 } diff --git a/src/scsi/scsi_x54x.c b/src/scsi/scsi_x54x.c index 9e17e3fab..a57b58d73 100644 --- a/src/scsi/scsi_x54x.c +++ b/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 } diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c index da418dd27..7ae668cf3 100644 --- a/src/sound/snd_audiopci.c +++ b/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 } diff --git a/src/sound/snd_emu8k.c b/src/sound/snd_emu8k.c index a688256b1..df108041f 100644 --- a/src/sound/snd_emu8k.c +++ b/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 }