diff options
| author | Michael Giacomelli <giac2000@hotmail.com> | 2016-01-18 22:35:56 +0100 |
|---|---|---|
| committer | Michael Giacomelli <giac2000@hotmail.com> | 2016-01-18 22:35:56 +0100 |
| commit | 784790dbec40695bd6d74c862d9e5730e17ba9fd (patch) | |
| tree | f9deffae8b09e74cfde0836d7b903a2ae26b6653 | |
| parent | 1015088d90275336e7b999624d2524800b8aa3e8 (diff) | |
| download | rockbox-784790dbec40695bd6d74c862d9e5730e17ba9fd.tar.gz rockbox-784790dbec40695bd6d74c862d9e5730e17ba9fd.zip | |
Change the clipv2 button driver to use fixed delays rather than processor cycle counting.
Also introduce a new delay needed for frequency scaling.
Change-Id: I575a503a8ca44358fcd5512fd951fe9c7bbde31c
| -rw-r--r-- | firmware/target/arm/as3525/button-clip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/target/arm/as3525/button-clip.c b/firmware/target/arm/as3525/button-clip.c index 35b5e8af5e..c83590a06e 100644 --- a/firmware/target/arm/as3525/button-clip.c +++ b/firmware/target/arm/as3525/button-clip.c | |||
| @@ -118,10 +118,7 @@ bool button_hold(void) | |||
| 118 | #ifdef SANSA_CLIPV2 | 118 | #ifdef SANSA_CLIPV2 |
| 119 | GPIOA_DIR |= 1<<7; | 119 | GPIOA_DIR |= 1<<7; |
| 120 | GPIOA_PIN(7) = 1<<7; | 120 | GPIOA_PIN(7) = 1<<7; |
| 121 | 121 | udelay(2); | |
| 122 | int delay = 50; | ||
| 123 | while(delay--) | ||
| 124 | asm("nop"); | ||
| 125 | #endif | 122 | #endif |
| 126 | 123 | ||
| 127 | bool hold_button = (GPIOA_PIN(3) != 0); | 124 | bool hold_button = (GPIOA_PIN(3) != 0); |
| @@ -129,6 +126,7 @@ bool button_hold(void) | |||
| 129 | #ifdef SANSA_CLIPV2 | 126 | #ifdef SANSA_CLIPV2 |
| 130 | GPIOA_PIN(7) = 0; | 127 | GPIOA_PIN(7) = 0; |
| 131 | GPIOA_DIR &= ~(1<<7); | 128 | GPIOA_DIR &= ~(1<<7); |
| 129 | udelay(4); | ||
| 132 | #endif | 130 | #endif |
| 133 | 131 | ||
| 134 | #ifndef BOOTLOADER | 132 | #ifndef BOOTLOADER |