From 1499844699f6d8e3ce7c5720e6f88e6ce9691b6d Mon Sep 17 00:00:00 2001 From: z14git Date: Sat, 18 Jan 2020 10:10:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0=E4=B8=B2?= =?UTF-8?q?=E5=8F=A3=E6=8E=A5=E6=94=B6=E7=BC=93=E5=86=B2=E5=8C=BA=E6=BB=A1?= =?UTF-8?q?=E4=B8=94=E6=B2=A1=E6=9C=89=E5=BC=80=E5=90=AFULOG=5FUSING=5FISR?= =?UTF-8?q?=5FLOG=E8=80=8C=E9=80=A0=E6=88=90=E7=9A=84=E6=AD=BB=E6=9C=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/serial/serial.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index 50dd7e188b..48cf95073d 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -330,14 +330,16 @@ rt_inline int _serial_int_tx(struct rt_serial_device *serial, const rt_uint8_t * static void _serial_check_buffer_size(void) { static rt_bool_t already_output = RT_FALSE; - + if (already_output == RT_FALSE) { +#if defined(ULOG_USING_ISR_LOG) LOG_W("Warning: There is no enough buffer for saving data," " please increase the RT_SERIAL_RB_BUFSZ option."); +#endif already_output = RT_TRUE; } -} +} #if defined(RT_USING_POSIX) || defined(RT_SERIAL_USING_DMA) static rt_size_t _serial_fifo_calc_recved_len(struct rt_serial_device *serial) @@ -1286,4 +1288,3 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event) #endif /* RT_SERIAL_USING_DMA */ } } - From 50c2af5eeaa10b776e19d47d55671495c4a82fbb Mon Sep 17 00:00:00 2001 From: z14git Date: Tue, 21 Jan 2020 16:38:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[serial.c]=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=BC=80=E5=90=AFulog=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=E6=97=A5=E5=BF=97=E4=B8=8D=E4=BC=9A=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/drivers/serial/serial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index 48cf95073d..d1c04dec6f 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -333,7 +333,7 @@ static void _serial_check_buffer_size(void) if (already_output == RT_FALSE) { -#if defined(ULOG_USING_ISR_LOG) +#if !defined(RT_USING_ULOG) || defined(ULOG_USING_ISR_LOG) LOG_W("Warning: There is no enough buffer for saving data," " please increase the RT_SERIAL_RB_BUFSZ option."); #endif