From 4901e89e51c32c32373930f93531928c93743deb Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 5 Nov 2022 21:41:55 -0400 Subject: [PATCH 1/4] Port fdd_is_hd() from mtrr branch Currently disabled as unused --- src/floppy/fdd.c | 8 ++++++++ src/include/86box/fdd.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/floppy/fdd.c b/src/floppy/fdd.c index 8ab8c315a..1ea1ca9ff 100644 --- a/src/floppy/fdd.c +++ b/src/floppy/fdd.c @@ -383,6 +383,14 @@ fdd_is_dd(int drive) return (drive_types[fdd[drive].type].flags & 0x70) == 0x10; } +#if 0 +int +fdd_is_hd(int drive) +{ + return drive_types[fdd[drive].type].flags & FLAG_HOLE1; +} +#endif + int fdd_is_ed(int drive) { diff --git a/src/include/86box/fdd.h b/src/include/86box/fdd.h index 92efd9fd5..5d8da47a0 100644 --- a/src/include/86box/fdd.h +++ b/src/include/86box/fdd.h @@ -42,6 +42,9 @@ extern int fdd_can_read_medium(int drive); extern int fdd_doublestep_40(int drive); extern int fdd_is_525(int drive); extern int fdd_is_dd(int drive); +#if 0 +extern int fdd_is_hd(int drive); +#endif extern int fdd_is_ed(int drive); extern int fdd_is_double_sided(int drive); extern void fdd_set_head(int drive, int head); From 5def97d138af679f1a7b516867893e6e4dac5a74 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 5 Nov 2022 21:43:09 -0400 Subject: [PATCH 2/4] Port code related to coreboot BIOS from MTRR Only used if MACHINE_COREBOOT is set in machine flags, so this is a pretty safe one --- src/device/keyboard_at.c | 19 ++++++++++++++----- src/include/86box/machine.h | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c index 682d28e1c..c9202a6d8 100644 --- a/src/device/keyboard_at.c +++ b/src/device/keyboard_at.c @@ -1120,11 +1120,20 @@ write_output(atkbd_t *dev, uint8_t val) if (!(val & 0x01)) { /* Pin 0 selected. */ /* Pin 0 selected. */ kbd_log("write_output(): Pulse reset!\n"); - softresetx86(); /*Pulse reset!*/ - cpu_set_edx(); - flushmmucache(); - if (kbc_ven == KBC_VEN_ALI) - smbase = 0x00030000; + if (machines[machine].flags & MACHINE_COREBOOT) { + /* The SeaBIOS hard reset code attempts a KBC reset if ACPI RESET_REG + is not available. However, the KBC reset is normally a soft reset, so + SeaBIOS gets caught in a soft reset loop as it tries to hard reset the + machine. Hack around this by making the KBC reset a hard reset only on + coreboot machines. */ + pc_reset_hard(); + } else { + softresetx86(); /*Pulse reset!*/ + cpu_set_edx(); + flushmmucache(); + if (kbc_ven == KBC_VEN_ALI) + smbase = 0x00030000; + } } } diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index b7109d8fd..b57113ae0 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -107,6 +107,7 @@ #define MACHINE_SCSI_SEC 0x02000000 /* sys has int sec SCSI */ #define MACHINE_USB_PRI 0x04000000 /* sys has int pri USB */ #define MACHINE_USB_SEC 0x08000000 /* sys has int sec USB */ +#define MACHINE_COREBOOT 0x10000000 /* sys has coreboot BIOS */ /* Combined flags. */ #define MACHINE_IDE (MACHINE_IDE_PRI) /* sys has int single IDE/ATAPI - mark as pri IDE/ATAPI */ #define MACHINE_IDE_DUAL (MACHINE_IDE_PRI | MACHINE_IDE_SEC) /* sys has int dual IDE/ATAPI - mark as both pri and sec IDE/ATAPI */ From 4cf229ee3a950804d4b6c8f70511839e2d772fc4 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 5 Nov 2022 21:43:42 -0400 Subject: [PATCH 3/4] Port the very basic serial console from mtrr It's enabled by the flag ENABLE_SERIAL CONSOLE --- src/device/serial.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/device/serial.c b/src/device/serial.c index 48f206f84..16573c82f 100644 --- a/src/device/serial.c +++ b/src/device/serial.c @@ -51,6 +51,7 @@ enum { static int next_inst = 0; static serial_device_t serial_devices[SERIAL_MAX]; +//#define ENABLE_SERIAL_CONSOLE 1 #ifdef ENABLE_SERIAL_LOG int serial_do_log = ENABLE_SERIAL_LOG; @@ -193,6 +194,15 @@ serial_transmit(serial_t *dev, uint8_t val) write_fifo(dev, val); else if (dev->sd->dev_write) dev->sd->dev_write(dev, dev->sd->priv, val); +#ifdef ENABLE_SERIAL_CONSOLE + if ((val >= ' ' && val <= '~') || val == '\r' || val == '\n') { + fputc(val, stdout); + if (val == '\n') + fflush(stdout); + } else { + fprintf(stdout, "[%02X]", val); + } +#endif } static void From aa2c07bed2552817301a495c1f5397f1693e3046 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sat, 5 Nov 2022 21:44:11 -0400 Subject: [PATCH 4/4] Random header cleanups I noticed while porting things --- src/acpi.c | 16 ++++++++-------- src/cpu/cpu.c | 28 ++++++++++++++-------------- src/cpu/cpu.h | 24 ++++++++++++------------ src/device/keyboard_at.c | 28 ++++++++++++++-------------- src/device/pci_bridge.c | 16 ++++++++-------- src/device/serial.c | 26 +++++++++++++------------- src/device/smbus_piix4.c | 16 ++++++++-------- src/dma.c | 24 ++++++++++++------------ src/include/86box/acpi.h | 16 ++++++++-------- src/include/86box/chipset.h | 16 ++++++++-------- src/include/86box/flash.h | 17 +++++++++-------- src/include/86box/hwm.h | 16 ++++++++-------- src/include/86box/machine.h | 24 ++++++++++++------------ src/include/86box/mem.h | 24 ++++++++++++------------ src/include/86box/pci.h | 24 ++++++++++++------------ src/include/86box/sio.h | 17 +++++++++-------- src/include/86box/smbus.h | 16 ++++++++-------- src/include/86box/spd.h | 16 ++++++++-------- src/io.c | 22 +++++++++++----------- src/machine/m_at_slot1.c | 16 ++++++++-------- src/machine/m_at_socket370.c | 16 ++++++++-------- src/machine/m_at_socket7.c | 22 +++++++++++----------- src/machine/m_xt_zenith.c | 28 ++++++++++++++-------------- src/machine/machine_table.c | 29 ++++++++++++++--------------- src/mem/mem.c | 24 ++++++++++++------------ src/mem/spd.c | 16 ++++++++-------- src/mem/sst_flash.c | 24 ++++++++++++------------ src/pic.c | 22 +++++++++++----------- src/video/vid_cl54xx.c | 26 +++++++++++++------------- src/video/vid_et4000.c | 26 +++++++++++++------------- src/video/vid_et4000w32.c | 22 +++++++++++----------- src/video/vid_s3.c | 20 ++++++++++---------- src/video/vid_svga.c | 24 ++++++++++++------------ src/video/vid_table.c | 20 ++++++++++---------- 34 files changed, 361 insertions(+), 360 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index f607eb9cf..4923e3d9b 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * ACPI emulation. + * ACPI emulation. * * * - * Authors: Miran Grca, + * Authors: Miran Grca, * - * Copyright 2020 Miran Grca. + * Copyright 2020 Miran Grca. */ #include #include diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 940555dd2..75d5d08e8 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * CPU type handler. + * CPU type handler. * - * Authors: Sarah Walker, - * leilei, - * Miran Grca, - * Fred N. van Kempen, + * Authors: Sarah Walker, + * leilei, + * Miran Grca, + * Fred N. van Kempen, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2018 leilei. - * Copyright 2016-2020 Miran Grca. - * Copyright 2018-2021 Fred N. van Kempen. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2018 leilei. + * Copyright 2016-2020 Miran Grca. + * Copyright 2018-2021 Fred N. van Kempen. */ #include #include diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index b8e10661c..aec00290f 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * CPU type handler. + * CPU type handler. * * * - * Authors: Sarah Walker, - * leilei, - * Miran Grca, + * Authors: Sarah Walker, + * leilei, + * Miran Grca, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2018 leilei. - * Copyright 2016-2020 Miran Grca. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2018 leilei. + * Copyright 2016-2020 Miran Grca. */ #ifndef EMU_CPU_H #define EMU_CPU_H diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c index c9202a6d8..542be0a24 100644 --- a/src/device/keyboard_at.c +++ b/src/device/keyboard_at.c @@ -1,24 +1,24 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Intel 8042 (AT keyboard controller) emulation. + * Intel 8042 (AT keyboard controller) emulation. * * * - * Authors: Sarah Walker, - * Miran Grca, - * Fred N. van Kempen, - * EngiNerd + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, + * EngiNerd * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. - * Copyright 2020 EngiNerd. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2020 EngiNerd. */ #include #include diff --git a/src/device/pci_bridge.c b/src/device/pci_bridge.c index bc0f685d3..c5ad77a4f 100644 --- a/src/device/pci_bridge.c +++ b/src/device/pci_bridge.c @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implementation of PCI-PCI and host-AGP bridges. + * Implementation of PCI-PCI and host-AGP bridges. * * * - * Authors: RichardG, + * Authors: RichardG, * - * Copyright 2020 RichardG. + * Copyright 2020 RichardG. */ #include diff --git a/src/device/serial.c b/src/device/serial.c index 16573c82f..3dd49590e 100644 --- a/src/device/serial.c +++ b/src/device/serial.c @@ -1,24 +1,24 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * NS8250/16450/16550 UART emulation. + * NS8250/16450/16550 UART emulation. * - * Now passes all the AMIDIAG tests. + * Now passes all the AMIDIAG tests. * * * - * Author: Sarah Walker, - * Miran Grca, - * Fred N. van Kempen, + * Author: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. */ #include #include diff --git a/src/device/smbus_piix4.c b/src/device/smbus_piix4.c index 607a0e055..07a03454f 100644 --- a/src/device/smbus_piix4.c +++ b/src/device/smbus_piix4.c @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implementation of a generic PIIX4-compatible SMBus host controller. + * Implementation of a generic PIIX4-compatible SMBus host controller. * * * - * Authors: RichardG, + * Authors: RichardG, * - * Copyright 2020 RichardG. + * Copyright 2020 RichardG. */ #include #include diff --git a/src/dma.c b/src/dma.c index 48853321a..d8c4ea674 100644 --- a/src/dma.c +++ b/src/dma.c @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implementation of the Intel DMA controllers. + * Implementation of the Intel DMA controllers. * * * - * Authors: Sarah Walker, - * Miran Grca, - * Fred N. van Kempen, + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. */ #include #include diff --git a/src/include/86box/acpi.h b/src/include/86box/acpi.h index 6864fa42d..4d2f2ac0d 100644 --- a/src/include/86box/acpi.h +++ b/src/include/86box/acpi.h @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Definitions for the ACPI emulation. + * Definitions for the ACPI emulation. * * * - * Authors: Miran Grca, + * Authors: Miran Grca, * - * Copyright 2020 Miran Grca. + * Copyright 2020 Miran Grca. */ #ifndef ACPI_H #define ACPI_H diff --git a/src/include/86box/chipset.h b/src/include/86box/chipset.h index 25f6ac924..f76028d78 100644 --- a/src/include/86box/chipset.h +++ b/src/include/86box/chipset.h @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Handling of the emulated chipsets. + * Handling of the emulated chipsets. * * * - * Authors: Miran Grca, + * Authors: Miran Grca, * - * Copyright 2019,2020 Miran Grca. + * Copyright 2019,2020 Miran Grca. */ #ifndef EMU_CHIPSET_H #define EMU_CHIPSET_H diff --git a/src/include/86box/flash.h b/src/include/86box/flash.h index bc672c777..4edb67467 100644 --- a/src/include/86box/flash.h +++ b/src/include/86box/flash.h @@ -1,17 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Handling of the emulated flash devices. + * Handling of the emulated flash devices. * * * - * Author: Miran Grca, - * Copyright 2020 Miran Grca. + * Authors: Miran Grca, + * + * Copyright 2020 Miran Grca. */ #ifndef EMU_FLASH_H diff --git a/src/include/86box/hwm.h b/src/include/86box/hwm.h index 3ddf71c62..a752b1689 100644 --- a/src/include/86box/hwm.h +++ b/src/include/86box/hwm.h @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Definitions for hardware monitoring chips. + * Definitions for hardware monitoring chips. * * * - * Author: RichardG, + * Authors: RichardG, * - * Copyright 2020 RichardG. + * Copyright 2020 RichardG. */ #ifndef EMU_HWM_H #define EMU_HWM_H diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index b57113ae0..aeca2e900 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Handling of the emulated machines. + * Handling of the emulated machines. * * * - * Authors: Sarah Walker, - * Miran Grca, - * Fred N. van Kempen, + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. */ #ifndef EMU_MACHINE_H diff --git a/src/include/86box/mem.h b/src/include/86box/mem.h index 7f91eb8a2..f6252be09 100644 --- a/src/include/86box/mem.h +++ b/src/include/86box/mem.h @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Definitions for the memory interface. + * Definitions for the memory interface. * * * - * Authors: Sarah Walker, - * Fred N. van Kempen, - * Miran Grca, + * Authors: Sarah Walker, + * Fred N. van Kempen, + * Miran Grca, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2017-2020 Fred N. van Kempen. - * Copyright 2016-2020 Miran Grca. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2016-2020 Miran Grca. */ #ifndef EMU_MEM_H diff --git a/src/include/86box/pci.h b/src/include/86box/pci.h index 9f36fd7c9..9f45aa0a0 100644 --- a/src/include/86box/pci.h +++ b/src/include/86box/pci.h @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Definitions for the PCI handler module. + * Definitions for the PCI handler module. * * * - * Authors: Miran Grca, - * Fred N. van Kempen, - * Sarah Walker, + * Authors: Miran Grca, + * Fred N. van Kempen, + * Sarah Walker, * - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. - * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2008-2020 Sarah Walker. */ #ifndef EMU_PCI_H diff --git a/src/include/86box/sio.h b/src/include/86box/sio.h index 4cd0f9988..09b5b1c40 100644 --- a/src/include/86box/sio.h +++ b/src/include/86box/sio.h @@ -1,15 +1,16 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Definitions for the Super I/O chips. + * Definitions for the Super I/O chips. * - * Author: Fred N. van Kempen, - * Copyright 2017-2020 Fred N. van Kempen. + * Authors: Fred N. van Kempen, + * + * Copyright 2017-2020 Fred N. van Kempen. */ #ifndef EMU_SIO_H diff --git a/src/include/86box/smbus.h b/src/include/86box/smbus.h index 51b10333a..9bb429b43 100644 --- a/src/include/86box/smbus.h +++ b/src/include/86box/smbus.h @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Definitions for the SMBus host controllers. + * Definitions for the SMBus host controllers. * * * - * Authors: RichardG, + * Authors: RichardG, * - * Copyright 2020 RichardG. + * Copyright 2020 RichardG. */ #ifndef EMU_SMBUS_PIIX4_H diff --git a/src/include/86box/spd.h b/src/include/86box/spd.h index b3d025172..ae4342675 100644 --- a/src/include/86box/spd.h +++ b/src/include/86box/spd.h @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Emulation of SPD (Serial Presence Detect) devices. + * Emulation of SPD (Serial Presence Detect) devices. * * * - * Authors: RichardG, + * Authors: RichardG, * - * Copyright 2020 RichardG. + * Copyright 2020 RichardG. */ #ifndef EMU_SPD_H diff --git a/src/io.c b/src/io.c index ef7dc7c02..cf934b895 100644 --- a/src/io.c +++ b/src/io.c @@ -1,21 +1,21 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implement I/O ports and their operations. + * Implement I/O ports and their operations. * * * - * Authors: Sarah Walker, - * Miran Grca, - * Fred N. van Kempen, + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, * - * Copyright 2008-2019 Sarah Walker. - * Copyright 2016-2019 Miran Grca. + * Copyright 2008-2019 Sarah Walker. + * Copyright 2016-2019 Miran Grca. */ #include #include diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c index 8f361ba78..d1856c70f 100644 --- a/src/machine/m_at_slot1.c +++ b/src/machine/m_at_slot1.c @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implementation of Slot 1 machines. + * Implementation of Slot 1 machines. * * * - * Authors: Miran Grca, + * Authors: Miran Grca, * - * Copyright 2016-2019 Miran Grca. + * Copyright 2016-2019 Miran Grca. */ #include #include diff --git a/src/machine/m_at_socket370.c b/src/machine/m_at_socket370.c index b73f54062..d11dc0876 100644 --- a/src/machine/m_at_socket370.c +++ b/src/machine/m_at_socket370.c @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implementation of Socket 370(PGA370) machines. + * Implementation of Socket 370(PGA370) machines. * * * - * Authors: Miran Grca, + * Authors: Miran Grca, * - * Copyright 2016-2019 Miran Grca. + * Copyright 2016-2019 Miran Grca. */ #include #include diff --git a/src/machine/m_at_socket7.c b/src/machine/m_at_socket7.c index 1fb4abfdc..a51c58b14 100644 --- a/src/machine/m_at_socket7.c +++ b/src/machine/m_at_socket7.c @@ -1,21 +1,21 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implementation of Socket 7 (Dual Voltage) machines. + * Implementation of Socket 7 (Dual Voltage) machines. * * * - * Authors: Sarah Walker, - * Miran Grca, - * Melissa Goad, + * Authors: Sarah Walker, + * Miran Grca, + * Melissa Goad, * - * Copyright 2010-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. + * Copyright 2010-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. * */ #include diff --git a/src/machine/m_xt_zenith.c b/src/machine/m_xt_zenith.c index c8d1f53f7..9e05f3077 100644 --- a/src/machine/m_xt_zenith.c +++ b/src/machine/m_xt_zenith.c @@ -1,24 +1,24 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Emulation of various Zenith PC compatible machines. - * Currently only the Zenith Data Systems Supersport is emulated. + * Emulation of various Zenith PC compatible machines. + * Currently only the Zenith Data Systems Supersport is emulated. * * * - * Authors: Sarah Walker, - * Miran Grca, - * TheCollector1995, - * EngiNerd + * Authors: Sarah Walker, + * Miran Grca, + * TheCollector1995, + * EngiNerd * - * Copyright 2008-2019 Sarah Walker. - * Copyright 2016-2019 Miran Grca. - * Copyright 2020 EngiNerd. + * Copyright 2008-2019 Sarah Walker. + * Copyright 2016-2019 Miran Grca. + * Copyright 2020 EngiNerd. */ #include #include diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 4bb454036..e96cda9f2 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -1,25 +1,25 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Handling of the emulated machines. + * Handling of the emulated machines. * - * NOTES: OpenAT wip for 286-class machine with open BIOS. - * PS2_M80-486 wip, pending receipt of TRM's for machine. + * NOTES: OpenAT wip for 286-class machine with open BIOS. + * PS2_M80-486 wip, pending receipt of TRM's for machine. * * * - * Authors: Sarah Walker, - * Miran Grca, - * Fred N. van Kempen, + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. */ #include #include @@ -199,7 +199,6 @@ const machine_filter_t machine_chipsets[] = { Write Input Port, same as on AMIKey-3. */ - const machine_t machines[] = { // clang-format off /* 8088 Machines */ diff --git a/src/mem/mem.c b/src/mem/mem.c index 2aea1748f..e0456bf5c 100644 --- a/src/mem/mem.c +++ b/src/mem/mem.c @@ -1,20 +1,20 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Memory handling and MMU. + * Memory handling and MMU. * - * Authors: Sarah Walker, - * Miran Grca, - * Fred N. van Kempen, + * Authors: Sarah Walker, + * Miran Grca, + * Fred N. van Kempen, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. */ #include #include diff --git a/src/mem/spd.c b/src/mem/spd.c index b88508a61..b1f2b5ecd 100644 --- a/src/mem/spd.c +++ b/src/mem/spd.c @@ -1,18 +1,18 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Emulation of SPD (Serial Presence Detect) devices. + * Emulation of SPD (Serial Presence Detect) devices. * * * - * Authors: RichardG, + * Authors: RichardG, * - * Copyright 2020 RichardG. + * Copyright 2020 RichardG. */ #include #include diff --git a/src/mem/sst_flash.c b/src/mem/sst_flash.c index d94ca501b..8bf0dc6c9 100644 --- a/src/mem/sst_flash.c +++ b/src/mem/sst_flash.c @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implementation of an SST flash chip. + * Implementation of an SST flash chip. * * * - * Authors: Sarah Walker, - * Miran Grca, - * Melissa Goad, + * Authors: Sarah Walker, + * Miran Grca, + * Melissa Goad, * - * Copyright 2008-2020 Sarah Walker. - * Copyright 2016-2020 Miran Grca. - * Copyright 2020 Melissa Goad. + * Copyright 2008-2020 Sarah Walker. + * Copyright 2016-2020 Miran Grca. + * Copyright 2020 Melissa Goad. */ #include #include diff --git a/src/pic.c b/src/pic.c index b39e75e33..1a5302ffb 100644 --- a/src/pic.c +++ b/src/pic.c @@ -1,19 +1,19 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Implementation of the Intel PIC chip emulation, partially - * ported from reenigne's XTCE. + * Implementation of the Intel PIC chip emulation, partially + * ported from reenigne's XTCE. * - * Authors: Andrew Jenner, - * Miran Grca, + * Authors: Andrew Jenner, + * Miran Grca, * - * Copyright 2015-2020 Andrew Jenner. - * Copyright 2016-2020 Miran Grca. + * Copyright 2015-2020 Andrew Jenner. + * Copyright 2016-2020 Miran Grca. */ #include #include diff --git a/src/video/vid_cl54xx.c b/src/video/vid_cl54xx.c index 04791cb19..a1effc16a 100644 --- a/src/video/vid_cl54xx.c +++ b/src/video/vid_cl54xx.c @@ -1,23 +1,23 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Emulation of select Cirrus Logic cards (CL-GD 5428, - * CL-GD 5429, CL-GD 5430, CL-GD 5434 and CL-GD 5436 are supported). + * Emulation of select Cirrus Logic cards (CL-GD 5428, + * CL-GD 5429, CL-GD 5430, CL-GD 5434 and CL-GD 5436 are supported). * * * - * Authors: Miran Grca, - * tonioni, - * TheCollector1995, + * Authors: Miran Grca, + * tonioni, + * TheCollector1995, * - * Copyright 2016-2020 Miran Grca. - * Copyright 2020 tonioni. - * Copyright 2016-2020 TheCollector1995. + * Copyright 2016-2020 Miran Grca. + * Copyright 2020 tonioni. + * Copyright 2016-2020 TheCollector1995. */ #include #include diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c index bafaeb887..930468fbf 100644 --- a/src/video/vid_et4000.c +++ b/src/video/vid_et4000.c @@ -1,23 +1,23 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Emulation of the Tseng Labs ET4000. + * Emulation of the Tseng Labs ET4000. * * * - * Authors: Fred N. van Kempen, - * Miran Grca, - * GreatPsycho, - * Sarah Walker, + * Authors: Fred N. van Kempen, + * Miran Grca, + * GreatPsycho, + * Sarah Walker, * - * Copyright 2017,2018 Fred N. van Kempen. - * Copyright 2016-2018 Miran Grca. - * Copyright 2008-2018 Sarah Walker. + * Copyright 2017,2018 Fred N. van Kempen. + * Copyright 2016-2018 Miran Grca. + * Copyright 2008-2018 Sarah Walker. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c index 7e97fe543..aaa0dc223 100644 --- a/src/video/vid_et4000w32.c +++ b/src/video/vid_et4000w32.c @@ -1,22 +1,22 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * ET4000/W32 series emulation. + * ET4000/W32 series emulation. * - * Known bugs: Accelerator doesn't work in planar modes + * Known bugs: Accelerator doesn't work in planar modes * * * - * Authors: Sarah Walker, - * Miran Grca, + * Authors: Sarah Walker, + * Miran Grca, * - * Copyright 2008-2019 Sarah Walker. - * Copyright 2016-2019 Miran Grca. + * Copyright 2008-2019 Sarah Walker. + * Copyright 2016-2019 Miran Grca. */ #include #include diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index 9b7e8679c..b31100596 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -1,20 +1,20 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * S3 emulation. + * S3 emulation. * * * - * Authors: Sarah Walker, - * Miran Grca, + * Authors: Sarah Walker, + * Miran Grca, * - * Copyright 2008-2019 Sarah Walker. - * Copyright 2016-2019 Miran Grca. + * Copyright 2008-2019 Sarah Walker. + * Copyright 2016-2019 Miran Grca. */ #include #include diff --git a/src/video/vid_svga.c b/src/video/vid_svga.c index d6d9a9564..e542ddd91 100644 --- a/src/video/vid_svga.c +++ b/src/video/vid_svga.c @@ -1,23 +1,23 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Generic SVGA handling. + * Generic SVGA handling. * - * This is intended to be used by another SVGA driver, - * and not as a card in its own right. + * This is intended to be used by another SVGA driver, + * and not as a card in its own right. * * * - * Authors: Sarah Walker, - * Miran Grca, + * Authors: Sarah Walker, + * Miran Grca, * - * Copyright 2008-2019 Sarah Walker. - * Copyright 2016-2019 Miran Grca. + * Copyright 2008-2019 Sarah Walker. + * Copyright 2016-2019 Miran Grca. */ #include #include diff --git a/src/video/vid_table.c b/src/video/vid_table.c index 73ad0cdd3..31c857cf5 100644 --- a/src/video/vid_table.c +++ b/src/video/vid_table.c @@ -1,20 +1,20 @@ /* - * 86Box A hypervisor and IBM PC system emulator that specializes in - * running old operating systems and software designed for IBM - * PC systems and compatibles from 1981 through fairly recent - * system designs based on the PCI bus. + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. * - * This file is part of the 86Box distribution. + * This file is part of the 86Box distribution. * - * Define all known video cards. + * Define all known video cards. * * * - * Authors: Miran Grca, - * Fred N. van Kempen, + * Authors: Miran Grca, + * Fred N. van Kempen, * - * Copyright 2016-2020 Miran Grca. - * Copyright 2017-2020 Fred N. van Kempen. + * Copyright 2016-2020 Miran Grca. + * Copyright 2017-2020 Fred N. van Kempen. */ #include #include