X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=common%2Femu.h;h=484080a45cfb47fd3fd0a0660ef6b9e971cc1b10;hb=0ae25549b5066ea8b42216ec875f5c3c5d5bd8d6;hp=96cd55014e3be947cc9d87623a414abef184cc90;hpb=50cdcf97de15fa85341e2a6063252e3042dd7ea6;p=libpicofe.git

diff --git a/common/emu.h b/common/emu.h
index 96cd550..484080a 100644
--- a/common/emu.h
+++ b/common/emu.h
@@ -8,25 +8,27 @@ typedef struct {
 	int EmuOpt;		// LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,
 					// squidgehack, no_save_cfg_on_exit, <unused>, 16_bit_mode
 					// craigix_ram, confirm_save, show_cd_leds, confirm_load
-					// A_SNs_gamma, perfect_vsync, interlace
-	int PicoOpt;  // used for config saving only, see Pico.h
-	int PsndRate; // ditto
-	int PicoRegion; // ditto
+					// A_SNs_gamma, perfect_vsync, giz_scanlines, giz_dblbuff
+					// vsync_mode, show_clock, no_frame_limitter
+	int s_PicoOpt;		// for old cfg files only
+	int s_PsndRate;
+	int s_PicoRegion;
 	int Frameskip;
 	int CPUclock;
 	int KeyBinds[32];
 	int volume;
 	int gamma;
 	int JoyBinds[4][32];
-	int PicoAutoRgnOrder;
-	int PicoCDBuffers;
-	int scaling; // 0=center, 1=hscale, 2=hvscale, 3=hsoftscale
+	int s_PicoAutoRgnOrder;
+	int s_PicoCDBuffers;
+	int scaling; // gp2x: 0=center, 1=hscale, 2=hvscale, 3=hsoftscale; psp: bilinear filtering
+	float scale; // psp: screen scale
+	float hscale32, hscale40; // psp: horizontal scale
 } currentConfig_t;
 
-
-extern currentConfig_t currentConfig;
+extern currentConfig_t currentConfig, defaultConfig;
 extern char *PicoConfigFile;
-extern unsigned char *rom_data;
+extern int rom_loaded;
 extern char noticeMsg[64];
 extern int state_slot;
 extern int config_slot, config_slot_current;
@@ -45,4 +47,6 @@ int   emu_cdCheck(int *pregion);
 int   emu_findBios(int region, char **bios_file);
 void  emu_textOut8 (int x, int y, const char *text);
 void  emu_textOut16(int x, int y, const char *text);
+char *emu_makeRomId(void);
 
+void  emu_prepareDefaultConfig(void);