mirror of
				https://github.com/FreeRTOS/FreeRTOS-Kernel.git
				synced 2025-11-04 02:59:01 +01:00 
			
		
		
		
	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.
This commit is contained in:
		
							parent
							
								
									04cb022e44
								
							
						
					
					
						commit
						8622bd5f49
					
				
							
								
								
									
										40
									
								
								portable/ThirdParty/GCC/ATmega/port.c
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										40
									
								
								portable/ThirdParty/GCC/ATmega/port.c
									
									
									
									
										vendored
									
									
								
							@ -100,11 +100,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
 | 
			
		||||
        {
 | 
			
		||||
            __asm__ __volatile__ (
 | 
			
		||||
                "in __tmp_reg__,__SREG__"   "\n\t"
 | 
			
		||||
                                            "cli"                       "\n\t"
 | 
			
		||||
                                                                        "wdr"                       "\n\t"
 | 
			
		||||
                                                                                                    "out %0, %1"                "\n\t"
 | 
			
		||||
                                                                                                                                "out __SREG__,__tmp_reg__"  "\n\t"
 | 
			
		||||
                                                                                                                                                            "out %0, %2"                "\n\t"
 | 
			
		||||
                "cli"                       "\n\t"
 | 
			
		||||
                "wdr"                       "\n\t"
 | 
			
		||||
                "out %0, %1"                "\n\t"
 | 
			
		||||
                "out __SREG__,__tmp_reg__"  "\n\t"
 | 
			
		||||
                "out %0, %2"                "\n\t"
 | 
			
		||||
                : /* no outputs */
 | 
			
		||||
                : "I" ( _SFR_IO_ADDR( _WD_CONTROL_REG ) ),
 | 
			
		||||
                "r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
 | 
			
		||||
@ -117,11 +117,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
 | 
			
		||||
        {
 | 
			
		||||
            __asm__ __volatile__ (
 | 
			
		||||
                "in __tmp_reg__,__SREG__"   "\n\t"
 | 
			
		||||
                                            "cli"                       "\n\t"
 | 
			
		||||
                                                                        "wdr"                       "\n\t"
 | 
			
		||||
                                                                                                    "sts %0, %1"                "\n\t"
 | 
			
		||||
                                                                                                                                "out __SREG__,__tmp_reg__"  "\n\t"
 | 
			
		||||
                                                                                                                                                            "sts %0, %2"                "\n\t"
 | 
			
		||||
                "cli"                       "\n\t"
 | 
			
		||||
                "wdr"                       "\n\t"
 | 
			
		||||
                "sts %0, %1"                "\n\t"
 | 
			
		||||
                "out __SREG__,__tmp_reg__"  "\n\t"
 | 
			
		||||
                "sts %0, %2"                "\n\t"
 | 
			
		||||
                : /* no outputs */
 | 
			
		||||
                : "n" ( _SFR_MEM_ADDR( _WD_CONTROL_REG ) ),
 | 
			
		||||
                "r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
 | 
			
		||||
@ -167,11 +167,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
 | 
			
		||||
        {
 | 
			
		||||
            __asm__ __volatile__ (
 | 
			
		||||
                "in __tmp_reg__,__SREG__"   "\n\t"
 | 
			
		||||
                                            "cli"                       "\n\t"
 | 
			
		||||
                                                                        "wdr"                       "\n\t"
 | 
			
		||||
                                                                                                    "out %0, %1"                "\n\t"
 | 
			
		||||
                                                                                                                                "out __SREG__,__tmp_reg__"  "\n\t"
 | 
			
		||||
                                                                                                                                                            "out %0, %2"                "\n\t"
 | 
			
		||||
                "cli"                       "\n\t"
 | 
			
		||||
                "wdr"                       "\n\t"
 | 
			
		||||
                "out %0, %1"                "\n\t"
 | 
			
		||||
                "out __SREG__,__tmp_reg__"  "\n\t"
 | 
			
		||||
                "out %0, %2"                "\n\t"
 | 
			
		||||
                : /* no outputs */
 | 
			
		||||
                : "I" ( _SFR_IO_ADDR( _WD_CONTROL_REG ) ),
 | 
			
		||||
                "r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
 | 
			
		||||
@ -184,11 +184,11 @@ extern volatile TCB_t * volatile pxCurrentTCB;
 | 
			
		||||
        {
 | 
			
		||||
            __asm__ __volatile__ (
 | 
			
		||||
                "in __tmp_reg__,__SREG__"   "\n\t"
 | 
			
		||||
                                            "cli"                       "\n\t"
 | 
			
		||||
                                                                        "wdr"                       "\n\t"
 | 
			
		||||
                                                                                                    "sts %0, %1"                "\n\t"
 | 
			
		||||
                                                                                                                                "out __SREG__,__tmp_reg__"  "\n\t"
 | 
			
		||||
                                                                                                                                                            "sts %0, %2"                "\n\t"
 | 
			
		||||
                "cli"                       "\n\t"
 | 
			
		||||
                "wdr"                       "\n\t"
 | 
			
		||||
                "sts %0, %1"                "\n\t"
 | 
			
		||||
                "out __SREG__,__tmp_reg__"  "\n\t"
 | 
			
		||||
                "sts %0, %2"                "\n\t"
 | 
			
		||||
                : /* no outputs */
 | 
			
		||||
                : "n" ( _SFR_MEM_ADDR( _WD_CONTROL_REG ) ),
 | 
			
		||||
                "r" ( ( uint8_t ) ( _BV( _WD_CHANGE_BIT ) | _BV( WDE ) ) ),
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										22
									
								
								portable/ThirdParty/GCC/ATmega/portmacro.h
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								portable/ThirdParty/GCC/ATmega/portmacro.h
									
									
									
									
										vendored
									
									
								
							@ -73,20 +73,20 @@ typedef uint8_t        UBaseType_t;
 | 
			
		||||
 | 
			
		||||
/* Critical section management. */
 | 
			
		||||
 | 
			
		||||
#define portENTER_CRITICAL()                                                                                         \
 | 
			
		||||
    __asm__ __volatile__ (                                                                                           \
 | 
			
		||||
        "in __tmp_reg__, __SREG__"        "\n\t"                                                                     \
 | 
			
		||||
                                          "cli"                             "\n\t"                                   \
 | 
			
		||||
                                                                            "push __tmp_reg__"                "\n\t" \
 | 
			
		||||
        ::: "memory"                                                                                                 \
 | 
			
		||||
#define portENTER_CRITICAL()                        \
 | 
			
		||||
    __asm__ __volatile__ (                          \
 | 
			
		||||
        "in __tmp_reg__, __SREG__"        "\n\t"    \
 | 
			
		||||
        "cli"                             "\n\t"    \
 | 
			
		||||
        "push __tmp_reg__"                "\n\t"    \
 | 
			
		||||
        ::: "memory"                                \
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#define portEXIT_CRITICAL()                                                        \
 | 
			
		||||
    __asm__ __volatile__ (                                                         \
 | 
			
		||||
        "pop __tmp_reg__"                 "\n\t"                                   \
 | 
			
		||||
                                          "out __SREG__, __tmp_reg__"       "\n\t" \
 | 
			
		||||
        ::: "memory"                                                               \
 | 
			
		||||
#define portEXIT_CRITICAL()                         \
 | 
			
		||||
    __asm__ __volatile__ (                          \
 | 
			
		||||
        "pop __tmp_reg__"                 "\n\t"    \
 | 
			
		||||
        "out __SREG__, __tmp_reg__"       "\n\t"    \
 | 
			
		||||
        ::: "memory"                                \
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user