psp code updated for latest base, black level

[libpicofe.git] / common / emu.h

diff --git a/common/emu.h b/common/emu.h
index 93a8823..d118e5b 100644 (file)
--- a/common/emu.h
+++ b/common/emu.h
@@ -24,6 +24,7 @@ typedef struct {
        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
+       int gamma2;  // psp: black level
 } currentConfig_t;
 
 extern currentConfig_t currentConfig, defaultConfig;
@@ -34,6 +35,7 @@ extern int state_slot;
 extern int config_slot, config_slot_current;
 extern unsigned char *movie_data;
 extern char lastRomFile[512];
+extern int kb_combo_keys, kb_combo_acts;       // keys and actions which need button combos
 
 
 int   emu_ReloadRom(void);
@@ -49,6 +51,7 @@ 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_findKeyBindCombos(void);
 
-extern const char *keyNames[];
+extern const char * const keyNames[];
 void  emu_prepareDefaultConfig(void);