This is an automated email from the ASF dual-hosted git repository. GUIDINGLI pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 540e053c63d582e0272a02c960f1641230a4265c Author: huojianchao <[email protected]> AuthorDate: Tue Nov 10 11:48:07 2026 +0800 drivers/segger,note: fix pre-existing nxstyle errors Fix indentation, brace alignment and missing blank lines after declarations reported by tools/nxstyle in the following files: - drivers/note/notesnap_driver.c - drivers/note/notestream_driver.c - drivers/segger/note_rtt.c - drivers/segger/note_sysview.c - drivers/segger/serial_rtt.c No functional change. Signed-off-by: huojianchao <[email protected]> --- drivers/note/notesnap_driver.c | 1 + drivers/note/notestream_driver.c | 1 + drivers/segger/note_rtt.c | 1 + drivers/segger/note_sysview.c | 22 ++++++++++++---------- drivers/segger/serial_rtt.c | 8 ++++++++ 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/note/notesnap_driver.c b/drivers/note/notesnap_driver.c index 8b0aa478ad7..d4888384022 100644 --- a/drivers/note/notesnap_driver.c +++ b/drivers/note/notesnap_driver.c @@ -421,6 +421,7 @@ void notesnap_dump_with_stream(FAR struct lib_outstream_s *stream) void notesnap_dump(void) { struct lib_syslograwstream_s stream; + lib_syslograwstream_open(&stream); notesnap_dump_with_stream(&stream.common); lib_syslograwstream_close(&stream); diff --git a/drivers/note/notestream_driver.c b/drivers/note/notestream_driver.c index 9d6a277fdb2..e5286cc9418 100644 --- a/drivers/note/notestream_driver.c +++ b/drivers/note/notestream_driver.c @@ -92,6 +92,7 @@ static void notestream_add(FAR struct note_driver_s *drv, { FAR struct notestream_driver_s *drivers = (FAR struct notestream_driver_s *)drv; + lib_stream_puts(drivers->stream, note, len); } diff --git a/drivers/segger/note_rtt.c b/drivers/segger/note_rtt.c index eea92aa7b11..0a1813f48a0 100644 --- a/drivers/segger/note_rtt.c +++ b/drivers/segger/note_rtt.c @@ -95,6 +95,7 @@ static void notertt_add(FAR struct note_driver_s *drv, FAR const void *buf, size_t notelen) { FAR struct notertt_s *note = (FAR struct notertt_s *)drv; + lib_stream_puts(¬e->stream, buf, notelen); } diff --git a/drivers/segger/note_sysview.c b/drivers/segger/note_sysview.c index 17424c4bd51..dd80adf5d64 100644 --- a/drivers/segger/note_sysview.c +++ b/drivers/segger/note_sysview.c @@ -313,6 +313,7 @@ static void note_sysview_syscall_enter(FAR struct note_driver_s *drv, int nr, { FAR struct note_sysview_driver_s *driver = (FAR struct note_sysview_driver_s *)drv; + nr -= CONFIG_SYS_RESERVED; /* Set the name marker if the current syscall nr is not active */ @@ -349,6 +350,7 @@ static void note_sysview_syscall_leave(FAR struct note_driver_s *drv, { FAR struct note_sysview_driver_s *driver = (FAR struct note_sysview_driver_s *)drv; + nr -= CONFIG_SYS_RESERVED; if (NOTE_FILTER_SYSCALLMASK_ISSET(nr, &driver->driver.filter.syscall_mask)) @@ -392,16 +394,16 @@ static void note_sysview_heap(FAR struct note_driver_s *drv, { char name[32]; SEGGER_SYSVIEW_DATA_REGISTER data = - { - .ID = (U32)(uintptr_t)heap, - .DataType = SEGGER_SYSVIEW_TYPE_U32, - .Offset = 0, - .RangeMin = 0, - .RangeMax = 0, - .ScalingFactor = 1.f, - .sUnit = "B", - .sName = name, - }; + { + .ID = (U32)(uintptr_t)heap, + .DataType = SEGGER_SYSVIEW_TYPE_U32, + .Offset = 0, + .RangeMin = 0, + .RangeMax = 0, + .ScalingFactor = 1.f, + .sUnit = "B", + .sName = name, + }; snprintf(name, sizeof(name), "Heap%p", heap); diff --git a/drivers/segger/serial_rtt.c b/drivers/segger/serial_rtt.c index 6128c92c79e..9d95e1b714a 100644 --- a/drivers/segger/serial_rtt.c +++ b/drivers/segger/serial_rtt.c @@ -238,6 +238,7 @@ static void serial_rtt_shutdown(FAR struct uart_dev_s *dev) static int serial_rtt_attach(FAR struct uart_dev_s *dev) { FAR struct serial_rtt_s *rtt = dev->priv; + wd_start(&rtt->wdog, USEC2TICK(CONFIG_SERIAL_RTT_POLLING_INTERVAL), serial_rtt_timeout, (wdparm_t)dev); return OK; @@ -250,6 +251,7 @@ static int serial_rtt_attach(FAR struct uart_dev_s *dev) static void serial_rtt_detach(FAR struct uart_dev_s *dev) { FAR struct serial_rtt_s *rtt = dev->priv; + wd_cancel(&rtt->wdog); } @@ -271,6 +273,7 @@ static int serial_rtt_receive(FAR struct uart_dev_s *dev, FAR unsigned int *status) { FAR struct serial_rtt_s *rtt = dev->priv; + int ret; int ch; @@ -294,6 +297,7 @@ static void serial_rtt_rxint(FAR struct uart_dev_s *dev, bool enable) static bool serial_rtt_rxavailable(FAR struct uart_dev_s *dev) { FAR struct serial_rtt_s *rtt = dev->priv; + return SEGGER_RTT_HasData(rtt->channel) != 0; } @@ -304,6 +308,7 @@ static bool serial_rtt_rxavailable(FAR struct uart_dev_s *dev) static void serial_rtt_dmasend(FAR struct uart_dev_s *dev) { FAR struct serial_rtt_s *rtt = dev->priv; + FAR struct uart_dmaxfer_s *xfer = &dev->dmatx; size_t len; @@ -326,6 +331,7 @@ static void serial_rtt_dmasend(FAR struct uart_dev_s *dev) static void serial_rtt_dmareceive(FAR struct uart_dev_s *dev) { FAR struct serial_rtt_s *rtt = dev->priv; + FAR struct uart_dmaxfer_s *xfer = &dev->dmarx; size_t len; @@ -394,6 +400,7 @@ static void serial_rtt_txint(FAR struct uart_dev_s *dev, bool enable) static bool serial_rtt_txready(FAR struct uart_dev_s *dev) { FAR struct serial_rtt_s *rtt = dev->priv; + return SEGGER_RTT_GetAvailWriteSpace(rtt->channel) != 0; } @@ -404,6 +411,7 @@ static bool serial_rtt_txready(FAR struct uart_dev_s *dev) static bool serial_rtt_txempty(FAR struct uart_dev_s *dev) { FAR struct serial_rtt_s *rtt = dev->priv; + return SEGGER_RTT_GetBytesInBuffer(rtt->channel) == 0; }
