len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 05:05:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Return old button value if lcd_button_supprt was blocked.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20041 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-02-18 17:43:38 +00:00
parent 30255d53da
commit 5e3b4fe3f8
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c
View file

@ -31,6 +31,7 @@
#define WHEEL_FAST_OFF_INTERVAL 60000 #define WHEEL_FAST_OFF_INTERVAL 60000
#define WHEELCLICKS_PER_ROTATION 48 /* wheelclicks per full rotation */ #define WHEELCLICKS_PER_ROTATION 48 /* wheelclicks per full rotation */
static short _dbop_din;
/* Clickwheel */ /* Clickwheel */
static unsigned int old_wheel_value = 0; static unsigned int old_wheel_value = 0;
static unsigned int wheel_repeat = BUTTON_NONE; static unsigned int wheel_repeat = BUTTON_NONE;
@ -47,7 +48,7 @@ static bool hold_button = false;
static bool hold_button_old = false; static bool hold_button_old = false;
#endif #endif
extern void lcd_button_support(void); extern bool lcd_button_support(void);
void button_init_device(void) void button_init_device(void)
{ {
@ -85,8 +86,7 @@ void clickwheel(unsigned int wheel_value)
unsigned long usec = TIMER1_VALUE; /* WAG!!! and it works!!*/ unsigned long usec = TIMER1_VALUE; /* WAG!!! and it works!!*/
unsigned v = (usec - last_wheel_usec) & 0x7fffffff; unsigned v = (usec - last_wheel_usec) & 0x7fffffff;
v = (v>0) ? 1000000 / v : 0; /* clicks/sec = 1000000 * v = (v>0) ? 1000000 / v : 0; /* clicks/sec = 1000000 * +clicks/usec */
+clicks/usec */
v = (v>0xffffff) ? 0xffffff : v; /* limit to 24 bit */ v = (v>0xffffff) ? 0xffffff : v; /* limit to 24 bit */
/* some velocity filtering to smooth things out */ /* some velocity filtering to smooth things out */
@ -119,8 +119,7 @@ void clickwheel(unsigned int wheel_value)
} }
else else
{ {
/* fast ON gets filtered to avoid inadvertent jumps to fast mode /* fast ON gets filtered to avoid inadvertent jumps to fast mode */
*/
if (repeat && wheel_velocity > 1000000/WHEEL_FAST_ON_INTERVAL) if (repeat && wheel_velocity > 1000000/WHEEL_FAST_ON_INTERVAL)
{ {
/* moving into fast mode */ /* moving into fast mode */
@ -180,12 +179,13 @@ void clickwheel(unsigned int wheel_value)
old_wheel_value = wheel_value; old_wheel_value = wheel_value;
} }
int read_dbop(void) static short read_dbop(void)
{ {
/*write a red pixel */ /*write a red pixel */
lcd_button_support(); if (!lcd_button_support())
return _dbop_din;
/* Set up dbop for input */ /* Set up dbop for input */
while (!(DBOP_STAT & (1<<10))); /* Wait for fifo to empty */ while (!(DBOP_STAT & (1<<10))); /* Wait for fifo to empty */
DBOP_CTRL |= (1<<19); DBOP_CTRL |= (1<<19);
DBOP_CTRL &= ~(1<<16); /* disable output */ DBOP_CTRL &= ~(1<<16); /* disable output */
@ -198,14 +198,14 @@ int read_dbop(void)
int delay = 50; int delay = 50;
while(delay--); /* small delay to set up read */ while(delay--); /* small delay to set up read */
int ret = DBOP_DIN; /* now read dbop & store info*/ _dbop_din = DBOP_DIN; /* now read dbop & store info*/
DBOP_TIMPOL_01 = 0x6e167; DBOP_TIMPOL_01 = 0x6e167;
DBOP_TIMPOL_23 = 0xa167e06f; DBOP_TIMPOL_23 = 0xa167e06f;
DBOP_CTRL |= (1<<16); DBOP_CTRL |= (1<<16);
DBOP_CTRL &= ~(1<<19); DBOP_CTRL &= ~(1<<19);
return ret; return _dbop_din;
} }
/* /*
@ -215,7 +215,7 @@ int button_read_device(void)
{ {
int btn = BUTTON_NONE; int btn = BUTTON_NONE;
/* read buttons from dbop */ /* read buttons from dbop */
int dbop = read_dbop(); short dbop = read_dbop();
/* hold button */ /* hold button */
if(dbop & (1<<12)) if(dbop & (1<<12))

5
firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c
View file

@ -435,7 +435,7 @@ void lcd_update_rect(int x, int y, int width, int height)
} /* lcd_update_rect */ } /* lcd_update_rect */
/* writes one read pixel outside the visible area, needed for correct dbop reads */ /* writes one read pixel outside the visible area, needed for correct dbop reads */
void lcd_button_support(void) bool lcd_button_support(void)
{ {
int x=LCD_HEIGHT+1; int x=LCD_HEIGHT+1;
int y=LCD_WIDTH+1; int y=LCD_WIDTH+1;
@ -444,7 +444,7 @@ void lcd_button_support(void)
unsigned short data = (0xf<<12); unsigned short data = (0xf<<12);
if (lcd_busy) if (lcd_busy)
return; return false;
lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ); lcd_write_reg(R_ENTRY_MODE, R_ENTRY_MODE_HORZ);
/* Set start position and window */ /* Set start position and window */
@ -457,4 +457,5 @@ void lcd_button_support(void)
lcd_write_cmd(R_WRITE_DATA_2_GRAM); lcd_write_cmd(R_WRITE_DATA_2_GRAM);
lcd_write_data(&data, width); lcd_write_data(&data, width);
return true;
} }