claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
Files
952ddfc63fbfc363a3d986d5b6c3dc072692af17
86Box/src/machine/machine.h

206 lines
6.2 KiB
C
Raw Normal View History

Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
/*
* 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.
*
* Handling of the emulated machines.
*
Added the Toshiba T1000 and T1200.
2018-03-02 19:33:02 +01:00
* Version: @(#)machine.h 1.0.20 2018/03/02
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
* Fred N. van Kempen, <decwiz@yahoo.com>
*
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
* Copyright 2008-2018 Sarah Walker.
The IBM AT and the IBM XT 286 now have a FDC again.
2018-01-24 00:35:52 +01:00
* Copyright 2016-2018 Miran Grca.
* Copyright 2017,2018 Fred N. van Kempen.
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
*/
#ifndef EMU_MACHINE_H
# define EMU_MACHINE_H
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
/* Machine feature flags. */
#define MACHINE_PC 0x000000 /* PC architecture */
#define MACHINE_AT 0x000001 /* PC/AT architecture */
#define MACHINE_PS2 0x000002 /* PS/2 architecture */
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
#define MACHINE_ISA 0x000010 /* sys has ISA bus */
#define MACHINE_CBUS 0x000020 /* sys has C-BUS bus */
#define MACHINE_EISA 0x000040 /* sys has EISA bus */
#define MACHINE_VLB 0x000080 /* sys has VL bus */
#define MACHINE_MCA 0x000100 /* sys has MCA bus */
#define MACHINE_PCI 0x000200 /* sys has PCI bus */
#define MACHINE_AGP 0x000400 /* sys has AGP bus */
#define MACHINE_HDC 0x001000 /* sys has int HDC */
#define MACHINE_HDC_PS2 0x002000 /* sys has int PS/2 HDC */
#define MACHINE_MOUSE 0x004000 /* sys has int mouse */
#define MACHINE_VIDEO 0x008000 /* sys has int video */
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
Fix for ROMs not loading properly on many machines - my bad.
2017-10-13 02:41:17 -04:00
#define IS_ARCH(m, a) (machines[(m)].flags & (a)) ? 1 : 0;
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
typedef struct _machine_ {
Changed the machines to use a table file.
2017-11-08 16:27:10 -05:00
const char *name;
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
int id;
Changed the machines to use a table file.
2017-11-08 16:27:10 -05:00
const char *internal_name;
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
struct {
Changed the machines to use a table file.
2017-11-08 16:27:10 -05:00
const char *name;
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
#ifdef EMU_CPU_H
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
CPU *cpus;
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
#else
void *cpus;
#endif
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
} cpu[5];
int fixed_gfxcard;
int flags;
int min_ram, max_ram;
int ram_granularity;
int nvrmask;
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
void (*init)(struct _machine_ *);
#ifdef EMU_DEVICE_H
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
device_t *(*get_device)(void);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
#else
void *get_device;
#endif
The Compaq Portable III and III/386 now have the Olivetti M24 display adapter (though pending implementation of Compaq-specific registers); Bugfixes in config.c regarding CD-ROM defaults and IDE channel reading; Applied all the PCem Voodoo commits; The Sound Blaster cards' OPL can now be disabled for slight performance gain.
2017-11-22 18:14:27 +01:00
void (*nvr_close)(void);
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
} machine_t;
/* Global variables. */
extern machine_t machines[];
extern int machine;
Cleanup, moving stuff out of ibm.h and such. Moved more configuration variables into main. Minor changes for multiplatform.
2017-11-02 02:28:00 -05:00
extern int romset;
Major commit, cleaning a lot of old stuff. IBM.H is gone, video stuff re-organized. Keyboard stuff reorganized. Machines that have their own video, mouse and/or keyboard now have all this in their machine file. Fixed and other cleanups here and there.
2017-11-05 01:57:04 -05:00
extern int AT, PCI;
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
/* Core functions. */
extern int machine_count(void);
extern int machine_getromset(void);
extern int machine_getmachine(int romset);
extern char *machine_getname(void);
extern char *machine_get_internal_name(void);
extern int machine_get_machine_from_internal_name(char *s);
extern void machine_init(void);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
#ifdef EMU_DEVICE_H
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
extern device_t *machine_getdevice(int machine);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
#endif
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
extern int machine_getromset_ex(int m);
extern char *machine_get_internal_name_ex(int m);
extern int machine_get_nvrmask(int m);
The Compaq Portable III and III/386 now have the Olivetti M24 display adapter (though pending implementation of Compaq-specific registers); Bugfixes in config.c regarding CD-ROM defaults and IDE channel reading; Applied all the PCem Voodoo commits; The Sound Blaster cards' OPL can now be disabled for slight performance gain.
2017-11-22 18:14:27 +01:00
extern void machine_close(void);
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
/* Initialization functions for boards and systems. */
extern void machine_common_init(machine_t *);
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
extern void machine_at_common_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_init(machine_t *);
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
extern void machine_at_ps2_init(machine_t *);
extern void machine_at_common_ide_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_ide_init(machine_t *);
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
extern void machine_at_ps2_ide_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_top_remap_init(machine_t *);
extern void machine_at_ide_top_remap_init(machine_t *);
The IBM AT and the IBM XT 286 now have a FDC again.
2018-01-24 00:35:52 +01:00
extern void machine_at_ibm_init(machine_t *);
Renamed the Paradise WD90C11 Standalone to Paradise WD90C11-LR and made it use the correct BIOS; Added the Paradise PVGA1A (standalone) and the Paradise WD90C30-LR, both with configurable video memory; Added the Toshiba T3100e.
2017-12-31 06:37:19 +01:00
extern void machine_at_t3100e_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_p54tp4xe_init(machine_t *);
extern void machine_at_endeavor_init(machine_t *);
extern void machine_at_zappa_init(machine_t *);
extern void machine_at_mb500n_init(machine_t *);
extern void machine_at_president_init(machine_t *);
extern void machine_at_thor_init(machine_t *);
extern void machine_at_acerm3a_init(machine_t *);
extern void machine_at_acerv35n_init(machine_t *);
extern void machine_at_ap53_init(machine_t *);
extern void machine_at_p55t2p4_init(machine_t *);
extern void machine_at_p55t2s_init(machine_t *);
extern void machine_at_batman_init(machine_t *);
extern void machine_at_plato_init(machine_t *);
extern void machine_at_p55tvp4_init(machine_t *);
extern void machine_at_i430vx_init(machine_t *);
extern void machine_at_p55va_init(machine_t *);
Moved the two Laser XT machines to the Dev branch.
2018-01-28 17:56:32 +01:00
#if defined(DEV_BRANCH) && defined(USE_I686)
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_i440fx_init(machine_t *);
extern void machine_at_s1668_init(machine_t *);
Fixed the last compile-breaking mistakes.
2018-01-01 03:40:59 +01:00
#endif
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_ali1429_init(machine_t *);
extern void machine_at_cmdpc_init(machine_t *);
extern void machine_at_headland_init(machine_t *);
extern void machine_at_neat_init(machine_t *);
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
extern void machine_at_neat_ami_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_opti495_init(machine_t *);
Improved 8042 (AT and PS/2 keyboard controller emulation), no more hacks, split into various devices depending on vendor (generic, AMI, IBM (MCA), Quadtel, Toshiba), and fixed several commands - hopefully fixes all existing AT+ keyboard problems (such as incorrect scan codes on some machine under some circumstances); Fixed a bug in the SMC FDC37C932 emulation, fixes the FDC on the two Acer machines; Re-added some Acer-specific I/O port handlers, fixes entry into CMOS Setup on the two Acer machines.
2018-01-04 07:44:33 +01:00
extern void machine_at_opti495_ami_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_scat_init(machine_t *);
Restored Compaq Portable II and III machines, changes by TheCollector1995. Good job!
2017-11-11 16:03:13 -05:00
extern void machine_at_compaq_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_at_dtk486_init(machine_t *);
extern void machine_at_r418_init(machine_t *);
extern void machine_at_wd76c10_init(machine_t *);
Moved the two Laser XT machines to the Dev branch.
2018-01-28 17:56:32 +01:00
#if defined(DEV_BRANCH) && defined(USE_GREENB)
Added new machine (4GPV31)
2017-12-04 14:50:41 -05:00
extern void machine_at_4gpv31_init(machine_t *);
Reverted the NCR 53C810 to non-threaded code (but still cleaned it up), a bit slower but at least it works with everything that has been tested; Moved the Green B 486 machine to the Dev branch.
2017-12-25 17:57:05 +01:00
#endif
Added new machine (4GPV31)
2017-12-04 14:50:41 -05:00
Re-integration of the Tandy-1000 based machines.
2017-11-10 23:47:04 -05:00
extern void machine_pcjr_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_ps1_m2011_init(machine_t *);
extern void machine_ps1_m2121_init(machine_t *);
extern void machine_ps1_m2133_init(machine_t *);
Re-integration of the Tandy-1000 based machines.
2017-11-10 23:47:04 -05:00
extern void machine_ps2_m30_286_init(machine_t *);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_ps2_model_50_init(machine_t *);
extern void machine_ps2_model_55sx_init(machine_t *);
extern void machine_ps2_model_80_init(machine_t *);
Reverted the NCR 53C810 to non-threaded code (but still cleaned it up), a bit slower but at least it works with everything that has been tested; Moved the Green B 486 machine to the Dev branch.
2017-12-25 17:57:05 +01:00
#ifdef WALTJE
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_ps2_model_80_486_init(machine_t *);
Reverted the NCR 53C810 to non-threaded code (but still cleaned it up), a bit slower but at least it works with everything that has been tested; Moved the Green B 486 machine to the Dev branch.
2017-12-25 17:57:05 +01:00
#endif
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_amstrad_init(machine_t *);
extern void machine_europc_init(machine_t *);
Updated EuroPC NVR handling.
2017-11-19 21:59:38 -05:00
#ifdef EMU_DEVICE_H
extern device_t europc_device,
europc_hdc_device;
#endif
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_olim24_init(machine_t *);
The Compaq Portable III and III/386 now have the Olivetti M24 display adapter (though pending implementation of Compaq-specific registers); Bugfixes in config.c regarding CD-ROM defaults and IDE channel reading; Applied all the PCem Voodoo commits; The Sound Blaster cards' OPL can now be disabled for slight performance gain.
2017-11-22 18:14:27 +01:00
extern void machine_olim24_video_init(void);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_tandy1k_init(machine_t *);
Re-integration of the Tandy-1000 based machines.
2017-11-10 23:47:04 -05:00
extern int tandy1k_eeprom_read(void);
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_xt_init(machine_t *);
More cleanups. Split Compaq Deskpro off to separae file. Renamed PIIX files to intel_ prefix. Re-enabled Compaq machines; the Portable II works fine now.
2017-11-12 03:06:38 -05:00
extern void machine_xt_compaq_init(machine_t *);
Moved the two Laser XT machines to the Dev branch.
2018-01-28 17:56:32 +01:00
#if defined(DEV_BRANCH) && defined(USE_LASERXT)
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
extern void machine_xt_laserxt_init(machine_t *);
Moved the two Laser XT machines to the Dev branch.
2018-01-28 17:56:32 +01:00
#endif
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
Added the Toshiba T1000 and T1200.
2018-03-02 19:33:02 +01:00
extern void machine_xt_t1000_init(machine_t *);
extern void machine_xt_t1200_init(machine_t *);
The Intel Flash device with inverted high bit pin now again correctly responds to reads and writes on the high BIOS mapping, fixes programming the Flash with the AMI BIOS Flash utility; Added internal graphics card option for the Intel Advanced/EV for the on-board S3 Trio64; Fixed configuration for internal graphics card options (using the machine's Configure button) for some machines (PCjr, Tandy 1000, Tandy 1000 HX, and now also the Intel Advanced/EV).
2018-02-09 05:42:40 +01:00
#ifdef EMU_DEVICE_H
extern device_t *pcjr_get_device(void);
extern device_t *tandy1k_get_device(void);
extern device_t *tandy1k_hx_get_device(void);
Added the Toshiba T1000 and T1200.
2018-03-02 19:33:02 +01:00
extern device_t *t1000_get_device(void);
extern device_t *t1200_get_device(void);
The Intel Flash device with inverted high bit pin now again correctly responds to reads and writes on the high BIOS mapping, fixes programming the Flash with the AMI BIOS Flash utility; Added internal graphics card option for the Intel Advanced/EV for the on-board S3 Trio64; Fixed configuration for internal graphics card options (using the machine's Configure button) for some machines (PCjr, Tandy 1000, Tandy 1000 HX, and now also the Intel Advanced/EV).
2018-02-09 05:42:40 +01:00
extern device_t *at_endeavor_get_device(void);
#endif
More general changes and cleanups, mostly in machine/ now. Also updated SCSI and Network device drivers to use new device init method.
2017-10-07 22:18:30 -04:00
Machine code restructure, models are now machines instead and the init functions are in the machine files rather than in machine.c (former model.c), also moved the machine stuff into the machine/ subdirectory.
2017-09-02 20:39:57 +02:00
#endif /*EMU_MACHINE_H*/
Reference in New Issue Copy Permalink