Skip to content

Commit 687eb87

Browse files
zmshahahamysterywolf
authored andcommitted
fix: code format of serial.c and compile error in aarch64 context_gcc
1 parent 34fb8d2 commit 687eb87

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
@@ -1015,30 +1015,28 @@ static void _tc_flush(struct rt_serial_device *serial, int queue)
10151015

10161016
}
10171017

1018-
static inline int _termio_to_termios(const struct termio *termio,
1019-
struct termios *termios)
1018+
static inline int _termio_to_termios(const struct termio *termio, struct termios *termios)
10201019
{
1021-
termios->c_iflag = termio->c_iflag;
1022-
termios->c_oflag = termio->c_oflag;
1023-
termios->c_cflag = termio->c_cflag;
1024-
termios->c_lflag = termio->c_lflag;
1020+
termios->c_iflag = termio->c_iflag;
1021+
termios->c_oflag = termio->c_oflag;
1022+
termios->c_cflag = termio->c_cflag;
1023+
termios->c_lflag = termio->c_lflag;
10251024
termios->c_line = termio->c_line;
10261025
rt_memcpy(termios->c_cc, termio->c_cc, NCC);
10271026

1028-
return 0;
1027+
return 0;
10291028
}
10301029

1031-
static inline int _termios_to_termio(const struct termios *termios,
1032-
struct termio *termio)
1030+
static inline int _termios_to_termio(const struct termios *termios, struct termio *termio)
10331031
{
10341032
termio->c_iflag = (unsigned short)termios->c_iflag;
10351033
termio->c_oflag = (unsigned short)termios->c_oflag;
10361034
termio->c_cflag = (unsigned short)termios->c_cflag;
10371035
termio->c_lflag = (unsigned short)termios->c_lflag;
10381036
termio->c_line = termios->c_line;
1039-
rt_memcpy(termio->c_cc, termios->c_cc, NCC);
1037+
rt_memcpy(termio->c_cc, termios->c_cc, NCC);
10401038

1041-
return 0;
1039+
return 0;
10421040
}
10431041
#endif /* RT_USING_POSIX_TERMIOS */
10441042

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)