diff options
Diffstat (limited to 'firmware/target/arm/ipod/button-clickwheel.c')
-rw-r--r-- | firmware/target/arm/ipod/button-clickwheel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c index dd561b2e50..d5edd2bebc 100644 --- a/firmware/target/arm/ipod/button-clickwheel.c +++ b/firmware/target/arm/ipod/button-clickwheel.c | |||
@@ -84,7 +84,7 @@ int int_btn = BUTTON_NONE; | |||
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | #if CONFIG_CPU==S5L8701 || CONFIG_CPU==S5L8702 | 86 | #if CONFIG_CPU==S5L8701 || CONFIG_CPU==S5L8702 |
87 | static struct wakeup button_init_wakeup; | 87 | static struct semaphore button_init_wakeup; |
88 | #endif | 88 | #endif |
89 | 89 | ||
90 | #if CONFIG_CPU==S5L8702 | 90 | #if CONFIG_CPU==S5L8702 |
@@ -273,7 +273,7 @@ static inline int ipod_4g_button_read(void) | |||
273 | btn |= BUTTON_PLAY; | 273 | btn |= BUTTON_PLAY; |
274 | if (status & 0x00100000) | 274 | if (status & 0x00100000) |
275 | btn |= BUTTON_MENU; | 275 | btn |= BUTTON_MENU; |
276 | wakeup_signal(&button_init_wakeup); | 276 | semaphore_release(&button_init_wakeup); |
277 | } | 277 | } |
278 | #endif | 278 | #endif |
279 | 279 | ||
@@ -373,7 +373,7 @@ void s5l_clickwheel_init(void) | |||
373 | 373 | ||
374 | void button_init_device(void) | 374 | void button_init_device(void) |
375 | { | 375 | { |
376 | wakeup_init(&button_init_wakeup); | 376 | semaphore_init(&button_init_wakeup, 1, 0); |
377 | #if CONFIG_CPU==S5L8701 | 377 | #if CONFIG_CPU==S5L8701 |
378 | INTMSK |= (1<<26); | 378 | INTMSK |= (1<<26); |
379 | #elif CONFIG_CPU==S5L8702 | 379 | #elif CONFIG_CPU==S5L8702 |
@@ -381,7 +381,7 @@ void button_init_device(void) | |||
381 | holdswitch_last_value = (pmu_read(0x87) & 2) == 0; | 381 | holdswitch_last_value = (pmu_read(0x87) & 2) == 0; |
382 | #endif | 382 | #endif |
383 | s5l_clickwheel_init(); | 383 | s5l_clickwheel_init(); |
384 | wakeup_wait(&button_init_wakeup, HZ / 10); | 384 | semaphore_wait(&button_init_wakeup, HZ / 10); |
385 | } | 385 | } |
386 | 386 | ||
387 | bool button_hold(void) | 387 | bool button_hold(void) |