summaryrefslogtreecommitdiff
path: root/osal
diff options
context:
space:
mode:
authorsakimisu <[email protected]>2023-04-21 23:24:13 +0800
committersakimisu <[email protected]>2023-04-21 23:24:13 +0800
commitdc4887aef1b7de2529f8831ea9d5a38d9bccca04 (patch)
treec192afd9120a9c3ddfb10fe5466030fa9b0ad998 /osal
parent4b59a1330e9390f21db6c52cf40be8cd6a39c7e6 (diff)
fix pointer in 64bit cpu, use uintptr_t instead
Diffstat (limited to 'osal')
-rw-r--r--osal/usb_osal.h4
-rw-r--r--osal/usb_osal_freertos.c6
-rw-r--r--osal/usb_osal_rtthread.c10
3 files changed, 10 insertions, 10 deletions
diff --git a/osal/usb_osal.h b/osal/usb_osal.h
index d730b74e..7f723559 100644
--- a/osal/usb_osal.h
+++ b/osal/usb_osal.h
@@ -28,8 +28,8 @@ int usb_osal_mutex_take(usb_osal_mutex_t mutex);
int usb_osal_mutex_give(usb_osal_mutex_t mutex);
usb_osal_mq_t usb_osal_mq_create(uint32_t max_msgs);
-int usb_osal_mq_send(usb_osal_mq_t mq, uint32_t addr);
-int usb_osal_mq_recv(usb_osal_mq_t mq, uint32_t *addr, uint32_t timeout);
+int usb_osal_mq_send(usb_osal_mq_t mq, uintptr_t addr);
+int usb_osal_mq_recv(usb_osal_mq_t mq, uintptr_t *addr, uint32_t timeout);
size_t usb_osal_enter_critical_section(void);
void usb_osal_leave_critical_section(size_t flag);
diff --git a/osal/usb_osal_freertos.c b/osal/usb_osal_freertos.c
index 65d9f1c3..8547a4c0 100644
--- a/osal/usb_osal_freertos.c
+++ b/osal/usb_osal_freertos.c
@@ -68,10 +68,10 @@ int usb_osal_mutex_give(usb_osal_mutex_t mutex)
usb_osal_mq_t usb_osal_mq_create(uint32_t max_msgs)
{
- return (usb_osal_mq_t)xQueueCreate(max_msgs, 4);
+ return (usb_osal_mq_t)xQueueCreate(max_msgs, sizeof(uintptr_t));
}
-int usb_osal_mq_send(usb_osal_mq_t mq, uint32_t addr)
+int usb_osal_mq_send(usb_osal_mq_t mq, uintptr_t addr)
{
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
int ret;
@@ -84,7 +84,7 @@ int usb_osal_mq_send(usb_osal_mq_t mq, uint32_t addr)
return (ret == pdPASS) ? 0 : -ETIMEDOUT;
}
-int usb_osal_mq_recv(usb_osal_mq_t mq, uint32_t *addr, uint32_t timeout)
+int usb_osal_mq_recv(usb_osal_mq_t mq, uintptr_t *addr, uint32_t timeout)
{
return (xQueueReceive((usb_osal_mq_t)mq, addr, timeout) == pdPASS) ? 0 : -ETIMEDOUT;
}
diff --git a/osal/usb_osal_rtthread.c b/osal/usb_osal_rtthread.c
index f2f830e7..e1c90499 100644
--- a/osal/usb_osal_rtthread.c
+++ b/osal/usb_osal_rtthread.c
@@ -70,20 +70,20 @@ int usb_osal_mutex_give(usb_osal_mutex_t mutex)
usb_osal_mq_t usb_osal_mq_create(uint32_t max_msgs)
{
- return (usb_osal_mq_t)rt_mq_create("usbh_mq", 4, max_msgs, RT_IPC_FLAG_FIFO);
+ return (usb_osal_mq_t)rt_mq_create("usbh_mq", sizeof(uintptr_t), max_msgs, RT_IPC_FLAG_FIFO);
}
-int usb_osal_mq_send(usb_osal_mq_t mq, uint32_t addr)
+int usb_osal_mq_send(usb_osal_mq_t mq, uintptr_t addr)
{
- return rt_mq_send((rt_mq_t)mq, &addr, 4);
+ return rt_mq_send((rt_mq_t)mq, &addr, sizeof(uintptr_t));
}
-int usb_osal_mq_recv(usb_osal_mq_t mq, uint32_t *addr, uint32_t timeout)
+int usb_osal_mq_recv(usb_osal_mq_t mq, uintptr_t *addr, uint32_t timeout)
{
int ret = 0;
rt_err_t result = RT_EOK;
- result = rt_mq_recv((rt_mq_t)mq, addr, 4, rt_tick_from_millisecond(timeout));
+ result = rt_mq_recv((rt_mq_t)mq, addr, sizeof(uintptr_t), rt_tick_from_millisecond(timeout));
if (result == -RT_ETIMEOUT) {
ret = -ETIMEDOUT;
} else if (result == -RT_ERROR) {