mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Rename mutex_t to avoid conflict with other SDKs.
This commit is contained in:
parent
04336e6a1c
commit
974e2efa34
@ -17,7 +17,7 @@
|
||||
#include "cmsis_gcc.h"
|
||||
#include "py/mphal.h"
|
||||
|
||||
void mutex_init0(mutex_t *mutex)
|
||||
void mutex_init0(omv_mutex_t *mutex)
|
||||
{
|
||||
__DMB();
|
||||
mutex->tid = 0;
|
||||
@ -25,7 +25,7 @@ void mutex_init0(mutex_t *mutex)
|
||||
mutex->last_tid = 0;
|
||||
}
|
||||
|
||||
static void _mutex_lock(mutex_t *mutex, uint32_t tid, bool blocking)
|
||||
static void _mutex_lock(omv_mutex_t *mutex, uint32_t tid, bool blocking)
|
||||
{
|
||||
#if (CPU==cortex-m0)
|
||||
do {
|
||||
@ -52,12 +52,12 @@ static void _mutex_lock(mutex_t *mutex, uint32_t tid, bool blocking)
|
||||
__DMB();
|
||||
}
|
||||
|
||||
void mutex_lock(mutex_t *mutex, uint32_t tid)
|
||||
void mutex_lock(omv_mutex_t *mutex, uint32_t tid)
|
||||
{
|
||||
_mutex_lock(mutex, tid, true);
|
||||
}
|
||||
|
||||
int mutex_try_lock(mutex_t *mutex, uint32_t tid)
|
||||
int mutex_try_lock(omv_mutex_t *mutex, uint32_t tid)
|
||||
{
|
||||
// If the mutex is already locked by the current thread then
|
||||
// release it and return without locking, otherwise try to lock it.
|
||||
@ -70,7 +70,7 @@ int mutex_try_lock(mutex_t *mutex, uint32_t tid)
|
||||
return (mutex->tid == tid);
|
||||
}
|
||||
|
||||
int mutex_try_lock_alternate(mutex_t *mutex, uint32_t tid)
|
||||
int mutex_try_lock_alternate(omv_mutex_t *mutex, uint32_t tid)
|
||||
{
|
||||
if (mutex->last_tid != tid) {
|
||||
if (mutex_try_lock(mutex, tid)) {
|
||||
@ -82,7 +82,7 @@ int mutex_try_lock_alternate(mutex_t *mutex, uint32_t tid)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mutex_lock_timeout(mutex_t *mutex, uint32_t tid, uint32_t timeout)
|
||||
int mutex_lock_timeout(omv_mutex_t *mutex, uint32_t tid, uint32_t timeout)
|
||||
{
|
||||
mp_uint_t tick_start = mp_hal_ticks_ms();
|
||||
while ((mp_hal_ticks_ms() - tick_start) >= timeout) {
|
||||
@ -94,7 +94,7 @@ int mutex_lock_timeout(mutex_t *mutex, uint32_t tid, uint32_t timeout)
|
||||
return 0;
|
||||
}
|
||||
|
||||
void mutex_unlock(mutex_t *mutex, uint32_t tid)
|
||||
void mutex_unlock(omv_mutex_t *mutex, uint32_t tid)
|
||||
{
|
||||
if (mutex->tid == tid) {
|
||||
__DMB();
|
||||
|
||||
@ -18,12 +18,12 @@ typedef volatile struct {
|
||||
uint32_t tid;
|
||||
uint32_t lock;
|
||||
uint32_t last_tid;
|
||||
} mutex_t;
|
||||
} omv_mutex_t;
|
||||
|
||||
void mutex_init0(mutex_t *mutex);
|
||||
void mutex_lock(mutex_t *mutex, uint32_t tid);
|
||||
int mutex_try_lock(mutex_t *mutex, uint32_t tid);
|
||||
int mutex_try_lock_alternate(mutex_t *mutex, uint32_t tid);
|
||||
int mutex_lock_timeout(mutex_t *mutex, uint32_t tid, uint32_t timeout);
|
||||
void mutex_unlock(mutex_t *mutex, uint32_t tid);
|
||||
void mutex_init0(omv_mutex_t *mutex);
|
||||
void mutex_lock(omv_mutex_t *mutex, uint32_t tid);
|
||||
int mutex_try_lock(omv_mutex_t *mutex, uint32_t tid);
|
||||
int mutex_try_lock_alternate(omv_mutex_t *mutex, uint32_t tid);
|
||||
int mutex_lock_timeout(omv_mutex_t *mutex, uint32_t tid, uint32_t timeout);
|
||||
void mutex_unlock(omv_mutex_t *mutex, uint32_t tid);
|
||||
#endif /* __MUTEX_H__ */
|
||||
|
||||
@ -60,7 +60,7 @@ typedef struct jpegbuffer {
|
||||
int32_t size;
|
||||
int32_t enabled;
|
||||
int32_t quality;
|
||||
mutex_t lock;
|
||||
omv_mutex_t lock;
|
||||
OMV_ATTR_ALIGNED(uint8_t pixels[], FRAMEBUFFER_ALIGNMENT);
|
||||
} jpegbuffer_t;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user