summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthread-liu <[email protected]>2020-10-27 11:44:29 +0800
committerthread-liu <[email protected]>2020-10-27 11:44:52 +0800
commitd2d6fc47afd898ecfb67ae1724ee68e1638f0c91 (patch)
treee08276140eb43e404f664363fe2db506d5bd40d8
parent5f911c6dc2d157826b212971e92b4c1bc16395ec (diff)
[update] openamp and rs485 driver
-rw-r--r--bsp/stm32/stm32mp157a-st-discovery/board/ports/OpenAMP/drv_openamp.c4
-rw-r--r--bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_rs485.c9
2 files changed, 7 insertions, 6 deletions
diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/OpenAMP/drv_openamp.c b/bsp/stm32/stm32mp157a-st-discovery/board/ports/OpenAMP/drv_openamp.c
index acdaa481a0..12651efa1a 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/OpenAMP/drv_openamp.c
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/OpenAMP/drv_openamp.c
@@ -236,11 +236,11 @@ int rt_hw_openamp_init(void)
rt_hw_openamp_register(&dev_openamp, "openamp", 0, NULL);
- if (rt_strcmp(RT_CONSOLE_DEVICE_NAME, "openamp") == 0)
+ if (RT_CONSOLE_DEVICE_NAME == "openamp")
{
rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
}
-
+
return RT_EOK;
}
INIT_PREV_EXPORT(rt_hw_openamp_init);
diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_rs485.c b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_rs485.c
index e3130643e9..44eba3be91 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_rs485.c
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_rs485.c
@@ -19,14 +19,13 @@
static rt_device_t serial = {0};
static struct rt_semaphore rx_sem = {0};
-/* rs485 send data callback function */
+/* uart send data callback function */
static rt_err_t rs485_output(rt_device_t dev, void * buffer)
{
- RS485_IN;
-
return RT_EOK;
}
+/* uart receive data callback function */
static rt_err_t rs485_input(rt_device_t dev, rt_size_t size)
{
rt_sem_release(&rx_sem);
@@ -37,12 +36,13 @@ static rt_err_t rs485_input(rt_device_t dev, rt_size_t size)
/* send string */
int rs485_send_data(char *tbuf, rt_uint16_t t_len)
{
- /* set rs485 mode */
+ /* change rs485 mode */
RS485_OUT;
/* send data */
rt_device_write(serial, 0, tbuf, t_len);
+ /* change rs485 mode */
RS485_IN;
return RT_EOK;
@@ -63,6 +63,7 @@ static void rs485_thread_entry(void *parameter)
/* The data read through the serial port output dislocation */
ch = ch + 1;
+ /* send char */
rs485_send_data(&ch, 1);
}
}