Another massive cleanup run. Ibm.h no longer includes system header files. ROM loading simplified, and moved from mem.c to rom.c. Fixes in Makefile. Corrected mamy wrong includes. Removed old junk from days long gone. First phase of new SCAT chipset driver - no longer gives errors in BIOS, but NOT DONE YET.
This commit is contained in:
waltje
151
src/rom.h
151
src/rom.h
@@ -1,20 +1,145 @@
|
||||
/* Copyright holders: Sarah Walker
|
||||
see COPYING for more details
|
||||
*/
|
||||
extern FILE *romfopen(wchar_t *fn, wchar_t *mode);
|
||||
extern int rom_getfile(wchar_t *fn, wchar_t *s, int size);
|
||||
extern int rom_present(wchar_t *fn);
|
||||
#ifndef EMU_ROM_H
|
||||
# define EMU_ROM_H
|
||||
|
||||
typedef struct rom_t
|
||||
{
|
||||
uint8_t *rom;
|
||||
uint32_t mask;
|
||||
mem_mapping_t mapping;
|
||||
|
||||
#define PCJR (romset==ROM_IBMPCJR)
|
||||
#define AMIBIOS (romset==ROM_AMI386SX || \
|
||||
romset==ROM_AMI486 || \
|
||||
romset==ROM_WIN486)
|
||||
|
||||
|
||||
typedef struct {
|
||||
uint8_t *rom;
|
||||
uint32_t mask;
|
||||
mem_mapping_t mapping;
|
||||
} rom_t;
|
||||
|
||||
extern int rom_init(rom_t *rom, wchar_t *fn, uint32_t address, int size, int mask, int file_offset, uint32_t flags);
|
||||
extern int rom_init_interleaved(rom_t *rom, wchar_t *fn_low, wchar_t *fn_high, uint32_t address, int size, int mask, int file_offset, uint32_t flags);
|
||||
|
||||
extern uint8_t rom_read(uint32_t addr, void *p);
|
||||
extern uint16_t rom_readw(uint32_t addr, void *p);
|
||||
extern uint32_t rom_readl(uint32_t addr, void *p);
|
||||
enum {
|
||||
ROM_IBMPC = 0, /* 301 keyboard error, 131 cassette (!!!) error */
|
||||
ROM_IBMXT, /* 301 keyboard error */
|
||||
ROM_IBMPCJR,
|
||||
ROM_GENXT, /* 'Generic XT BIOS' */
|
||||
ROM_DTKXT,
|
||||
ROM_EUROPC,
|
||||
ROM_OLIM24,
|
||||
ROM_TANDY,
|
||||
ROM_PC1512,
|
||||
ROM_PC200,
|
||||
ROM_PC1640,
|
||||
ROM_PC2086,
|
||||
ROM_PC3086,
|
||||
ROM_AMIXT, /* XT Clone with AMI BIOS */
|
||||
ROM_LTXT,
|
||||
ROM_LXT3,
|
||||
ROM_PX386,
|
||||
ROM_DTK386,
|
||||
ROM_PXXT,
|
||||
ROM_JUKOPC,
|
||||
ROM_TANDY1000HX,
|
||||
ROM_TANDY1000SL2,
|
||||
ROM_IBMAT,
|
||||
ROM_CMDPC30,
|
||||
ROM_AMI286,
|
||||
ROM_AWARD286,
|
||||
ROM_DELL200,
|
||||
ROM_MISC286,
|
||||
ROM_IBMAT386,
|
||||
ROM_ACER386,
|
||||
ROM_MEGAPC,
|
||||
ROM_AMI386SX,
|
||||
ROM_AMI486,
|
||||
ROM_WIN486,
|
||||
ROM_PCI486,
|
||||
ROM_SIS496,
|
||||
ROM_430VX,
|
||||
ROM_ENDEAVOR,
|
||||
ROM_REVENGE,
|
||||
ROM_IBMPS1_2011,
|
||||
ROM_DESKPRO_386,
|
||||
ROM_PORTABLE,
|
||||
#if 0
|
||||
ROM_PORTABLEII,
|
||||
ROM_PORTABLEIII,
|
||||
ROM_PORTABLEIII386, /* original shipped w/80286, later switched to 386DX */
|
||||
#endif
|
||||
ROM_IBMPS1_2121,
|
||||
|
||||
ROM_AMI386DX_OPTI495,
|
||||
ROM_MR386DX_OPTI495,
|
||||
|
||||
ROM_IBMPS2_M30_286,
|
||||
ROM_IBMPS2_M50,
|
||||
ROM_IBMPS2_M55SX,
|
||||
ROM_IBMPS2_M80,
|
||||
|
||||
ROM_DTK486, /* DTK PKM-0038S E-2/SiS 471/Award/SiS 85C471 */
|
||||
ROM_VLI486SV2G, /* ASUS VL/I-486SV2G/SiS 471/Award/SiS 85C471 */
|
||||
ROM_R418, /* Rise Computer R418/SiS 496/497/Award/SMC FDC37C665 */
|
||||
ROM_586MC1, /* Micro Star 586MC1 MS-5103/430LX/Award */
|
||||
ROM_PLATO, /* Intel Premiere/PCI II/430NX/AMI/SMC FDC37C665 */
|
||||
ROM_MB500N, /* PC Partner MB500N/430FX/Award/SMC FDC37C665 */
|
||||
ROM_P54TP4XE, /* ASUS P/I-P55TP4XE/430FX/Award/SMC FDC37C665 */
|
||||
ROM_AP53, /* AOpen AP53/430HX/AMI/SMC FDC37C665/669 */
|
||||
ROM_P55T2S, /* ASUS P/I-P55T2S/430HX/AMI/NS PC87306 */
|
||||
ROM_ACERM3A, /* Acer M3A/430HX/Acer/SMC FDC37C932FR */
|
||||
ROM_ACERV35N, /* Acer V35N/430HX/Acer/SMC FDC37C932FR */
|
||||
ROM_P55T2P4, /* ASUS P/I-P55T2P4/430HX/Award/Winbond W8387F*/
|
||||
ROM_P55TVP4, /* ASUS P/I-P55TVP4/430HX/Award/Winbond W8387F*/
|
||||
ROM_P55VA, /* Epox P55-VA/430VX/Award/SMC FDC37C932FR*/
|
||||
|
||||
ROM_440FX, /* Tyan Titan-Pro AT/440FX/Award BIOS/SMC FDC37C665 */
|
||||
|
||||
ROM_MARL, /* Intel Advanced_ML/430HX/AMI/NS PC87306 */
|
||||
ROM_THOR, /* Intel Advanced_ATX/430FX/AMI/NS PC87306 */
|
||||
ROM_MRTHOR, /* Intel Advanced_ATX/430FX/MR.BIOS/NS PC87306 */
|
||||
ROM_POWERMATE_V, /* NEC PowerMate V/430FX/Phoenix/SMC FDC37C66 5*/
|
||||
|
||||
ROM_IBMPS1_2121_ISA,/* IBM PS/1 Model 2121 with ISA expansion bus */
|
||||
|
||||
ROM_SPC4200P, /* Samsung SPC-4200P/SCAT/Phoenix */
|
||||
ROM_SUPER286TR, /* Hyundai Super-286TR/SCAT/Award */
|
||||
|
||||
ROM_AWARD386SX_OPTI495,
|
||||
ROM_AWARD386DX_OPTI495,
|
||||
ROM_AWARD486_OPTI495,
|
||||
|
||||
ROM_MEGAPCDX, /* 386DX mdl - Note: documentation (in German) clearly says such a model exists */
|
||||
ROM_ZAPPA, /* Intel Advanced_ZP/430FX/AMI/NS PC87306 */
|
||||
|
||||
ROM_CMDPC60,
|
||||
|
||||
ROM_S1668, /* Tyan Titan-Pro ATX/440FX/AMI/SMC FDC37C669 */
|
||||
ROM_IBMPS1_2133,
|
||||
|
||||
ROM_PRESIDENT, /* President Award 430FX PCI/430FX/Award/Unknown SIO */
|
||||
ROM_IBMPS2_M80_486,
|
||||
|
||||
ROM_MAX
|
||||
};
|
||||
|
||||
|
||||
extern int romspresent[ROM_MAX];
|
||||
|
||||
extern uint8_t rom_read(uint32_t addr, void *p);
|
||||
extern uint16_t rom_readw(uint32_t addr, void *p);
|
||||
extern uint32_t rom_readl(uint32_t addr, void *p);
|
||||
|
||||
extern FILE *rom_fopen(wchar_t *fn, wchar_t *mode);
|
||||
extern int rom_getfile(wchar_t *fn, wchar_t *s, int size);
|
||||
extern int rom_present(wchar_t *fn);
|
||||
|
||||
extern int rom_init(rom_t *rom, wchar_t *fn, uint32_t address, int size,
|
||||
int mask, int file_offset, uint32_t flags);
|
||||
extern int rom_init_interleaved(rom_t *rom, wchar_t *fn_low,
|
||||
wchar_t *fn_high, uint32_t address,
|
||||
int size, int mask, int file_offset,
|
||||
uint32_t flags);
|
||||
|
||||
extern int rom_load_bios(int rom_id);
|
||||
|
||||
|
||||
#endif /*EMU_ROM_H*/
|
||||
|
||||
Reference in New Issue
Block a user