diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/pp/thread-pp.c | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c index 511a5518ff..34b114910a 100644 --- a/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/lcd-remote-mr100.c | |||
@@ -500,14 +500,14 @@ void lcd_remote_off(void) | |||
500 | 500 | ||
501 | void lcd_remote_on(void) | 501 | void lcd_remote_on(void) |
502 | { | 502 | { |
503 | /* Only wake the remote thread if it's in the blocked state. */ | 503 | if (semaphore_wait(&rc_thread_wakeup, 0) == OBJ_WAIT_TIMEDOUT || |
504 | struct thread_entry *rc_thread = thread_id_entry(remote_thread_id); | 504 | (rc_status & RC_FORCE_DETECT)) |
505 | if (rc_thread->state == STATE_BLOCKED || (rc_status & RC_FORCE_DETECT)) | ||
506 | { | 505 | { |
507 | rc_status &= ~RC_FORCE_DETECT; | 506 | rc_status &= ~RC_FORCE_DETECT; |
508 | rc_status &= ~RC_POWER_OFF; | 507 | rc_status &= ~RC_POWER_OFF; |
509 | semaphore_release(&rc_thread_wakeup); | ||
510 | } | 508 | } |
509 | |||
510 | semaphore_release(&rc_thread_wakeup); | ||
511 | } | 511 | } |
512 | 512 | ||
513 | bool remote_detect(void) | 513 | bool remote_detect(void) |
diff --git a/firmware/target/arm/pp/thread-pp.c b/firmware/target/arm/pp/thread-pp.c index b2e7fb018d..184d243e8d 100644 --- a/firmware/target/arm/pp/thread-pp.c +++ b/firmware/target/arm/pp/thread-pp.c | |||
@@ -21,11 +21,6 @@ | |||
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | 23 | ||
24 | #if defined(MAX_PHYS_SECTOR_SIZE) && MEMORYSIZE == 64 | ||
25 | /* Support a special workaround object for large-sector disks */ | ||
26 | #define IF_NO_SKIP_YIELD(...) __VA_ARGS__ | ||
27 | #endif | ||
28 | |||
29 | #if NUM_CORES == 1 | 24 | #if NUM_CORES == 1 |
30 | /* Single-core variants for FORCE_SINGLE_CORE */ | 25 | /* Single-core variants for FORCE_SINGLE_CORE */ |
31 | static inline void core_sleep(void) | 26 | static inline void core_sleep(void) |