devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rockboy: Fix button read method.

Browse source 
The old method simply polled the lastbtn variable in button.c. This approach
does not clear the button event queue which overflows as a result (panic
in the simulator). Use proper APIs to fix that and adopt the
method from the old read_scroll_wheel() function, which reads buttons until
the button queue is empty, for all targets.

Change-Id: Ibf198f6e597e7f51ab4ebcfcae4ebebbe8d7845c
This commit is contained in:
Thomas Martitz 2014-01-18 19:47:55 +01:00
parent b31c856b84
commit c448d7e79c
1 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

50
apps/plugins/rockboy/sys_rockbox.c
View file

@ -36,7 +36,7 @@ struct fb fb IBSS_ATTR;
extern int debug_trace; extern int debug_trace;
unsigned int oldbuttonstate = 0, newbuttonstate,holdbutton; static unsigned int oldbuttonstate;
#ifdef HAVE_WHEEL_POSITION #ifdef HAVE_WHEEL_POSITION
int oldwheel = -1, wheel; int oldwheel = -1, wheel;
@ -54,39 +54,30 @@ static int wheelmap[8] = {
int released, pressed; int released, pressed;
#ifdef ROCKBOY_SCROLLWHEEL
/* Scrollwheel events are posted directly and not polled by the button
driver - synthesize polling */
static inline unsigned int read_scroll_wheel(void)
{
unsigned int buttons = BUTTON_NONE;
unsigned int btn;
/* Empty out the button queue and see if any scrollwheel events were
posted */
do
{
btn = rb->button_get_w_tmo(0);
buttons |= btn;
}
while (btn != BUTTON_NONE);
return buttons & (ROCKBOY_SCROLLWHEEL_CC | ROCKBOY_SCROLLWHEEL_CW);
}
#endif
void ev_poll(void) void ev_poll(void)
{ {
event_t ev; event_t ev;
newbuttonstate = rb->button_status();
#ifdef ROCKBOY_SCROLLWHEEL unsigned int buttons = BUTTON_NONE;
newbuttonstate |= read_scroll_wheel(); unsigned int btn;
/* loop until all button events are popped off */
do
{
btn = rb->button_get(false);
buttons |= btn;
#if defined(HAVE_SCROLLWHEEL) && !defined(ROCKBOY_SCROLLWHEEL)
/* filter out scroll wheel events if not supported */
buttons &= ~(BUTTON_SCROLL_FWD|BUTTON_SCROLL_BACK);
#endif #endif
released = ~newbuttonstate & oldbuttonstate; }
pressed = newbuttonstate & ~oldbuttonstate; while (btn != BUTTON_NONE);
oldbuttonstate = newbuttonstate;
released = ~buttons & oldbuttonstate;
pressed = buttons & ~oldbuttonstate;
oldbuttonstate = buttons;
#if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2)
static unsigned int holdbutton;
if (rb->button_hold()&~holdbutton) if (rb->button_hold()&~holdbutton)
fb.mode=(fb.mode+1)%4; fb.mode=(fb.mode+1)%4;
holdbutton=rb->button_hold(); holdbutton=rb->button_hold();
@ -374,4 +365,3 @@ void vid_update(int scanline)
#endif /* LCD_HEIGHT */ #endif /* LCD_HEIGHT */
} }
#endif #endif