Skip to content

Commit 4e7d13b

Browse files
zmshahahaRbb666
authored andcommitted
fix: code format of serial.c and compile error in aarch64 context_gcc
1 parent e9133d5 commit 4e7d13b

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

components/drivers/serial/serial.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,30 +1019,28 @@ static void _tc_flush(struct rt_serial_device *serial, int queue)
10191019

10201020
}
10211021

1022-
static inline int _termio_to_termios(const struct termio *termio,
1023-
struct termios *termios)
1022+
static inline int _termio_to_termios(const struct termio *termio, struct termios *termios)
10241023
{
1025-
termios->c_iflag = termio->c_iflag;
1026-
termios->c_oflag = termio->c_oflag;
1027-
termios->c_cflag = termio->c_cflag;
1028-
termios->c_lflag = termio->c_lflag;
1024+
termios->c_iflag = termio->c_iflag;
1025+
termios->c_oflag = termio->c_oflag;
1026+
termios->c_cflag = termio->c_cflag;
1027+
termios->c_lflag = termio->c_lflag;
10291028
termios->c_line = termio->c_line;
10301029
rt_memcpy(termios->c_cc, termio->c_cc, NCC);
10311030

1032-
return 0;
1031+
return 0;
10331032
}
10341033

1035-
static inline int _termios_to_termio(const struct termios *termios,
1036-
struct termio *termio)
1034+
static inline int _termios_to_termio(const struct termios *termios, struct termio *termio)
10371035
{
10381036
termio->c_iflag = (unsigned short)termios->c_iflag;
10391037
termio->c_oflag = (unsigned short)termios->c_oflag;
10401038
termio->c_cflag = (unsigned short)termios->c_cflag;
10411039
termio->c_lflag = (unsigned short)termios->c_lflag;
10421040
termio->c_line = termios->c_line;
1043-
rt_memcpy(termio->c_cc, termios->c_cc, NCC);
1041+
rt_memcpy(termio->c_cc, termios->c_cc, NCC);
10441042

1045-
return 0;
1043+
return 0;
10461044
}
10471045
#endif /* RT_USING_POSIX_TERMIOS */
10481046

libcpu/aarch64/common/context_gcc.S

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
#include "armv8.h"
2121

2222
#ifndef RT_USING_SMP
23-
.bss
24-
.align 3
25-
rt_interrupt_from_thread: .comm 8, 8
26-
rt_interrupt_to_thread: .comm 8, 8
27-
rt_thread_switch_interrupt_flag: .comm 8, 8
23+
.section .data
24+
rt_interrupt_from_thread: .zero 8
25+
rt_interrupt_to_thread: .zero 8
26+
rt_thread_switch_interrupt_flag: .zero 8
2827
#endif
2928

3029
.text

0 commit comments

Comments
 (0)