gwh/droid48-gwh
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' of git://github.com/rafortis/droid48 into rafortis-master

Browse source
This commit is contained in:
shagr4th 2016-12-18 14:48:12 +01:00
commit a93416f04e
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/jni/emulate.c
View file

@ -112,6 +112,8 @@ static word_20 jumpmasks[] = {
0xffff0000, 0xfff00000, 0xff000000, 0xf0000000 0xffff0000, 0xfff00000, 0xff000000, 0xf0000000
}; };
int check_out_register();
int int
#ifdef __FunctionProto__ #ifdef __FunctionProto__
decode_group_80(void) decode_group_80(void)
@ -694,7 +696,7 @@ decode_group_1()
} }
} }
inline int int
#ifdef __FunctionProto__ #ifdef __FunctionProto__
decode_8_thru_f(int op1) decode_8_thru_f(int op1)
#else #else

8
app/src/main/jni/x48.c
View file

@ -629,7 +629,13 @@ GetEvent()
int code = (*android_env)->CallIntMethod(android_env, android_callback, waitEvent); int code = (*android_env)->CallIntMethod(android_env, android_callback, waitEvent);
//LOGI("code: %d", code); //LOGI("code: %d", code);
//FIX for Zenfone 2
struct timespec req, rem;
req.tv_sec = 0;
req.tv_nsec = 100L;
nanosleep(&req , &rem);
if (code < 0) if (code < 0)
{ {
code = -code; code = -code;