Skip to content

Commit 8622bd5

Browse files
feilipufeilipu
authored
Fix ThirdParty/GCC/ATmega formatting (#965)
Unnecessary white space was introduced in PR #768 which affected the formatting of assembly code. This PR returns the correct formatting. No functional change.
1 parent 04cb022 commit 8622bd5

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎portable/ThirdParty/GCC/ATmega/port.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
100100
{
101101
__asm__ __volatile__ (
102102
"in __tmp_reg__,__SREG__" "\n\t"
103-
"cli" "\n\t"
104-
"wdr" "\n\t"
105-
"out %0, %1" "\n\t"
106-
"out __SREG__,__tmp_reg__" "\n\t"
107-
"out %0, %2" "\n\t"
103+
"cli" "\n\t"
104+
"wdr" "\n\t"
105+
"out %0, %1" "\n\t"
106+
"out __SREG__,__tmp_reg__" "\n\t"
107+
"out %0, %2" "\n\t"
108108
: /* no outputs */
109109
: "I" ( _SFR_IO_ADDR( _WD_CONTROL_REG ) ),
110110
"r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
@@ -117,11 +117,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
117117
{
118118
__asm__ __volatile__ (
119119
"in __tmp_reg__,__SREG__" "\n\t"
120-
"cli" "\n\t"
121-
"wdr" "\n\t"
122-
"sts %0, %1" "\n\t"
123-
"out __SREG__,__tmp_reg__" "\n\t"
124-
"sts %0, %2" "\n\t"
120+
"cli" "\n\t"
121+
"wdr" "\n\t"
122+
"sts %0, %1" "\n\t"
123+
"out __SREG__,__tmp_reg__" "\n\t"
124+
"sts %0, %2" "\n\t"
125125
: /* no outputs */
126126
: "n" ( _SFR_MEM_ADDR( _WD_CONTROL_REG ) ),
127127
"r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
@@ -167,11 +167,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
167167
{
168168
__asm__ __volatile__ (
169169
"in __tmp_reg__,__SREG__" "\n\t"
170-
"cli" "\n\t"
171-
"wdr" "\n\t"
172-
"out %0, %1" "\n\t"
173-
"out __SREG__,__tmp_reg__" "\n\t"
174-
"out %0, %2" "\n\t"
170+
"cli" "\n\t"
171+
"wdr" "\n\t"
172+
"out %0, %1" "\n\t"
173+
"out __SREG__,__tmp_reg__" "\n\t"
174+
"out %0, %2" "\n\t"
175175
: /* no outputs */
176176
: "I" ( _SFR_IO_ADDR( _WD_CONTROL_REG ) ),
177177
"r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
@@ -184,11 +184,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
184184
{
185185
__asm__ __volatile__ (
186186
"in __tmp_reg__,__SREG__" "\n\t"
187-
"cli" "\n\t"
188-
"wdr" "\n\t"
189-
"sts %0, %1" "\n\t"
190-
"out __SREG__,__tmp_reg__" "\n\t"
191-
"sts %0, %2" "\n\t"
187+
"cli" "\n\t"
188+
"wdr" "\n\t"
189+
"sts %0, %1" "\n\t"
190+
"out __SREG__,__tmp_reg__" "\n\t"
191+
"sts %0, %2" "\n\t"
192192
: /* no outputs */
193193
: "n" ( _SFR_MEM_ADDR( _WD_CONTROL_REG ) ),
194194
"r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),

‎portable/ThirdParty/GCC/ATmega/portmacro.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,20 @@ typedef uint8_t UBaseType_t;
7373

7474
/* Critical section management. */
7575

76-
#define portENTER_CRITICAL() \
77-
__asm__ __volatile__ ( \
78-
"in __tmp_reg__, __SREG__" "\n\t" \
79-
"cli" "\n\t" \
80-
"push __tmp_reg__" "\n\t" \
81-
::: "memory" \
76+
#define portENTER_CRITICAL() \
77+
__asm__ __volatile__ ( \
78+
"in __tmp_reg__, __SREG__" "\n\t" \
79+
"cli" "\n\t" \
80+
"push __tmp_reg__" "\n\t" \
81+
::: "memory" \
8282
)
8383

8484

85-
#define portEXIT_CRITICAL() \
86-
__asm__ __volatile__ ( \
87-
"pop __tmp_reg__" "\n\t" \
88-
"out __SREG__, __tmp_reg__" "\n\t" \
89-
::: "memory" \
85+
#define portEXIT_CRITICAL() \
86+
__asm__ __volatile__ ( \
87+
"pop __tmp_reg__" "\n\t" \
88+
"out __SREG__, __tmp_reg__" "\n\t" \
89+
::: "memory" \
9090
)
9191

9292

0 commit comments

Comments
 (0)