[drivers/serial] Introduce hooker for TTY (#8733)

In this patch, a hook list has been introduced to address the concerns
regarding coupling issues arising from modifications to the serial code
for integrating TTY logic.

Signed-off-by: Shell <smokewood@qq.com>
This commit is contained in:
Shell
2024-04-09 21:36:16 +08:00
committed by GitHub
parent 38204386b3
commit 4b0f42c24a
11 changed files with 90 additions and 35 deletions
@@ -102,6 +102,14 @@
0 \
}
/**
* @brief Sets a hook function when RX indicate is called
*
* @param thread is the target thread that initializing
*/
typedef void (*rt_hw_serial_rxind_hookproto_t)(rt_device_t dev, rt_size_t size);
RT_OBJECT_HOOKLIST_DECLARE(rt_hw_serial_rxind_hookproto_t, rt_hw_serial_rxind);
struct serial_configure
{
rt_uint32_t baud_rate;
@@ -186,4 +194,5 @@ rt_err_t rt_hw_serial_register(struct rt_serial_device *serial,
void *data);
rt_err_t rt_hw_serial_register_tty(struct rt_serial_device *serial);
#endif
@@ -103,6 +103,14 @@
0 \
}
/**
* @brief Sets a hook function when RX indicate is called
*
* @param thread is the target thread that initializing
*/
typedef void (*rt_hw_serial_rxind_hookproto_t)(rt_device_t dev, rt_size_t size);
RT_OBJECT_HOOKLIST_DECLARE(rt_hw_serial_rxind_hookproto_t, rt_hw_serial_rxind);
struct serial_configure
{
rt_uint32_t baud_rate;
+1 -1
View File
@@ -12,7 +12,7 @@
#include <rtdevice.h>
#include <drivers/platform.h>
#include <drivers/core/bus.h>
#include "../serial/serial_dm.h"
#include <drivers/serial_dm.h>
#define DBG_TAG "rtdm.ofw"
#define DBG_LVL DBG_INFO
+5 -12
View File
@@ -57,10 +57,14 @@
#undef putc
#endif
RT_OBJECT_HOOKLIST_DEFINE(rt_hw_serial_rxind);
static rt_err_t serial_fops_rx_ind(rt_device_t dev, rt_size_t size)
{
rt_wqueue_wakeup(&(dev->wait_queue), (void*)POLLIN);
RT_OBJECT_HOOKLIST_CALL(rt_hw_serial_rxind, (dev, size));
return RT_EOK;
}
@@ -1388,14 +1392,6 @@ rt_err_t rt_hw_serial_register(struct rt_serial_device *serial,
return ret;
}
#if defined(RT_USING_SMART) && defined(LWP_DEBUG)
static volatile int _early_input = 0;
int lwp_startup_debug_request(void)
{
return _early_input;
}
#endif
/* ISR for serial interrupt */
void rt_hw_serial_isr(struct rt_serial_device *serial, int event)
{
@@ -1441,7 +1437,7 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event)
/**
* Invoke callback.
* First try notify if any, and if notify is existed, rx_indicate()
* is not callback. This seperate the priority and makes the reuse
* is not callback. This separate the priority and makes the reuse
* of same serial device reasonable for RT console.
*/
if (serial->rx_notify.notify)
@@ -1463,9 +1459,6 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event)
serial->parent.rx_indicate(&serial->parent, rx_length);
}
}
#if defined(RT_USING_SMART) && defined(LWP_DEBUG)
_early_input = 1;
#endif
break;
}
case RT_SERIAL_EVENT_TX_DONE:
+3 -2
View File
@@ -9,7 +9,7 @@
*/
#include <rtatomic.h>
#include "serial_dm.h"
#include <drivers/serial_dm.h>
int serial_dev_set_name(struct rt_serial_device *sdev)
{
@@ -82,8 +82,9 @@ void *serial_base_from_args(char *str)
return (void *)base;
}
struct serial_configure serial_cfg_from_args(char *str)
struct serial_configure serial_cfg_from_args(char *_str)
{
char *str = _str;
struct serial_configure cfg = RT_SERIAL_CONFIG_DEFAULT;
/* Format baudrate/parity/bits/flow (BBBBPNF), Default is 115200n8 */
+33
View File
@@ -63,6 +63,37 @@ static char *alloc_device_name(void)
return tty_dev_name;
}
#ifdef LWP_DEBUG_INIT
static volatile int _early_input = 0;
static void _set_debug(rt_device_t dev, rt_size_t size);
RT_OBJECT_HOOKLIST_DEFINE_NODE(rt_hw_serial_rxind, _set_debug_node, _set_debug);
static void _set_debug(rt_device_t dev, rt_size_t size)
{
rt_list_remove(&_set_debug_node.list_node);
_early_input = 1;
}
static void _setup_debug_rxind_hook(void)
{
rt_hw_serial_rxind_sethook(&_set_debug_node);
}
int lwp_startup_debug_request(void)
{
return _early_input;
}
#else /* !LWP_DEBUG_INIT */
static void _setup_debug_rxind_hook(void)
{
return ;
}
#endif /* LWP_DEBUG_INIT */
static void _tty_rx_notify(struct rt_device *device)
{
lwp_tty_t tp;
@@ -325,6 +356,8 @@ static int _tty_workqueue_init(void)
LWP_TTY_WORKQUEUE_PRIORITY);
RT_ASSERT(_ttyworkq != RT_NULL);
_setup_debug_rxind_hook();
return RT_EOK;
}
INIT_PREV_EXPORT(_tty_workqueue_init);
+4
View File
@@ -35,10 +35,14 @@
#undef putc
#endif
RT_OBJECT_HOOKLIST_DEFINE(rt_hw_serial_rxind);
static rt_err_t serial_fops_rx_ind(rt_device_t dev, rt_size_t size)
{
rt_wqueue_wakeup(&(dev->wait_queue), (void*)POLLIN);
RT_OBJECT_HOOKLIST_CALL(rt_hw_serial_rxind, (dev, size));
return RT_EOK;
}