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

Another major cleanup - folders for cdrom and floppy, renamed disc to floppy, renamed SuperIO stuff, others as needed.

Browse Source
This commit is contained in:
waltje
2017-09-04 01:52:29 -04:00
parent 0ef876ef36
commit 73ef17be9e
99 changed files with 2546 additions and 2068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/machine/machine.c
View File

@@ -8,7 +8,7 @@
*
* Handling of the emulated machines.
*
* Version: @(#)machine.c 1.0.9 2017/09/02
* Version: @(#)machine.c 1.0.11 2017/09/03
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -17,16 +17,13 @@
*/
#include <stdint.h>
#include <stdio.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../disc.h"
#include "../fdc.h"
#include "../fdd.h"
#include "../io.h"
#include "../device.h"
#include "../floppy/floppy.h"
#include "../floppy/fdc.h"
#include "../floppy/fdd.h"
#include "machine.h"
#include "machine_common.h"
@@ -62,7 +59,6 @@
#include "machine_at_440fx.h"
#include "../video/vid_pcjr.h"
#include "../video/vid_tandy.h"
#include "../video/vid_tandysl.h"
@@ -85,7 +81,7 @@ machine_t machines[] =
{"[8088] Generic XT clone", ROM_GENXT, "genxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, 0, 64, 640, 64, 0, machine_xt_init, NULL },
{"[8088] Juko XT clone", ROM_JUKOPC, "jukopc", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, 0, 64, 640, 64, 0, machine_xt_init, NULL },
{"[8088] Phoenix XT clone", ROM_PXXT, "pxxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, 0, 64, 640, 64, 0, machine_xt_init, NULL },
{"[8088] Schneider EuroPC", ROM_EUROPC, "europc", {{"", cpus_europc}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, 0, 512, 640, 128, 0, machine_europc_init, NULL },
{"[8088] Schneider EuroPC", ROM_EUROPC, "europc", {{"Siemens", cpus_europc}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, 0, 512, 640, 128, 0, machine_europc_init, NULL },
{"[8088] Tandy 1000", ROM_TANDY, "tandy", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, 0, 128, 640, 128, 0, machine_tandy1k_init, tandy1000_get_device },
{"[8088] Tandy 1000 HX", ROM_TANDY1000HX, "tandy1000hx", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, 0, 256, 640, 128, 0, machine_tandy1k_init, tandy1000hx_get_device },
{"[8088] VTech Laser Turbo XT", ROM_LTXT, "ltxt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, 0, 64, 1152, 64, 0, machine_xt_laserxt_init, NULL },

20
src/machine/machine_amstrad.c
View File

@@ -1,21 +1,19 @@
#include <stdlib.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../disc.h"
#include "../fdd.h"
#include "../fdc.h"
#include "../gameport.h"
#include "../io.h"
#include "../nmi.h"
#include "../mem.h"
#include "../device.h"
#include "../nvr.h"
#include "../gameport.h"
#include "../keyboard.h"
#include "../keyboard_amstrad.h"
#include "../lpt.h"
#include "../mem.h"
#include "../mouse.h"
#include "../nmi.h"
#include "../nvr.h"
#include "../lpt.h"
#include "../floppy/floppy.h"
#include "../floppy/fdd.h"
#include "../floppy/fdc.h"
#include "machine_common.h"

21
src/machine/machine_at.c
View File

@@ -1,20 +1,19 @@
#include "../ibm.h"
#include "../bugger.h"
#include "../device.h"
#include "../dma.h"
#include "../gameport.h"
#include "../hdd/hdd_ide_at.h"
#include "../keyboard_at.h"
#include "../lpt.h"
#include "../mem.h"
#include "../nvr.h"
#include "../pic.h"
#include "../pit.h"
#include "../dma.h"
#include "../mem.h"
#include "../device.h"
#include "../nvr.h"
#include "../bugger.h"
#include "../gameport.h"
#include "../keyboard_at.h"
#include "../lpt.h"
#include "../hdd/hdd_ide_at.h"
#include "machine_common.h"
#include "machine_at.h"
void machine_at_init(void)
{
AT = 1;

15
src/machine/machine_at_430fx.c
View File

@@ -8,28 +8,23 @@
*
* Implementation of the Intel 430FX PCISet chip.
*
* Version: @(#)machine_at_430fx.c 1.0.3 2017/09/02
* Version: @(#)machine_at_430fx.c 1.0.4 2017/09/03
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016-2017 Miran Grca.
* Copyright 2016,2017 Miran Grca.
*/
#include <string.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../fdc37c665.h"
#include "../intel_flash.h"
#include "../mem.h"
#include "../memregs.h"
#include "../pc87306.h"
#include "../pci.h"
#include "../device.h"
#include "../piix.h"
#include "../w83877f.h"
#include "../intel_flash.h"
#include "../sio.h"
#include "machine_at.h"
#include "machine_at_430fx.h"

14
src/machine/machine_at_430hx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 430HX PCISet chip.
*
* Version: @(#)machine_at_430hx.c 1.0.3 2017/09/02
* Version: @(#)machine_at_430hx.c 1.0.4 2017/09/03
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -16,22 +16,16 @@
* Copyright 2016-2017 Miran Grca.
*/
#include <string.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../fdc37c669.h"
#include "../fdc37c932fr.h"
#include "../io.h"
#include "../intel_flash.h"
#include "../mem.h"
#include "../memregs.h"
#include "../pc87306.h"
#include "../pci.h"
#include "../device.h"
#include "../piix.h"
#include "../w83877f.h"
#include "../intel_flash.h"
#include "../sio.h"
#include "machine_at.h"
#include "machine_at_430hx.h"

13
src/machine/machine_at_430lx_nx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 430LX and 430NX PCISet chips.
*
* Version: @(#)machine_at_430lx_nx.c 1.0.3 2017/09/02
* Version: @(#)machine_at_430lx_nx.c 1.0.4 2017/09/03
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -16,19 +16,16 @@
* Copyright 2016-2017 Miran Grca.
*/
#include <string.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../fdc37c665.h"
#include "../intel.h"
#include "../intel_flash.h"
#include "../mem.h"
#include "../memregs.h"
#include "../pci.h"
#include "../device.h"
#include "../intel.h"
#include "../intel_flash.h"
#include "../intel_sio.h"
#include "../sio.h"
#include "machine_at.h"
#include "machine_at_430lx_nx.h"

15
src/machine/machine_at_430vx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 430VX PCISet chip.
*
* Version: @(#)machine_at_430vx.c 1.0.4 2017/09/02
* Version: @(#)machine_at_430vx.c 1.0.5 2017/09/03
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -16,21 +16,16 @@
* Copyright 2016-2017 Miran Grca.
*/
#include <string.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../fdc37c932fr.h"
#include "../io.h"
#include "../pci.h"
#include "../mem.h"
#include "../memregs.h"
#include "../intel_flash.h"
#include "../pci.h"
#include "../device.h"
#include "../piix.h"
#include "../um8669f.h"
#include "../w83877f.h"
#include "../intel_flash.h"
#include "../sio.h"
#include "machine_at.h"
#include "machine_at_430vx.h"

13
src/machine/machine_at_440fx.c
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Intel 440FX PCISet chip.
*
* Version: @(#)machine_at_440fx.c 1.0.3 2017/09/02
* Version: @(#)machine_at_440fx.c 1.0.4 2017/09/03
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -16,19 +16,16 @@
* Copyright 2016-2017 Miran Grca.
*/
#include <string.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../fdc37c665.h"
#include "../intel_flash.h"
#include "../io.h"
#include "../pci.h"
#include "../mem.h"
#include "../memregs.h"
#include "../pci.h"
#include "../device.h"
#include "../piix.h"
#include "../intel_flash.h"
#include "../sio.h"
#include "machine_at.h"
#include "machine_at_440fx.h"

5
src/machine/machine_at_ali1429.c
View File

@@ -2,14 +2,11 @@
see COPYING for more details
*/
#include <string.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../hdd/hdd_ide_at.h"
#include "../io.h"
#include "../mem.h"
#include "../hdd/hdd_ide_at.h"
#include "machine_at.h"
#include "machine_at_ali1429.h"

3
src/machine/machine_at_commodore.c
View File

@@ -1,12 +1,11 @@
#include "../ibm.h"
#include "../io.h"
#include "../lpt.h"
#include "../serial.h"
#include "machine_at.h"
#include "machine_at_commodore.h"
static void cbm_io_write(uint16_t port, uint8_t val, void *p)
{
lpt1_remove();

2
src/machine/machine_at_compaq.c
View File

@@ -2,10 +2,8 @@
see COPYING for more details
*/
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../mem.h"
#include "machine_at.h"
#include "machine_at_compaq.h"

2
src/machine/machine_at_headland.c
View File

@@ -2,11 +2,9 @@
see COPYING for more details
*/
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../io.h"
#include "../mem.h"
#include "machine_at.h"
#include "machine_at_headland.h"

2
src/machine/machine_at_neat.c
View File

@@ -3,10 +3,8 @@
*/
/*This is the chipset used in the AMI 286 clone model*/
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../io.h"
#include "machine_at.h"
#include "machine_at_neat.h"

2
src/machine/machine_at_opti495.c
View File

@@ -252,11 +252,9 @@ Note: the block address is forced to be a multiple of the block size by
SeeAlso: #P0178,#P0187
*/
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../io.h"
#include "../mem.h"
#include "machine_at.h"
#include "machine_at_opti495.h"

5
src/machine/machine_at_scat.c
View File

@@ -1,14 +1,13 @@
/*This is the chipset used in the Award 286 clone model*/
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../cpu/x86.h"
#include "../io.h"
#include "../mem.h"
#include "../cpu/x86.h"
#include "machine_at.h"
#include "machine_at_scat.h"
#define SCAT_DMA_WAIT_STATE_CONTROL 0x01
#define SCAT_VERSION 0x40
#define SCAT_CLOCK_CONTROL 0x41

14
src/machine/machine_at_sis_85c471.c
View File

@@ -9,22 +9,20 @@
* SiS sis85c471 Super I/O Chip
* Used by DTK PKM-0038S E-2
*
* Version: @(#)sis85c471.c 1.0.3 2017/09/02
* Version: @(#)sis85c471.c 1.0.4 2017/09/03
*
* Author: Miran Grca, <mgrca8@gmail.com>
* Copyright 2017 Miran Grca.
*/
#include "../ibm.h"
#include "../disc.h"
#include "../fdc.h"
#include "../fdd.h"
#include "../hdd/hdd_ide_at.h"
#include "../io.h"
#include "../lpt.h"
#include "../memregs.h"
#include "../lpt.h"
#include "../serial.h"
#include "../floppy/floppy.h"
#include "../floppy/fdc.h"
#include "../floppy/fdd.h"
#include "../hdd/hdd_ide_at.h"
#include "machine_at.h"
#include "machine_at_sis_85c471.h"

7
src/machine/machine_at_sis_85c496.c
View File

@@ -2,16 +2,13 @@
see COPYING for more details
*/
#include <stdlib.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../fdc37c665.h"
#include "../io.h"
#include "../pci.h"
#include "../mem.h"
#include "../memregs.h"
#include "../pci.h"
#include "../sio.h"
#include "machine_at.h"
#include "machine_at_sis_85c496.h"

5
src/machine/machine_at_sis_85c50x.c
View File

@@ -12,13 +12,10 @@
* Copyright 2017 Miran Grca.
*/
#include <stdlib.h>
#include "../ibm.h"
#include "../io.h"
#include "../mem.h"
#include "../pci.h"
#include "../mem.h"
#include "machine_at.h"
#include "machine_at_sis_85c50x.h"

6
src/machine/machine_at_wd76c10.c
View File

@@ -2,13 +2,11 @@
see COPYING for more details
*/
#include "../ibm.h"
#include "../disc.h"
#include "../fdc.h"
#include "../io.h"
#include "../mem.h"
#include "../serial.h"
#include "../floppy/floppy.h"
#include "../floppy/fdc.h"
#include "machine_at.h"
#include "machine_at_wd76c10.h"

11
src/machine/machine_common.c
View File

@@ -1,16 +1,15 @@
#include "../ibm.h"
#include "../dma.h"
#include "../disc.h"
#include "../fdd.h"
#include "../fdc.h"
#include "../lpt.h"
#include "../pic.h"
#include "../pit.h"
#include "../lpt.h"
#include "../serial.h"
#include "../floppy/floppy.h"
#include "../floppy/fdd.h"
#include "../floppy/fdc.h"
#include "machine_common.h"
void machine_common_init(void)
{
/* System devices first. */

12
src/machine/machine_europc.c
View File

@@ -3,25 +3,23 @@
*/
#include <stdio.h>
#include <string.h>
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../io.h"
#include "../nmi.h"
#include "../mem.h"
#include "../rom.h"
#include "../device.h"
#include "../gameport.h"
#include "../keyboard_xt.h"
#include "../lpt.h"
#include "../mem.h"
#include "../nmi.h"
#include "../rom.h"
#include "machine_common.h"
#include "machine_europc.h"
uint8_t europcdat[16];
struct
{
uint8_t dat[16];
@@ -47,7 +45,7 @@ static uint8_t jim_load_nvr(void)
}
void jim_save_nvr(void)
void europc_save_nvr(void)
{
FILE *f;

2
src/machine/machine_europc.h
View File

@@ -1,3 +1,3 @@
void jim_save_nvr(void);
void europc_save_nvr(void);
void machine_europc_init(void);

10
src/machine/machine_olivetti_m24.c
View File

@@ -2,16 +2,14 @@
see COPYING for more details
*/
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../io.h"
#include "../nmi.h"
#include "../mem.h"
#include "../device.h"
#include "../nvr.h"
#include "../gameport.h"
#include "../keyboard_olim24.h"
#include "../mem.h"
#include "../nmi.h"
#include "../nvr.h"
#include "../io.h"
#include "machine_common.h"
#include "machine_olivetti_m24.h"

15
src/machine/machine_pcjr.c
View File

@@ -1,19 +1,18 @@
#include "../ibm.h"
#include "../device.h"
#include "../disc.h"
#include "../fdc.h"
#include "../fdd.h"
#include "../keyboard_pcjr.h"
#include "../mem.h"
#include "../nmi.h"
#include "../pic.h"
#include "../pit.h"
#include "../mem.h"
#include "../device.h"
#include "../serial.h"
#include "../keyboard_pcjr.h"
#include "../floppy/floppy.h"
#include "../floppy/fdc.h"
#include "../floppy/fdd.h"
#include "../sound/snd_sn76489.h"
#include "machine_pcjr.h"
void machine_pcjr_init(void)
{
mem_add_bios();

24
src/machine/machine_ps1.c
View File

@@ -2,26 +2,24 @@
see COPYING for more details
*/
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../disc.h"
#include "../dma.h"
#include "../gameport.h"
#include "../hdd/hdd_ide_at.h"
#include "../fdd.h"
#include "../fdc.h"
#include "../io.h"
#include "../keyboard_at.h"
#include "../lpt.h"
#include "../mem.h"
#include "../nvr.h"
#include "../dma.h"
#include "../pic.h"
#include "../pit.h"
#include "../mem.h"
#include "../rom.h"
#include "../device.h"
#include "../nvr.h"
#include "../gameport.h"
#include "../lpt.h"
#include "../serial.h"
#include "../keyboard_at.h"
#include "../floppy/floppy.h"
#include "../floppy/fdd.h"
#include "../floppy/fdc.h"
#include "../hdd/hdd_ide_at.h"
#include "../sound/snd_ps1.h"
#include "machine_common.h"
#include "machine_ps1.h"

22
src/machine/machine_ps2_isa.c
View File

@@ -1,22 +1,20 @@
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../device.h"
#include "../disc.h"
#include "../dma.h"
#include "../fdd.h"
#include "../fdc.h"
#include "../io.h"
#include "../dma.h"
#include "../pic.h"
#include "../pit.h"
#include "../mem.h"
#include "../rom.h"
#include "../device.h"
#include "../nvr.h"
#include "../keyboard.h"
#include "../keyboard_at.h"
#include "../lpt.h"
#include "../mem.h"
#include "../nvr.h"
#include "../pic.h"
#include "../pit.h"
#include "../rom.h"
#include "../serial.h"
#include "../floppy/floppy.h"
#include "../floppy/fdd.h"
#include "../floppy/fdc.h"
#include "machine_common.h"
#include "machine_ps2_isa.h"

20
src/machine/machine_ps2_mca.c
View File

@@ -1,22 +1,20 @@
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../cpu/x86.h"
#include "../device.h"
#include "../dma.h"
#include "../io.h"
#include "../keyboard_at.h"
#include "../lpt.h"
#include "../mca.h"
#include "../mem.h"
#include "../mouse.h"
#include "../nvr.h"
#include "../dma.h"
#include "../pic.h"
#include "../pit.h"
#include "../mca.h"
#include "../mem.h"
#include "../rom.h"
#include "../ps2_nvr.h"
#include "../device.h"
#include "../nvr.h"
#include "../nvr_ps2.h"
#include "../keyboard_at.h"
#include "../lpt.h"
#include "../mouse.h"
#include "../serial.h"
#include "machine_common.h"
#include "machine_ps2_mca.h"

7
src/machine/machine_tandy.c
View File

@@ -1,17 +1,16 @@
#include "../ibm.h"
#include "../nmi.h"
#include "../mem.h"
#include "../device.h"
#include "../gameport.h"
#include "../keyboard_xt.h"
#include "../mem.h"
#include "../nmi.h"
#include "../tandy_eeprom.h"
#include "../tandy_rom.h"
#include "../sound/snd_pssj.h"
#include "../sound/snd_sn76489.h"
#include "machine_common.h"
void machine_tandy1k_init(void)
{
TANDY = 1;

13
src/machine/machine_xt.c
View File

@@ -1,16 +1,15 @@
#include "../ibm.h"
#include "../bugger.h"
#include "../device.h"
#include "../gameport.h"
#include "../keyboard_xt.h"
#include "../mem.h"
#include "../nmi.h"
#include "../pit.h"
#include "../mem.h"
#include "../device.h"
#include "../bugger.h"
#include "../gameport.h"
#include "../keyboard_xt.h"
#include "machine_common.h"
#include "machine_xt.h"
void machine_xt_init(void)
{
machine_common_init();

2
src/machine/machine_xt_laserxt.c
View File

@@ -1,10 +1,8 @@
/*This is the chipset used in the LaserXT series model*/
#include "../ibm.h"
#include "../cpu/cpu.h"
#include "../io.h"
#include "../mem.h"
#include "machine_xt.h"
#include "machine_xt_laserxt.h"