Skip to content

[bsp][stm32] Bound OpenAMP receive data and fix ring wraparound #11825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manyangshen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[bsp][stm32] Bound OpenAMP receive data and fix ring wraparound #11825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions bsp/stm32/stm32mp157a-st-discovery/board/ports/OpenAMP/drv_openamp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,37 @@ void VIRT_UART0_RxCpltCallback(VIRT_UART_HandleTypeDef *huart)
device = (struct rthw_openamp *)rt_device_find("openamp");
RT_ASSERT(device != RT_NULL);

if (rt_sem_take(&device->sema, RT_WAITING_FOREVER) != RT_EOK)
{
return;
}

buf = device->serial.rbuf;
count = device->serial.rbuf_count;
size = device->serial.rbuf_size;
offset = device->serial.rbuf_start + count;

rt_sem_take(&device->sema, RT_WAITING_FOREVER);

rx_size = (huart->RxXferSize < MAX_BUFFER_SIZE) ? huart->RxXferSize : MAX_BUFFER_SIZE - 1;

if (count < size)
{
rx_size = huart->RxXferSize;
if (rx_size > size - count)
{
rx_size = size - count;
}

if (offset >= size)
{
offset -= size;
}

for (i = 0; i < rx_size; i++)
{
buf[offset++] = huart->pRxBuffPtr[i];
count++;
buf[offset++] = huart->pRxBuffPtr[i];
if (offset >= size)
{
offset = 0;
}
count++;
}
}

Expand Down Expand Up @@ -117,6 +128,7 @@ static rt_err_t _init(struct rt_device *dev)

static rt_ssize_t _read(struct rt_device *dev, rt_off_t pos, void *buffer, rt_size_t size)
{
rt_err_t result;
rt_size_t count, rbsize, offset;
rt_uint8_t *buf = RT_NULL;
rt_uint8_t *pBuffer = RT_NULL;
Expand All @@ -126,17 +138,22 @@ static rt_ssize_t _read(struct rt_device *dev, rt_off_t pos, void *buffer, rt_si
device = (struct rthw_openamp *)dev;
RT_ASSERT(device != RT_NULL);

result = rt_sem_take(&device->sema, RT_WAITING_FOREVER);
if (result != RT_EOK)
{
return result;
}

pBuffer = (unsigned char*)buffer;
count = device->serial.rbuf_count;
buf = device->serial.rbuf;

if (count == 0)
{
rt_sem_release(&device->sema);
return -RT_ERROR;
}

rt_sem_take(&device->sema, RT_WAITING_FOREVER);

if (count >= size)
{
count = size;
Expand All @@ -148,7 +165,7 @@ static rt_ssize_t _read(struct rt_device *dev, rt_off_t pos, void *buffer, rt_si
for (i = 0; i < count; i++)
{
*pBuffer++ = buf[offset++];
if (offset > rbsize)
if (offset >= rbsize)
{
offset = 0;
}
Expand Down
35 changes: 26 additions & 9 deletions bsp/stm32/stm32mp157a-st-ev1/board/ports/OpenAMP/drv_openamp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,37 @@ void VIRT_UART0_RxCpltCallback(VIRT_UART_HandleTypeDef *huart)
device = (struct rthw_openamp *)rt_device_find("openamp");
RT_ASSERT(device != RT_NULL);

if (rt_sem_take(&device->sema, RT_WAITING_FOREVER) != RT_EOK)
{
return;
}

buf = device->serial.rbuf;
count = device->serial.rbuf_count;
size = device->serial.rbuf_size;
offset = device->serial.rbuf_start + count;

rt_sem_take(&device->sema, RT_WAITING_FOREVER);

rx_size = (huart->RxXferSize < MAX_BUFFER_SIZE) ? huart->RxXferSize : MAX_BUFFER_SIZE - 1;

if (count < size)
{
rx_size = huart->RxXferSize;
if (rx_size > size - count)
{
rx_size = size - count;
}

if (offset >= size)
{
offset -= size;
}

for (i = 0; i < rx_size; i++)
{
buf[offset++] = huart->pRxBuffPtr[i];
count++;
buf[offset++] = huart->pRxBuffPtr[i];
if (offset >= size)
{
offset = 0;
}
count++;
}
}

Expand Down Expand Up @@ -117,6 +128,7 @@ static rt_err_t _init(struct rt_device *dev)

static rt_ssize_t _read(struct rt_device *dev, rt_off_t pos, void *buffer, rt_size_t size)
{
rt_err_t result;
rt_size_t count, rbsize, offset;
rt_uint8_t *buf = RT_NULL;
rt_uint8_t *pBuffer = RT_NULL;
Expand All @@ -126,17 +138,22 @@ static rt_ssize_t _read(struct rt_device *dev, rt_off_t pos, void *buffer, rt_si
device = (struct rthw_openamp *)dev;
RT_ASSERT(device != RT_NULL);

result = rt_sem_take(&device->sema, RT_WAITING_FOREVER);
if (result != RT_EOK)
{
return result;
}

pBuffer = (unsigned char*)buffer;
count = device->serial.rbuf_count;
buf = device->serial.rbuf;

if (count == 0)
{
rt_sem_release(&device->sema);
return -RT_ERROR;
}

rt_sem_take(&device->sema, RT_WAITING_FOREVER);

if (count >= size)
{
count = size;
Expand All @@ -148,7 +165,7 @@ static rt_ssize_t _read(struct rt_device *dev, rt_off_t pos, void *buffer, rt_si
for (i = 0; i < count; i++)
{
*pBuffer++ = buf[offset++];
if (offset > rbsize)
if (offset >= rbsize)
{
offset = 0;
}
Expand Down
Loading