Merge branch 'master' of git://github.com/rafortis/droid48 into rafortis-master
This commit is contained in:
commit
a93416f04e
2 changed files with 10 additions and 2 deletions
|
@ -112,6 +112,8 @@ static word_20 jumpmasks[] = {
|
|||
0xffff0000, 0xfff00000, 0xff000000, 0xf0000000
|
||||
};
|
||||
|
||||
int check_out_register();
|
||||
|
||||
int
|
||||
#ifdef __FunctionProto__
|
||||
decode_group_80(void)
|
||||
|
@ -694,7 +696,7 @@ decode_group_1()
|
|||
}
|
||||
}
|
||||
|
||||
inline int
|
||||
int
|
||||
#ifdef __FunctionProto__
|
||||
decode_8_thru_f(int op1)
|
||||
#else
|
||||
|
|
|
@ -629,7 +629,13 @@ GetEvent()
|
|||
|
||||
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)
|
||||
{
|
||||
code = -code;
|
||||
|
|
Loading…
Reference in a new issue