notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: logging updates
[pcsx_rearmed.git]
/
frontend
/
main.c
diff --git
a/frontend/main.c
b/frontend/main.c
index
bd48898
..
8b35b09
100644
(file)
--- a/
frontend/main.c
+++ b/
frontend/main.c
@@
-48,7
+48,7
@@
extern int iUseInterpolation;
extern int iXAPitch;
extern int iVolume;
extern int iXAPitch;
extern int iVolume;
-int ready_to_go;
+int ready_to_go
, g_resetting
;
unsigned long gpuDisp;
char cfgfile_basename[MAXPATHLEN];
int state_slot;
unsigned long gpuDisp;
char cfgfile_basename[MAXPATHLEN];
int state_slot;
@@
-454,6
+454,8
@@
int emu_core_preinit(void)
int emu_core_init(void)
{
int emu_core_init(void)
{
+ SysPrintf("Starting PCSX-ReARMed " REV "\n");
+
CheckSubDir();
check_memcards();
CheckSubDir();
check_memcards();
@@
-553,7
+555,8
@@
int main(int argc, char *argv[])
plat_init();
menu_init(); // loads config
plat_init();
menu_init(); // loads config
- emu_core_init();
+ if (emu_core_init() != 0)
+ return 1;
if (psxout)
Config.PsxOut = 1;
if (psxout)
Config.PsxOut = 1;
@@
-676,6
+679,7
@@
void SysReset() {
// so we need to prevent updateLace() call..
void *real_lace = GPU_updateLace;
GPU_updateLace = dummy_lace;
// so we need to prevent updateLace() call..
void *real_lace = GPU_updateLace;
GPU_updateLace = dummy_lace;
+ g_resetting = 1;
// reset can run code, timing must be set
pl_timing_prepare(Config.PsxType);
// reset can run code, timing must be set
pl_timing_prepare(Config.PsxType);
@@
-686,6
+690,7
@@
void SysReset() {
CDR_stop();
GPU_updateLace = real_lace;
CDR_stop();
GPU_updateLace = real_lace;
+ g_resetting = 0;
}
void SysClose() {
}
void SysClose() {
@@
-759,6
+764,8
@@
int emu_load_state(int slot)
return LoadState(fname);
}
return LoadState(fname);
}
+#ifndef ANDROID
+
void SysPrintf(const char *fmt, ...) {
va_list list;
void SysPrintf(const char *fmt, ...) {
va_list list;
@@
-767,16
+774,31
@@
void SysPrintf(const char *fmt, ...) {
va_end(list);
}
va_end(list);
}
+#else
+
+#include <android/log.h>
+
+void SysPrintf(const char *fmt, ...) {
+ va_list list;
+
+ va_start(list, fmt);
+ __android_log_vprint(ANDROID_LOG_INFO, "PCSX", fmt, list);
+ va_end(list);
+}
+
+#endif
+
void SysMessage(const char *fmt, ...) {
void SysMessage(const char *fmt, ...) {
- va_list list;
- char msg[512];
+ va_list list;
+ char msg[512];
+ int ret;
-
va_start(list, fmt);
- vsnprintf(msg, sizeof(msg), fmt, list);
-
va_end(list);
+ va_start(list, fmt);
+
ret =
vsnprintf(msg, sizeof(msg), fmt, list);
+ va_end(list);
-
if (msg[strlen(msg)
- 1] == '\n')
-
msg[strlen(msg)
- 1] = 0;
+
if (ret < sizeof(msg) && msg[ret
- 1] == '\n')
+
msg[ret
- 1] = 0;
SysPrintf("%s\n", msg);
}
SysPrintf("%s\n", msg);
}