1
0
Fork 0
forked from len0rd/rockbox

lua misc tweaks and cleanup

checks button_status in rockev
strpbrk_n custom implementation allows setting max search len in source string
add some branch prediction where appropriate
fix formatting in splash_scroller script

Change-Id: Id5d8e9d83f4b3e361ccb67b403af8f9a8a31b8f0
This commit is contained in:
William Wilgus 2020-10-03 22:45:27 -04:00
parent f3ae48f552
commit 1aa739e3c3
6 changed files with 25 additions and 24 deletions

View file

@ -272,7 +272,8 @@ static void rev_timer_isr(void)
{
evt = ev_data.cb[i];
if ((i == ACTEVENT || i == BTNEVENT) && rb->button_queue_count())
if ((i == ACTEVENT || i == BTNEVENT) &&
(rb->button_queue_count() || rb->button_status() || evt->id))
ev_flag |= event_flag(i); /* any buttons ready? */
else if(evt->ticks > 0 && TIME_AFTER(curr_tick, evt->next_tick))
ev_flag |= event_flag(i);
@ -315,23 +316,15 @@ static void event_thread(void)
{
/* only send ACTION_NONE once */
if (evt->id == ACTION_NONE || rb->button_status() != 0)
{
evt->ticks = 0;
continue; /* check next event */
}
}
evt->ticks = EV_TICKS; /* poll release event */
evt->id = action;
break;
case BTNEVENT:
evt->id = rb->button_get(false);
/* only send BUTTON_NONE once */
if (evt->id == BUTTON_NONE)
{
evt->ticks = 0;
continue; /* check next event */
}
evt->ticks = EV_TICKS; /* poll release event */
break;
case CUSTOMEVENT:
case PLAYBKEVENT:
@ -592,7 +585,7 @@ static int rockev_register(lua_State *L)
case ACTEVENT:
/* fall through */
case BTNEVENT:
event_ticks = 0; /* button events not triggered by timeout but release is*/
event_ticks = 0; /* button events not triggered by timeout */
break;
case CUSTOMEVENT:
event_ticks = luaL_optinteger(L, 3, EV_TICKS);