Index: firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c =================================================================== --- firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c (revision 19925) +++ firmware/target/arm/as3525/sansa-e200v2/button-e200v2.c (working copy) @@ -7,7 +7,8 @@ * \/ \/ \/ \/ \/ * $Id$ * - * Copyright (C) 2006 by Barry Wardell + * Copyright (C) 2008 by Thomas Martitz + * Copyright (C) 2008 by Dominik Wenger * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,8 +20,14 @@ * ****************************************************************************/ -/* Taken from button-h10.c by Barry Wardell and reverse engineering by MrH. */ +/* Basic button and clickwheel driver for the E200v2 + * This is basically a hybrid with the button code taken from the fuze driver + * and the clickwheel code from the e200 version 1 + * TODO: The rec button is still a problem as if something else besides + * the button is setting dbop 15 to 0. + */ + #include "system.h" #include "button.h" #include "backlight.h" @@ -31,9 +38,9 @@ #define WHEEL_FAST_OFF_INTERVAL 60000 #define WHEELCLICKS_PER_ROTATION 48 /* wheelclicks per full rotation */ -/* Clickwheel */ #ifndef BOOTLOADER -static unsigned int old_wheel_value = 0; +/* Clickwheel */ +/*static unsigned int old_wheel_value = 0; */ static unsigned int wheel_repeat = BUTTON_NONE; static unsigned int wheel_click_count = 0; static unsigned int wheel_delta = 0; @@ -45,90 +52,272 @@ /* Buttons */ static bool hold_button = false; static bool hold_button_old = false; -#define _button_hold() hold_button #else -#define _button_hold() false /* FIXME */ -#endif /* BOOTLOADER */ -static int int_btn = BUTTON_NONE; +#define hold_button false +#endif /* !BOOTLOADER */ +static int int_btn = BUTTON_NONE; +static short _dbop_din = BUTTON_NONE; + void button_init_device(void) { + GPIOA_DIR |= (1<<1); + GPIOA_PIN(1) = (1<<1); } +#if !defined(BOOTLOADER) +void clickwheel_int(void) +{ + static unsigned int wheel_value = 0; + static unsigned int old_wheel_value = 0; + + static const unsigned char wheel_tbl[2][4] = + { + { 2, 0, 3, 1 }, /* Clockwise rotation */ + { 1, 3, 0, 2 }, /* Counter-clockwise */ + }; + /* Read wheel + * Bits 13 and 14 of DBOP_DIN change as follows: + * Clockwise rotation 00 -> 01 -> 11 -> 10 -> 00 + * Counter-clockwise 00 -> 10 -> 11 -> 01 -> 00 + */ + wheel_value = _dbop_din & (1<<13|1<<14); + wheel_value >>= 13; + + if (!hold_button) + { + /* did the wheel value change? */ + unsigned int btn = BUTTON_NONE; + if (old_wheel_value == wheel_tbl[0][wheel_value]) + btn = BUTTON_SCROLL_FWD; + else if (old_wheel_value == wheel_tbl[1][wheel_value]) + btn = BUTTON_SCROLL_BACK; + + if (btn != BUTTON_NONE) + { + int repeat = 1; /* assume repeat */ + unsigned long usec = TIMER1_VALUE; /* WAG!!! and it works!!*/ + unsigned v = (usec - last_wheel_usec) & 0x7fffffff; + + v = (v>0) ? 1000000 / v : 0; /* clicks/sec = 1000000 * +clicks/usec */ + v = (v>0xffffff) ? 0xffffff : v; /* limit to 24 bit */ + + /* some velocity filtering to smooth things out */ + wheel_velocity = (7*wheel_velocity + v) / 8; + + if (btn != wheel_repeat) + { + /* direction reversals nullify all fast mode states */ + wheel_repeat = btn; + repeat = + wheel_fast_mode = + wheel_velocity = + wheel_click_count = 0; + } + + if (wheel_fast_mode != 0) + { + /* fast OFF happens immediately when velocity drops below + threshold */ + if (TIME_AFTER(usec, + last_wheel_usec + WHEEL_FAST_OFF_INTERVAL)) + { + /* moving out of fast mode */ + wheel_fast_mode = 0; + /* reset velocity */ + wheel_velocity = 0; + /* wheel_delta is always 1 in slow mode */ + wheel_delta = 1; + } + } + else + { + /* fast ON gets filtered to avoid inadvertent jumps to fast mode +*/ + if (repeat && wheel_velocity > 1000000/WHEEL_FAST_ON_INTERVAL) + { + /* moving into fast mode */ + wheel_fast_mode = 1 << 31; + wheel_click_count = 0; + wheel_velocity = 1000000/WHEEL_FAST_OFF_INTERVAL; + } + else if (++wheel_click_count < 2) + { + btn = BUTTON_NONE; + } + + /* wheel_delta is always 1 in slow mode */ + wheel_delta = 1; + } + + if (TIME_AFTER(current_tick, next_backlight_on) || + v <= 4) + { + /* poke backlight to turn it on or maintain it no more often + than every 1/4 second*/ + next_backlight_on = current_tick + HZ/4; + backlight_on(); + buttonlight_on(); + reset_poweroff_timer(); + } + + if (btn != BUTTON_NONE) + { + wheel_click_count = 0; + + /* generate repeats if quick enough */ + if (repeat && TIME_BEFORE(usec, + last_wheel_post + WHEEL_REPEAT_INTERVAL)) + btn |= BUTTON_REPEAT; + + last_wheel_post = usec; + + if (queue_empty(&button_queue)) + { + queue_post(&button_queue, btn, wheel_fast_mode | + (wheel_delta << 24) | + wheel_velocity*360/WHEELCLICKS_PER_ROTATION); + /* message posted - reset delta */ + wheel_delta = 1; + } + else + { + /* skipped post - increment delta */ + if (++wheel_delta > 0x7f) + wheel_delta = 0x7f; + } + } + + last_wheel_usec = usec; + } + } + + old_wheel_value = wheel_value; +} + + +static void set_hold(void) /* set hold button state */ +{ + hold_button = _dbop_din & (1<<12); +} + +static void get_rec(void) +{ + /* Bypass on startup until Rockbox boots up or else settings are cleared. + 57 or greater works 56 does not */ + static int wait = 57; + + if (wait-- <= 0) + { + wait=0; + if (!(_dbop_din & (1<<15))) + int_btn |= BUTTON_REC; + } +} +#endif /* !defined(BOOTLOADER */ + bool button_hold(void) { - return _button_hold(); + return hold_button; } -/* clickwheel */ -#ifndef BOOTLOADER -void clickwheel_int(void) +static void get_power(void) { + if (_dbop_din & (1<<8)) + int_btn |= BUTTON_POWER; } -#endif /* BOOTLOADER */ -/* device buttons */ -void button_int(void) +static void get_button_from_dbob(void) { - int dir_save_b = 0; - int afsel_save_b = 0; - int dir_save_c = 0; - int afsel_save_c = 0; + /* Set up dbop for input */ + while (!(DBOP_STAT & (1<<10))); /* Wait for fifo to empty */ + DBOP_CTRL |= (1<<19); + DBOP_CTRL &= ~(1<<16); /* disable output */ + DBOP_TIMPOL_01 = 0xe167e167; + DBOP_TIMPOL_23 = 0xe167006e; - int_btn = BUTTON_NONE; + DBOP_CTRL |= (1<<15); /* start read */ - /* Save the current direction and afsel */ - dir_save_b = GPIOB_DIR; - afsel_save_b = GPIOB_AFSEL; - dir_save_c = GPIOC_DIR; - afsel_save_c = GPIOC_AFSEL; + while (!(DBOP_STAT & (1<<16))); /* wait for valid data */ - GPIOB_DIR = 0; - GPIOB_AFSEL = 0; - GPIOC_DIR = 0; - GPIOC_AFSEL = 0; + int delay = 50; + while(delay--); /* small delay to set up read */ - /* These should not be needed with button event interupts */ - /* they are necessary now to clear out lcd data */ - GPIOC_PIN(0) |= 1; - GPIOC_PIN(1) |= 1; - GPIOC_PIN(2) |= 1; - GPIOC_PIN(3) |= 1; - GPIOC_PIN(4) |= 1; - GPIOC_PIN(5) |= 1; - GPIOC_PIN(6) |= 1; - GPIOC_PIN(7) |= 1; + _dbop_din = DBOP_DIN; /* now read dbop & store info*/ + /* Reset dbop for output */ + DBOP_TIMPOL_01 = 0x6e167; + DBOP_TIMPOL_23 = 0xa167e06f; + DBOP_CTRL |= (1<<16); + DBOP_CTRL &= ~(1<<19); + + /* Reset buttons we're going to read from DBOP */ + int_btn &= ~(BUTTON_REC| + BUTTON_POWER); + +#if !defined(BOOTLOADER) + /*get_rec();*/ /* TODO: Need to find what else sets dbop15 besides rec */ + set_hold(); + clickwheel_int(); +#endif + get_power(); +} + +static void get_button_from_gpio(void) +{ + /* Reset buttons we're going to read from GPIO */ + int_btn &= ~(BUTTON_LEFT| + BUTTON_RIGHT| + BUTTON_UP| + BUTTON_DOWN| + BUTTON_SELECT); + if(hold_button) + return; + /* Set afsel, so that we can read our buttons */ + GPIOC_AFSEL &= ~(1<<2|1<<3|1<<4|1<<5|1<<6); + /* set dir so we can read our buttons (but reset the C pins first) */ + GPIOB_DIR &= ~(1<<4); + GPIOC_DIR |= (1<<2|1<<3|1<<4|1<<5|1<<6); + GPIOC_PIN(2) |= (1<<2); + GPIOC_PIN(3) |= (1<<3); + GPIOC_PIN(4) |= (1<<4); + GPIOC_PIN(5) |= (1<<5); + GPIOC_PIN(6) |= (1<<6); + + GPIOC_DIR &= ~(1<<2|1<<3|1<<4|1<<5|1<<6); + + int delay = 50; /* small delay needed to read buttons correctly */ + while(delay--); + /* direct GPIO connections */ - if (GPIOB_PIN(4)) - int_btn |= BUTTON_POWER; + if (!GPIOC_PIN(2)) + int_btn |= BUTTON_UP; + if (!GPIOC_PIN(3)) + int_btn |= BUTTON_LEFT; + if (!GPIOC_PIN(4)) + int_btn |= BUTTON_SELECT; + if (!GPIOC_PIN(5)) + int_btn |= BUTTON_RIGHT; if (!GPIOC_PIN(6)) int_btn |= BUTTON_DOWN; - if (!GPIOC_PIN(5)) - int_btn |= BUTTON_RIGHT; - if (!GPIOC_PIN(4)) - int_btn |= BUTTON_SELECT; - if (!GPIOC_PIN(3)) - int_btn |= BUTTON_LEFT; - if (!GPIOC_PIN(2)) - int_btn |= BUTTON_UP; - /* return to settings needed for lcd */ - GPIOB_DIR = dir_save_b; - GPIOB_AFSEL = afsel_save_b; - GPIOC_DIR = dir_save_c; - GPIOC_AFSEL = afsel_save_c; + GPIOC_DIR |= (1<<2|1<<3|1<<4|1<<5|1<<6); + GPIOC_AFSEL |= (1<<2|1<<3|1<<4|1<<5|1<<6); } +static inline void get_buttons_from_hw(void) +{ + get_button_from_dbob(); + get_button_from_gpio(); +} /* * Get button pressed from hardware */ int button_read_device(void) { -#ifdef BOOTLOADER - /* Read buttons directly in the bootloader */ - button_int(); -#else + get_buttons_from_hw(); +#ifndef BOOTLOADER /* light handling */ if (hold_button != hold_button_old) { @@ -136,7 +325,9 @@ backlight_hold_changed(hold_button); } #endif /* BOOTLOADER */ - - /* The int_btn variable is set in the button interrupt handler */ + /* set in get_button_from_dbob + get_button_from_gpio + get_rec + get_power */ return int_btn; }