claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

A slight reorganization of the source tree and fixed a warning in disk/mo.c.

Browse Source
This commit is contained in:
OBattler
2020-06-13 10:17:57 +02:00
parent d94db23979
commit 9c6f0d806e
37 changed files with 40 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel_420ex.c → src/chipset/intel_420ex.c
View File

@@ -31,7 +31,7 @@
#include <86box/hdc_ide.h>
#include <86box/hdc.h>
#include <86box/machine.h>
#include <86box/intel_420ex.h>
#include <86box/chipset.h>
#define MEM_STATE_SHADOW_R 0x01

7
src/chipset/intel_4x0.c
View File

@@ -10,8 +10,7 @@
*
*
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Authors: Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2019,2020 Miran Grca.
*/
@@ -1659,9 +1658,9 @@ const device_t i430fx_device =
};
const device_t i430fx_pb640_device =
const device_t i430fx_rev02_device =
{
"Intel SB82437FX-66 (PB640)",
"Intel SB82437FX-66 (Rev. 02)",
DEVICE_PCI,
0x0200 | INTEL_430FX,
i4x0_init,

6
src/intel_piix.c → src/chipset/intel_piix.c
View File

@@ -13,10 +13,8 @@
*
*
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Authors: Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2008-2020 Sarah Walker.
* Copyright 2016-2020 Miran Grca.
*/
#include <stdarg.h>
@@ -53,7 +51,7 @@
#include <86box/zip.h>
#include <86box/machine.h>
#include <86box/smbus_piix4.h>
#include <86box/piix.h>
#include <86box/chipset.h>
typedef struct

6
src/intel_sio.c → src/chipset/intel_sio.c
View File

@@ -8,10 +8,8 @@
*
*
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Authors: Miran Grca, <mgrca8@gmail.com>
*
* Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2018 Miran Grca.
*/
#include <stdint.h>
@@ -30,7 +28,7 @@
#include <86box/pit.h>
#include <86box/port_92.h>
#include <86box/machine.h>
#include <86box/intel_sio.h>
#include <86box/chipset.h>
typedef struct

2
src/via_vt82c586b.c → src/chipset/via_vt82c586b.c
View File

@@ -45,7 +45,7 @@
#include <86box/hdc_ide_sff8038i.h>
#include <86box/zip.h>
#include <86box/machine.h>
#include <86box/via_vt82c586b.h>
#include <86box/chipset.h>
#define ACPI_TIMER_FREQ 3579545

2
src/via_vt82c596b.c → src/chipset/via_vt82c596b.c
View File

@@ -49,7 +49,7 @@
#include <86box/hdc_ide_sff8038i.h>
#include <86box/zip.h>
#include <86box/machine.h>
#include <86box/via_vt82c586b.h>
#include <86box/chipset.h>
// As of now
#include <86box/smbus_piix4.h>

9
src/disk/mo.c
View File

@@ -12,8 +12,8 @@
*
*
* Authors: Natalia Portillo <claunia@claunia.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
* Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2020 Miran Grca.
*/
@@ -29,7 +29,6 @@
#include <86box/config.h>
#include <86box/timer.h>
#include <86box/device.h>
#include <86box/piix.h>
#include <86box/scsi_device.h>
#include <86box/nvr.h>
#include <86box/plat.h>
@@ -1298,7 +1297,6 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
int ret;
int32_t len, max_len;
int32_t alloc_length;
uint32_t i = 0;
int size_idx, idx = 0;
unsigned preamble_len;
int32_t blen = 0;
@@ -1864,9 +1862,6 @@ mo_phase_data_out(scsi_common_t *sc)
uint8_t hdr_len, val, old_val, ch;
uint32_t last_to_write = 0;
uint32_t c, h, s;
int len = 0;
switch(dev->current_cdb[0]) {

1
src/disk/zip.c
View File

@@ -27,7 +27,6 @@
#include <86box/config.h>
#include <86box/timer.h>
#include <86box/device.h>
#include <86box/piix.h>
#include <86box/scsi_device.h>
#include <86box/nvr.h>
#include <86box/plat.h>

1
src/ibm_5161.c
View File

@@ -28,7 +28,6 @@
#include <86box/pit.h>
#include <86box/port_92.h>
#include <86box/machine.h>
#include <86box/intel_sio.h>
typedef struct

26
src/include/86box/chipset.h
View File

@@ -32,22 +32,33 @@ extern const device_t headland_device;
extern const device_t headland_386_device;
/* Intel 4x0xX */
extern const device_t i420ex_device;
extern const device_t i420tx_device;
extern const device_t i420zx_device;
extern const device_t i430lx_device;
extern const device_t i430nx_device;
extern const device_t i430fx_device;
extern const device_t i430fx_pb640_device;
extern const device_t i430fx_rev02_device;
extern const device_t i430hx_device;
extern const device_t i430vx_device;
extern const device_t i430tx_device;
extern const device_t i440fx_device;
extern const device_t i440lx_device;
extern const device_t i440ex_device;
extern const device_t i440lx_device;
extern const device_t i440ex_device;
extern const device_t i440bx_device;
extern const device_t i440gx_device;
extern const device_t i440zx_device;
extern const device_t sio_device;
extern const device_t sio_zb_device;
extern const device_t piix_device;
extern const device_t piix_rev02_device;
extern const device_t piix3_device;
extern const device_t piix4_device;
extern const device_t piix4e_device;
extern const device_t slc90e66_device;
extern const device_t ioapic_device;
/* OPTi */
@@ -71,9 +82,12 @@ extern const device_t sis_85c50x_device;
/* VIA */
extern const device_t via_vpx_device;
extern const device_t via_vp3_device;
extern const device_t via_mvp3_device;
extern const device_t via_apro_device;
extern const device_t via_vp3_device;
extern const device_t via_mvp3_device;
extern const device_t via_apro_device;
extern const device_t via_vt82c586b_device;
extern const device_t via_vt82c596b_device;
/* VLSI */
extern const device_t vlsi_scamp_device;

15
src/include/86box/intel_420ex.h
View File

@@ -1,15 +0,0 @@
/*
* 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.
*
* Emulation of Intel 420EX PCI chip.
*
*
*
* Author: Miran Grca, <mgrca8@gmail.com>
* Copyright 2020 Miran Grca.
*/
extern const device_t i420ex_device;

18
src/include/86box/intel_sio.h
View File

@@ -1,18 +0,0 @@
/*
* 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.
*
* Emulation of Intel System I/O PCI chip.
*
*
*
* Author: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2018 Miran Grca.
*/
extern const device_t sio_device;
extern const device_t sio_zb_device;

25
src/include/86box/piix.h
View File

@@ -1,25 +0,0 @@
/*
* 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.
*
* Emulation of the Intel PIIX, PIIX3, PIIX4, PIIX4E, and SMSC
* SLC90E66 (Victory66) Xcelerators.
*
* Emulation core dispatcher.
*
*
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Copyright 2008-2020 Sarah Walker.
* Copyright 2016-2020 Miran Grca.
*/
extern const device_t piix_device;
extern const device_t piix_rev02_device;
extern const device_t piix3_device;
extern const device_t piix4_device;
extern const device_t piix4e_device;
extern const device_t slc90e66_device;

21
src/include/86box/via_vt82c586b.h
View File

@@ -1,21 +0,0 @@
/*
* 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.
*
* Emulation of the VIA Apollo MVP3 southbridge
*
*
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Melissa Goad, <mszoopers@protonmail.com>
*
* Copyright 2008-2020 Sarah Walker.
* Copyright 2016-2020 Miran Grca.
* Copyright 2020 Melissa Goad.
*/
extern const device_t via_vt82c586b_device;
extern const device_t via_vt82c596b_device;

2
src/machine/m_at_386dx_486.c
View File

@@ -40,8 +40,6 @@
#include <86box/video.h>
#include <86box/intel_flash.h>
#include <86box/sst_flash.h>
#include <86box/intel_420ex.h>
#include <86box/intel_sio.h>
#include <86box/scsi_ncr53c8xx.h>
#include <86box/machine.h>

3
src/machine/m_at_slot1.c
View File

@@ -30,10 +30,7 @@
#include <86box/hdc_ide.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/intel_sio.h>
#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/intel_sio.h>
#include <86box/sst_flash.h>
#include <86box/hwm.h>
#include <86box/spd.h>

3
src/machine/m_at_slot2.c
View File

@@ -32,10 +32,7 @@
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/sst_flash.h>
#include <86box/intel_sio.h>
#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/intel_sio.h>
#include <86box/hwm.h>
#include <86box/spd.h>
#include <86box/video.h>

3
src/machine/m_at_socket370.c
View File

@@ -30,9 +30,6 @@
#include <86box/hdc_ide.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/via_vt82c586b.h>
#include <86box/intel_sio.h>
#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/sst_flash.h>
#include <86box/hwm.h>

2
src/machine/m_at_socket4_5.c
View File

@@ -35,9 +35,7 @@
#include <86box/fdc.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/intel_sio.h>
#include <86box/nvr.h>
#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/video.h>
#include <86box/machine.h>

5
src/machine/m_at_socket7_s7.c
View File

@@ -34,11 +34,8 @@
#include <86box/hdc_ide.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/intel_sio.h>
#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/sst_flash.h>
#include <86box/via_vt82c586b.h>
#include <86box/hwm.h>
#include <86box/video.h>
#include <86box/spd.h>
@@ -180,7 +177,7 @@ machine_at_pb640_init(const machine_t *model)
pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 1, 3, 4);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 2, 1, 4);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430fx_pb640_device);
device_add(&i430fx_rev02_device);
device_add(&piix_rev02_device);
if (gfxcard == VID_INTERNAL)

2
src/machine/m_at_socket8.c
View File

@@ -31,8 +31,6 @@
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/sst_flash.h>
#include <86box/intel_sio.h>
#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/sst_flash.h>
#include <86box/hwm.h>

3
src/machine/m_at_super7_ss7.c → src/machine/m_at_sockets7.c
View File

@@ -34,11 +34,8 @@
#include <86box/hdc_ide.h>
#include <86box/keyboard.h>
#include <86box/intel_flash.h>
#include <86box/intel_sio.h>
#include <86box/piix.h>
#include <86box/sio.h>
#include <86box/sst_flash.h>
#include <86box/via_vt82c586b.h>
#include <86box/spd.h>
#include <86box/hwm.h>
#include <86box/video.h>

1
src/scsi/scsi_cdrom.c
View File

@@ -27,7 +27,6 @@
#include <86box/config.h>
#include <86box/timer.h>
#include <86box/device.h>
#include <86box/piix.h>
#include <86box/scsi_device.h>
#include <86box/nvr.h>
#include <86box/hdc.h>

1
src/scsi/scsi_disk.c
View File

@@ -23,7 +23,6 @@
#include <86box/timer.h>
#include <86box/device.h>
#include <86box/nvr.h>
#include <86box/piix.h>
#include <86box/hdd.h>
#include <86box/hdc.h>
#include <86box/scsi_device.h>

0
src/sio_acc3221.c → src/sio/sio_acc3221.c
View File

0
src/sio_detect.c → src/sio/sio_detect.c
View File

0
src/sio_f82c710.c → src/sio/sio_f82c710.c
View File

0
src/sio_fdc37c669.c → src/sio/sio_fdc37c669.c
View File

0
src/sio_fdc37c66x.c → src/sio/sio_fdc37c66x.c
View File

0
src/sio_fdc37c93x.c → src/sio/sio_fdc37c93x.c
View File

0
src/sio_pc87306.c → src/sio/sio_pc87306.c
View File

0
src/sio_um8669f.c → src/sio/sio_um8669f.c
View File

0
src/sio_w83787f.c → src/sio/sio_w83787f.c
View File

0
src/sio_w83877f.c → src/sio/sio_w83877f.c
View File

0
src/sio_w83977f.c → src/sio/sio_w83977f.c
View File

8
src/win/Makefile.mingw
View File

@@ -175,7 +175,7 @@ ifndef USB
USB := n
endif
ifndef DINPUT
DINPUT := y
DINPUT := n
endif
ifndef OPENAL
OPENAL := y
@@ -248,7 +248,7 @@ endif
VPATH := $(EXPATH) . cpu cpu_common \
cdrom chipset disk floppy game machine \
printer \
sound \
sio sound \
sound/munt sound/munt/c_interface sound/munt/sha1 \
sound/munt/srchelper sound/munt/srchelper/srctools/src \
sound/resid-fp \
@@ -544,8 +544,8 @@ MCHOBJ := machine.o machine_table.o \
m_ps2_isa.o m_ps2_mca.o \
m_at_compaq.o \
m_at_286_386sx.o m_at_386dx_486.o \
m_at_socket4_5.o m_at_socket7_s7.o m_at_super7_ss7.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o $(SERIAL) \
sio_detect.o sio_acc3221.o \

6
src/win/Makefile_ndr.mingw
View File

@@ -245,7 +245,7 @@ endif
VPATH := $(EXPATH) . cpu_new cpu_common \
cdrom chipset disk floppy game machine \
printer \
sound \
sio sound \
sound/munt sound/munt/c_interface sound/munt/sha1 \
sound/munt/srchelper sound/munt/srchelper/srctools/src \
sound/resid-fp \
@@ -548,8 +548,8 @@ MCHOBJ := machine.o machine_table.o \
m_ps2_isa.o m_ps2_mca.o \
m_at_compaq.o \
m_at_286_386sx.o m_at_386dx_486.o \
m_at_socket4_5.o m_at_socket7_s7.o m_at_super7_ss7.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
DEVOBJ := bugger.o hwm.o hwm_lm75.o hwm_lm78.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o $(SERIAL) \
sio_acc3221.o \