From 0458db2130cf9b277222fdfee90ddccb68e88a28 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Fri, 25 Jul 2025 12:49:43 +0200 Subject: [PATCH] misc: Use updated mutex API. Signed-off-by: iabdalkader --- common/usbdbg.c | 4 ++-- lib/imlib/framebuffer.c | 2 +- lib/imlib/framebuffer.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/usbdbg.c b/common/usbdbg.c index bc779b9eb..607ad19ae 100644 --- a/common/usbdbg.c +++ b/common/usbdbg.c @@ -173,7 +173,7 @@ void usbdbg_data_in(uint32_t size, usbdbg_write_callback_t write_callback) { // Return 0 if FB is locked or not ready. uint32_t buffer[3] = { 0 }; // Try to lock FB. If header size == 0 frame is not ready - if (mutex_try_lock_alternate(&JPEG_FB()->lock, MUTEX_TID_IDE)) { + if (mutex_try_lock_fair(&JPEG_FB()->lock, MUTEX_TID_IDE)) { // If header size == 0 frame is not ready if (JPEG_FB()->size == 0) { // unlock FB @@ -249,7 +249,7 @@ void usbdbg_data_in(uint32_t size, usbdbg_write_callback_t write_callback) { // Limit the frames sent over USB to 20Hz. if (ticks_diff_ms(last_update_ms) > 50 && - mutex_try_lock_alternate(&JPEG_FB()->lock, MUTEX_TID_IDE)) { + mutex_try_lock_fair(&JPEG_FB()->lock, MUTEX_TID_IDE)) { // If header size == 0 frame is not ready if (JPEG_FB()->size == 0) { // unlock FB diff --git a/lib/imlib/framebuffer.c b/lib/imlib/framebuffer.c index 45629c151..6932dfd89 100644 --- a/lib/imlib/framebuffer.c +++ b/lib/imlib/framebuffer.c @@ -248,7 +248,7 @@ void framebuffer_update_jpeg_buffer(image_t *src) { } // Lock the JPEG buffer. - if (!mutex_try_lock_alternate(&jpegbuffer.lock, MUTEX_TID_OMV)) { + if (!mutex_try_lock_fair(&jpegbuffer.lock, MUTEX_TID_OMV)) { return; } diff --git a/lib/imlib/framebuffer.h b/lib/imlib/framebuffer.h index cb5bfcffe..1b60b0f6b 100644 --- a/lib/imlib/framebuffer.h +++ b/lib/imlib/framebuffer.h @@ -27,9 +27,9 @@ #define __FRAMEBUFFER_H__ #include #include "imlib.h" -#include "mutex.h" #include "omv_common.h" #include "common/queue.h" +#include "common/mutex.h" #ifndef FRAMEBUFFER_ALIGNMENT #define FRAMEBUFFER_ALIGNMENT OMV_CACHE_LINE_SIZE @@ -122,7 +122,7 @@ typedef struct jpegbuffer { int32_t enabled; int32_t quality; uint8_t *pixels; - omv_mutex_t lock; + mutex_t lock; } jpegbuffer_t; void framebuffer_init0();