Moved the config-load code to pc.c, and (for now) disabled LoadConfig and SaveConfig menu items for non-Dev builds.

This commit is contained in:
waltje
2017-11-20 01:58:23 -05:00
parent 59624c0884
commit fa6ef13050
5 changed files with 178 additions and 151 deletions

View File

@@ -9,9 +9,9 @@
* Emulation of the EGA, Chips & Technologies SuperEGA, and
* AX JEGA graphics cards.
*
* Version: @(#)vid_ega.h 1.0.2 2017/10/31
* Version: @(#)vid_ega.h 1.0.3 2017/11/19
*
* Author: Sarah Walker, <http://pcem-emulator.co.uk/>
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* akm,
*
@@ -19,109 +19,124 @@
* Copyright 2016,2017 Miran Grca.
* Copyright 2017 akm.
*/
#ifndef VIDEO_EGA_H
# define VIDEO_EGA_H
typedef struct ega_t
{
mem_mapping_t mapping;
rom_t bios_rom;
uint8_t crtcreg;
uint8_t crtc[32];
uint8_t gdcreg[16];
int gdcaddr;
uint8_t attrregs[32];
int attraddr, attrff;
int attr_palette_enable;
uint8_t seqregs[64];
int seqaddr;
uint8_t miscout;
int vidclock;
uint8_t la, lb, lc, ld;
uint8_t stat;
int fast;
uint8_t colourcompare, colournocare;
int readmode, writemode, readplane;
int chain4, chain2_read, chain2_write;
int oddeven_page, oddeven_chain;
int enablevram, extvram;
uint8_t writemask;
uint32_t charseta, charsetb;
uint8_t egapal[16];
uint32_t *pallook;
int vtotal, dispend, vsyncstart, split, vblankstart;
int hdisp, htotal, hdisp_time, rowoffset;
int lowres, interlace;
int linedbl, rowcount;
double clock;
uint32_t ma_latch;
int vres;
int64_t dispontime, dispofftime;
int64_t vidtime;
uint8_t scrblank;
int dispon;
int hdisp_on;
uint32_t ma, maback, ca;
int vc;
int sc;
int linepos, vslines, linecountff, oddeven;
int con, cursoron, blink;
int scrollcache;
int firstline, lastline;
int firstline_draw, lastline_draw;
int displine;
uint8_t *vram;
int vrammask;
uint32_t vram_limit;
int video_res_x, video_res_y, video_bpp;
#ifdef JEGA
uint8_t RMOD1, RMOD2, RDAGS, RDFFB, RDFSB, RDFAP, RPESL, RPULP, RPSSC, RPSSU, RPSSL;
uint8_t RPPAJ;
uint8_t RCMOD, RCCLH, RCCLL, RCCSL, RCCEL, RCSKW, ROMSL, RSTAT;
int is_jega, font_index;
int chr_left, chr_wide;
# define SBCS 0
# define DBCS 1
# define ID_LEN 6
# define NAME_LEN 8
# define SBCS19_LEN 256 * 19
# define DBCS16_LEN 65536 * 32
#endif
#if defined(EMU_MEM_H) && defined(EMU_ROM_H)
typedef struct ega_t {
mem_mapping_t mapping;
rom_t bios_rom;
uint8_t crtcreg;
uint8_t crtc[32];
uint8_t gdcreg[16];
int gdcaddr;
uint8_t attrregs[32];
int attraddr, attrff;
int attr_palette_enable;
uint8_t seqregs[64];
int seqaddr;
uint8_t miscout;
int vidclock;
uint8_t la, lb, lc, ld;
uint8_t stat;
int fast;
uint8_t colourcompare, colournocare;
int readmode, writemode, readplane;
int chain4, chain2_read, chain2_write;
int oddeven_page, oddeven_chain;
int enablevram, extvram;
uint8_t writemask;
uint32_t charseta, charsetb;
uint8_t egapal[16];
uint32_t *pallook;
int vtotal, dispend, vsyncstart, split, vblankstart;
int hdisp, htotal, hdisp_time, rowoffset;
int lowres, interlace;
int linedbl, rowcount;
double clock;
uint32_t ma_latch;
int vres;
int64_t dispontime, dispofftime;
int64_t vidtime;
uint8_t scrblank;
int dispon;
int hdisp_on;
uint32_t ma, maback, ca;
int vc;
int sc;
int linepos, vslines, linecountff, oddeven;
int con, cursoron, blink;
int scrollcache;
int firstline, lastline;
int firstline_draw, lastline_draw;
int displine;
uint8_t *vram;
int vrammask;
uint32_t vram_limit;
int video_res_x, video_res_y, video_bpp;
#ifdef JEGA
uint8_t RMOD1, RMOD2, RDAGS, RDFFB, RDFSB, RDFAP, RPESL, RPULP, RPSSC, RPSSU, RPSSL;
uint8_t RPPAJ;
uint8_t RCMOD, RCCLH, RCCLL, RCCSL, RCCEL, RCSKW, ROMSL, RSTAT;
int is_jega, font_index;
int chr_left, chr_wide;
#endif
} ega_t;
#endif
extern int update_overscan;
void ega_out(uint16_t addr, uint8_t val, void *p);
uint8_t ega_in(uint16_t addr, void *p);
void ega_poll(void *p);
void ega_recalctimings(struct ega_t *ega);
void ega_write(uint32_t addr, uint8_t val, void *p);
uint8_t ega_read(uint32_t addr, void *p);
void ega_init(ega_t *ega);
#ifdef EMU_DEVICE_H
extern device_t ega_device;
extern device_t cpqega_device;
extern device_t sega_device;
#endif
#ifdef JEGA
#define SBCS 0
#define DBCS 1
#define ID_LEN 6
#define NAME_LEN 8
#define SBCS19_LEN 256 * 19
#define DBCS16_LEN 65536 * 32
extern uint8_t jfont_sbcs_19[SBCS19_LEN]; /* 256 * 19( * 8) */
extern uint8_t jfont_dbcs_16[DBCS16_LEN]; /* 65536 * 16 * 2 (* 8) */
#endif
extern int update_overscan;
#if defined(EMU_MEM_H) && defined(EMU_ROM_H)
extern void ega_init(ega_t *ega);
extern void ega_recalctimings(struct ega_t *ega);
#endif
extern void ega_out(uint16_t addr, uint8_t val, void *p);
extern uint8_t ega_in(uint16_t addr, void *p);
extern void ega_poll(void *p);
extern void ega_write(uint32_t addr, uint8_t val, void *p);
extern uint8_t ega_read(uint32_t addr, void *p);
#endif /*VIDEO_EGA_H*/