From 800b2444a1280276b4e593ec175dcfbf5ccd73a7 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Mon, 1 Mar 2021 23:55:09 +0100 Subject: [PATCH] trivial: style and formatting Signed-off-by: Axel Heider --- configs/seL4Config.cmake | 5 +++-- libsel4/arch_include/arm/sel4/arch/simple_types.h | 1 - libsel4/arch_include/riscv/sel4/arch/simple_types.h | 1 - libsel4/include/sel4/simple_types.h | 1 - libsel4/include/sel4/types.h | 2 +- .../sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h | 2 -- libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h | 1 - libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h | 3 +-- libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h | 1 - .../sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h | 2 +- .../sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h | 2 -- libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h | 1 - .../sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h | 3 ++- libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h | 1 - src/plat/allwinnerA20/config.cmake | 4 ++-- src/plat/apq8064/config.cmake | 4 ++-- 16 files changed, 12 insertions(+), 22 deletions(-) diff --git a/configs/seL4Config.cmake b/configs/seL4Config.cmake index 2e397c4cd..2340e65e0 100644 --- a/configs/seL4Config.cmake +++ b/configs/seL4Config.cmake @@ -14,8 +14,9 @@ set(bf_declarations "") include(${CMAKE_CURRENT_LIST_DIR}/../tools/internal.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../tools/helpers.cmake) -# Create and set all of the Kernel config options that can -# be derived from the seL4 arch which is one of the following: + +# Create and set all of the Kernel config options that can be derived from the +# seL4 arch which is one of the following: # aarch32, aarch64, arm_hyp, riscv32, riscv64, x86_64, ia32 # This macro is intended to be called from within a platform config. macro(declare_seL4_arch sel4_arch) diff --git a/libsel4/arch_include/arm/sel4/arch/simple_types.h b/libsel4/arch_include/arm/sel4/arch/simple_types.h index 47881ca7b..153d4426d 100644 --- a/libsel4/arch_include/arm/sel4/arch/simple_types.h +++ b/libsel4/arch_include/arm/sel4/arch/simple_types.h @@ -15,4 +15,3 @@ typedef signed int seL4_Int32; typedef unsigned char seL4_Uint8; typedef unsigned short seL4_Uint16; typedef unsigned int seL4_Uint32; - diff --git a/libsel4/arch_include/riscv/sel4/arch/simple_types.h b/libsel4/arch_include/riscv/sel4/arch/simple_types.h index 2fba76de8..c8a998052 100644 --- a/libsel4/arch_include/riscv/sel4/arch/simple_types.h +++ b/libsel4/arch_include/riscv/sel4/arch/simple_types.h @@ -13,4 +13,3 @@ typedef signed int seL4_Int32; typedef unsigned char seL4_Uint8; typedef unsigned short seL4_Uint16; typedef unsigned int seL4_Uint32; - diff --git a/libsel4/include/sel4/simple_types.h b/libsel4/include/sel4/simple_types.h index 5282dc40e..e1eaa8211 100644 --- a/libsel4/include/sel4/simple_types.h +++ b/libsel4/include/sel4/simple_types.h @@ -21,4 +21,3 @@ typedef seL4_Int8 seL4_Bool; #else #define seL4_Null ((void*)0) #endif // __cplusplus - diff --git a/libsel4/include/sel4/types.h b/libsel4/include/sel4/types.h index 6747bc25d..5528a8d3e 100644 --- a/libsel4/include/sel4/types.h +++ b/libsel4/include/sel4/types.h @@ -38,9 +38,9 @@ typedef seL4_CPtr seL4_Untyped; typedef seL4_CPtr seL4_DomainSet; typedef seL4_CPtr seL4_SchedContext; typedef seL4_CPtr seL4_SchedControl; + typedef seL4_Uint64 seL4_Time; #define seL4_NilData 0 #include - diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h index 4e427d072..25655e4e4 100644 --- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h +++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/simple_types.h @@ -9,5 +9,3 @@ typedef signed long long seL4_Int64; typedef unsigned long long seL4_Uint64; - - diff --git a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h index 47aa33b22..3cda58a63 100644 --- a/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h +++ b/libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h @@ -22,4 +22,3 @@ typedef struct seL4_UserContext_ { /* Thread ID registers */ seL4_Word tpidrurw, tpidruro; } seL4_UserContext; - diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h index dd28fc0b1..0433a331d 100644 --- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h +++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/simple_types.h @@ -5,6 +5,7 @@ */ #pragma once + typedef signed char seL4_Int8; typedef signed short seL4_Int16; typedef signed int seL4_Int32; @@ -14,5 +15,3 @@ typedef unsigned char seL4_Uint8; typedef unsigned short seL4_Uint16; typedef unsigned int seL4_Uint32; typedef unsigned long long seL4_Uint64; - - diff --git a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h index 673a8f081..fcdf9b54d 100644 --- a/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h +++ b/libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.h @@ -22,4 +22,3 @@ typedef struct seL4_UserContext_ { /* gpRegisters */ seL4_Word fs_base, gs_base; } seL4_UserContext; - diff --git a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h index 72cf3e738..c46f4a7b0 100644 --- a/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h +++ b/libsel4/sel4_arch_include/riscv32/sel4/sel4_arch/simple_types.h @@ -5,6 +5,6 @@ */ #pragma once + typedef signed long long seL4_Int64; typedef unsigned long long seL4_Uint64; - diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h index a0089c679..599794176 100644 --- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h +++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/simple_types.h @@ -8,5 +8,3 @@ typedef signed long seL4_Int64; typedef unsigned long seL4_Uint64; - - diff --git a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h index b4bebf8d6..b477d9e35 100644 --- a/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h +++ b/libsel4/sel4_arch_include/riscv64/sel4/sel4_arch/types.h @@ -11,4 +11,3 @@ #define seL4_WordBits 64 typedef seL4_Uint64 seL4_Word; - diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h index 61dcfe2c8..f351154b7 100644 --- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h +++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/simple_types.h @@ -3,7 +3,9 @@ * * SPDX-License-Identifier: BSD-2-Clause */ + #pragma once + typedef signed char seL4_Int8; typedef signed short seL4_Int16; typedef signed int seL4_Int32; @@ -13,4 +15,3 @@ typedef unsigned char seL4_Uint8; typedef unsigned short seL4_Uint16; typedef unsigned int seL4_Uint32; typedef unsigned long seL4_Uint64; - diff --git a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h index 9f824b09d..a0e9f572b 100644 --- a/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h +++ b/libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.h @@ -25,4 +25,3 @@ typedef struct seL4_UserContext_ { r8, r9, r10, r11, r12, r13, r14, r15; seL4_Word fs_base, gs_base; } seL4_UserContext; - diff --git a/src/plat/allwinnerA20/config.cmake b/src/plat/allwinnerA20/config.cmake index eced85312..33bfc0bc8 100644 --- a/src/plat/allwinnerA20/config.cmake +++ b/src/plat/allwinnerA20/config.cmake @@ -14,8 +14,8 @@ if(KernelPlatformAllwinnerA20) set(KernelArchArmV7a ON) config_set(KernelARMPlatform ARM_PLAT allwinnerA20) - # MCS is not supported on allwinnerA20. - # It requires a timer driver that implements the tickless programming requirements. + # MCS is not supported on allwinnerA20. It requires a timer driver that + # implements the tickless programming requirements. set(KernelPlatformSupportsMCS OFF) list(APPEND KernelDTSList "tools/dts/allwinnerA20.dts") diff --git a/src/plat/apq8064/config.cmake b/src/plat/apq8064/config.cmake index 1d91baff8..f381ca2f4 100644 --- a/src/plat/apq8064/config.cmake +++ b/src/plat/apq8064/config.cmake @@ -11,8 +11,8 @@ declare_platform(apq8064 KernelPlatformAPQ8064 PLAT_APQ8064 KernelSel4ArchAarch3 if(KernelPlatformAPQ8064) declare_seL4_arch(aarch32) - # MCS is not supported on apq8064. - # It requires a timer driver that implements the tickless programming requirements. + # MCS is not supported on apq8064. It requires a timer driver that + # implements the tickless programming requirements. set(KernelPlatformSupportsMCS OFF) set(KernelArmCortexA15 ON)