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

MPIO HD300: Fix scrollstip issue at driver level.

Browse source 
Scrollstrip (as well as scrollwheel on ipods/sansas) works like
quadrature encoder. The states of input lines are tracked by the
gpio ISR and when the sequence is correct, appropriate button
event is pushed to the button queue directly. The downside of
this implementation is that scrollstrip doesn't emit _REL
events which has some weird consequences. For the scrollwheels
some hack have been crafted in action system to accomodate for
this. I don't like this approach. IMO the correct fix is to
properly emit _REL event when the user stops interacting with
the device or reverses the direction of the move. This patch
implements timeout which forces to emit _REL when expired.

Change-Id: I588ac5810dd2ab00c68935d23a62979cb1c2a912
This commit is contained in:
Marcin Bukat 2012-01-25 09:07:52 +01:00
parent 76440aa214
commit 36281c4cc9
1 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
firmware/target/coldfire/mpio/hd300/button-hd300.c
View file

@ -29,10 +29,17 @@
#include "powermgmt.h"
#define SLIDER_BASE_SENSITIVITY 8
#define SLIDER_REL_TIMEOUT HZ/2
/* GPI7 H-L, GPI6 H-L, GPI7 L-H, GPI6 L-H */
#define SLIDER_GPIO_MASK ((1<<15)|(1<<14)|(1<<7)|(1<<6))
static volatile struct scroll_state_t {
signed char dir;
long timeout;
bool rel;
} scroll;
static inline void disable_scrollstrip_interrupts(void)
{
and_l(~SLIDER_GPIO_MASK,&GPIO_INT_EN);
@ -90,9 +97,19 @@ void scrollstrip_isr(void)
scroll_dir = scroll_state[prev_scroll_lines][new_scroll_lines];
prev_scroll_lines = new_scroll_lines;
/* catch sequence error */
if (scroll_dir == BUTTON_NONE)
return;
/* direction reversal */
if (direction != scroll_dir)
{
/* direction reversal */
/* post release event to the button queue */
if (queue_empty(&button_queue))
queue_post(&button_queue, direction|BUTTON_REL, 0);
scroll.rel = true;
direction = scroll_dir;
count = 0;
ack_scrollstrip_interrupt();
@ -121,6 +138,10 @@ void scrollstrip_isr(void)
if (queue_empty(&button_queue))
queue_post(&button_queue, scroll_dir, 0);
scroll.dir = scroll_dir;
scroll.timeout = current_tick + SLIDER_REL_TIMEOUT;
scroll.rel = false;
ack_scrollstrip_interrupt();
enable_scrollstrip_interrupts();
}
@ -235,5 +256,15 @@ int button_read_device(void)
} /* !button_hold() */
if (!scroll.rel)
if (TIME_AFTER(current_tick, scroll.timeout))
{
if (queue_empty(&button_queue))
{
queue_post(&button_queue, scroll.dir|BUTTON_REL, 0);
scroll.rel = true;
}
}
return btn;
}