notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the platform code provide the key mapping
[picodrive.git]
/
platform
/
common
/
emu.h
diff --git
a/platform/common/emu.h
b/platform/common/emu.h
index
faa4868
..
8f8f61f
100644
(file)
--- a/
platform/common/emu.h
+++ b/
platform/common/emu.h
@@
-6,8
+6,6
@@
* See COPYING file in the top-level directory.
*/
* See COPYING file in the top-level directory.
*/
-#include "port_config.h"
-
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
@@
-16,23
+14,15
@@
extern "C" {
extern void *g_screen_ptr;
extern void *g_screen_ptr;
-#if SCREEN_SIZE_FIXED
-#define g_screen_width SCREEN_WIDTH
-#define g_screen_height SCREEN_HEIGHT
-#else
extern int g_screen_width;
extern int g_screen_height;
extern int g_screen_width;
extern int g_screen_height;
-#endif
-
#define EOPT_EN_SRAM (1<<0)
#define EOPT_SHOW_FPS (1<<1)
#define EOPT_EN_SOUND (1<<2)
#define EOPT_GZIP_SAVES (1<<3)
#define EOPT_EN_SRAM (1<<0)
#define EOPT_SHOW_FPS (1<<1)
#define EOPT_EN_SOUND (1<<2)
#define EOPT_GZIP_SAVES (1<<3)
-#define EOPT_MMUHACK (1<<4)
#define EOPT_NO_AUTOSVCFG (1<<5)
#define EOPT_16BPP (1<<7) // depreceted for .renderer
#define EOPT_NO_AUTOSVCFG (1<<5)
#define EOPT_16BPP (1<<7) // depreceted for .renderer
-#define EOPT_RAM_TIMINGS (1<<8)
#define EOPT_EN_CD_LEDS (1<<10)
#define EOPT_A_SN_GAMMA (1<<12)
#define EOPT_VSYNC (1<<13)
#define EOPT_EN_CD_LEDS (1<<10)
#define EOPT_A_SN_GAMMA (1<<12)
#define EOPT_VSYNC (1<<13)
@@
-65,6
+55,8
@@
typedef struct _currentConfig_t {
int s_PicoAutoRgnOrder;
int s_PicoCDBuffers;
int Frameskip;
int s_PicoAutoRgnOrder;
int s_PicoCDBuffers;
int Frameskip;
+ int input_dev0;
+ int input_dev1;
int confirm_save;
int CPUclock;
int volume;
int confirm_save;
int CPUclock;
int volume;
@@
-80,15
+72,17
@@
typedef struct _currentConfig_t {
int renderer32x;
int filter; // pandora
int analog_deadzone;
int renderer32x;
int filter; // pandora
int analog_deadzone;
+ int msh2_khz;
+ int ssh2_khz;
} currentConfig_t;
extern currentConfig_t currentConfig, defaultConfig;
} currentConfig_t;
extern currentConfig_t currentConfig, defaultConfig;
-extern char *PicoConfigFile;
-extern int rom_loaded;
+extern const char *PicoConfigFile;
extern int state_slot;
extern int config_slot, config_slot_current;
extern unsigned char *movie_data;
extern int reset_timing;
extern int state_slot;
extern int config_slot, config_slot_current;
extern unsigned char *movie_data;
extern int reset_timing;
+extern int flip_after_sync;
#define PICO_PEN_ADJUST_X 4
#define PICO_PEN_ADJUST_Y 2
#define PICO_PEN_ADJUST_X 4
#define PICO_PEN_ADJUST_Y 2
@@
-113,14
+107,6
@@
enum TPicoGameState {
PGS_SuspendWake, /* PSP */
};
PGS_SuspendWake, /* PSP */
};
-// media types
-enum {
- PM_BAD = 0,
- PM_MD_CART, /* also 32x */
- PM_MARK3,
- PM_CD,
-};
-
void emu_init(void);
void emu_finish(void);
void emu_loop(void);
void emu_init(void);
void emu_finish(void);
void emu_loop(void);
@@
-135,7
+121,7
@@
void emu_set_defconfig(void);
int emu_read_config(const char *rom_fname, int no_defaults);
int emu_write_config(int game);
int emu_read_config(const char *rom_fname, int no_defaults);
int emu_write_config(int game);
-char *emu_get_save_fname(int load, int is_sram, int slot);
+char *emu_get_save_fname(int load, int is_sram, int slot
, int *time
);
int emu_check_save_file(int slot, int *time);
void emu_text_out8 (int x, int y, const char *text);
int emu_check_save_file(int slot, int *time);
void emu_text_out8 (int x, int y, const char *text);
@@
-149,6
+135,11
@@
void emu_get_game_name(char *str150);
void emu_set_fastforward(int set_on);
void emu_status_msg(const char *format, ...);
void emu_set_fastforward(int set_on);
void emu_status_msg(const char *format, ...);
+/* default sound code */
+void emu_sound_start(void);
+void emu_sound_stop(void);
+void emu_sound_wait(void);
+
/* used by some (but not all) platforms */
void emu_cmn_forced_frame(int no_scale, int do_emu);
/* used by some (but not all) platforms */
void emu_cmn_forced_frame(int no_scale, int do_emu);
@@
-164,8
+155,6
@@
void pemu_forced_frame(int no_scale, int do_emu); // ..to g_menubg_src_ptr
void pemu_finalize_frame(const char *fps, const char *notice_msg);
void pemu_sound_start(void);
void pemu_finalize_frame(const char *fps, const char *notice_msg);
void pemu_sound_start(void);
-void pemu_sound_stop(void);
-void pemu_sound_wait(void);
void plat_early_init(void);
void plat_init(void);
void plat_early_init(void);
void plat_init(void);