diff options
| -rw-r--r-- | .clang-format | 7 | ||||
| -rw-r--r-- | ape/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ape/main.c | 4 | ||||
| -rw-r--r-- | ape/rmu.c | 3 | ||||
| -rw-r--r-- | ape/vectors.c | 9 | ||||
| -rw-r--r-- | cmake/clang-format.cmake | 79 | ||||
| -rw-r--r-- | libs/APE/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libs/APE/ape.c | 16 | ||||
| -rw-r--r-- | libs/MII/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libs/MII/mii.c | 21 | ||||
| -rw-r--r-- | libs/NVRam/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libs/NVRam/nvm.c | 3 |
12 files changed, 113 insertions, 37 deletions
diff --git a/.clang-format b/.clang-format index 3d38985..65e1d76 100644 --- a/.clang-format +++ b/.clang-format @@ -43,7 +43,7 @@ BreakConstructorInitializersBeforeComma: false BreakConstructorInitializers: BeforeColon BreakAfterJavaFieldAnnotations: false BreakStringLiterals: true -ColumnLimit: 80 +ColumnLimit: 160 CommentPragmas: '^ IWYU pragma:' CompactNamespaces: false ConstructorInitializerAllOnOneLineOrOnePerLine: false @@ -67,7 +67,7 @@ IncludeCategories: - Regex: '.*' Priority: 1 IncludeIsMainRegex: '(Test)?$' -IndentCaseLabels: false +IndentCaseLabels: true IndentPPDirectives: None IndentWidth: 4 IndentWrappedFunctionNames: false @@ -110,9 +110,6 @@ SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false Standard: Cpp11 -StatementMacros: - - Q_UNUSED - - QT_REQUIRE_VERSION TabWidth: 4 UseTab: Never diff --git a/ape/CMakeLists.txt b/ape/CMakeLists.txt index 0159e1d..732a8d1 100644 --- a/ape/CMakeLists.txt +++ b/ape/CMakeLists.txt @@ -58,6 +58,8 @@ target_link_libraries(${PROJECT_NAME} NVRam-arm MII-arm APE-arm Network-arm NCSI target_link_libraries(${PROJECT_NAME} bcm5719-arm) target_compile_options(${PROJECT_NAME} PRIVATE -nodefaultlibs) +format_target_sources(${PROJECT_NAME}) + # Simulator add_executable # simulator_add_executable(sim-${PROJECT_NAME} # init_hw.c @@ -120,10 +120,10 @@ void handleBMCPacket(void) { // stat.print(); int32_t words = DIVIDE_RND_UP(bytes, sizeof(uint32_t)); - if(words > ARRAY_ELEMENTS(buffer)) + if (words > ARRAY_ELEMENTS(buffer)) { // This should never happen... - while(words--) + while (words--) { // Read out the packet, but drop it. uint32_t word = APE_PERI.BmcToNcReadBuffer.r32; @@ -101,8 +101,7 @@ void initRMU(void) // START, and setting unknown bit 26 to 1. RegAPE_PERIArbControl_t arbControl; arbControl.r32 = (1 << 26); - arbControl.bits.PackageID = - 0; /* TODO: allow to be configured as per NC-SI spec. */ + arbControl.bits.PackageID = 0; /* TODO: allow to be configured as per NC-SI spec. */ arbControl.bits.Start = 1; arbControl.bits.TKNREL = 0x14; APE_PERI.ArbControl = arbControl; diff --git a/ape/vectors.c b/ape/vectors.c index ff296ab..2eabe34 100644 --- a/ape/vectors.c +++ b/ape/vectors.c @@ -48,10 +48,11 @@ typedef void (*vector_t)(void) __attribute__((interrupt)); // Vector table -typedef struct { - uint32_t* sp; - vector_t* __start; - vector_t* vectors[46]; +typedef struct +{ + uint32_t *sp; + vector_t *__start; + vector_t *vectors[46]; } vector_table_t; extern uint32_t _estack; diff --git a/cmake/clang-format.cmake b/cmake/clang-format.cmake new file mode 100644 index 0000000..d92b3fd --- /dev/null +++ b/cmake/clang-format.cmake @@ -0,0 +1,79 @@ +################################################################################ +### +### @file clang-format.cmake +### +### @project +### +### @brief clang-format cmake support +### +################################################################################ +### +################################################################################ +### +### @copyright Copyright (c) 2018, Evan Lojewski +### @cond +### +### All rights reserved. +### +### Redistribution and use in source and binary forms, with or without +### modification, are permitted provided that the following conditions are met: +### 1. Redistributions of source code must retain the above copyright notice, +### this list of conditions and the following disclaimer. +### 2. Redistributions in binary form must reproduce the above copyright notice, +### this list of conditions and the following disclaimer in the documentation +### and/or other materials provided with the distribution. +### 3. Neither the name of the copyright holder nor the +### names of its contributors may be used to endorse or promote products +### derived from this software without specific prior written permission. +### +################################################################################ +### +### THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +### AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +### IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +### ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +### LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +### CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +### SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +### INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +### CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +### ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +### POSSIBILITY OF SUCH DAMAGE. +### @endcond +################################################################################ + +if(CMAKE_SCRIPT_MODE_FILE) + SET(ARGUMENTS ) + SET(CLANG_FORMAT ${CMAKE_ARGV3}) + SET(FILES ${CMAKE_ARGV4}) + + FOREACH(FILE ${FILES}) + MESSAGE("Formatting ${FILE}") + EXECUTE_PROCESS(COMMAND ${CLANG_FORMAT} -style=file -i "${FILE}") + LIST(APPEND ARGUMENTS ${FILE}) + ENDFOREACH() +else() + + SET(CLANG_FORMAT ${COMPILER_BASE}/bin/clang-format) + add_custom_target(clang-format cmake -P ${CMAKE_CURRENT_LIST_FILE} + ${CLANG_FORMAT} $<TARGET_PROPERTY:clang-format,FORMAT_SOURCES> + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + VERBATIM) + + function(format_sources) + MESSAGE("Formatting sources ${ARGN}") + + set_property(TARGET clang-format APPEND PROPERTY FORMAT_SOURCES ${ARGN}) + endfunction(format_sources) + + function(format_target_sources target) + set(paths ) + get_target_property(sources ${target} SOURCES) + foreach(source ${sources}) + get_source_file_property(path ${source} LOCATION) + LIST(APPEND paths ${path}) + endforeach() + + format_sources(${paths}) + endfunction(format_target_sources) +endif()
\ No newline at end of file diff --git a/libs/APE/CMakeLists.txt b/libs/APE/CMakeLists.txt index 6b8fa9e..06e42a4 100644 --- a/libs/APE/CMakeLists.txt +++ b/libs/APE/CMakeLists.txt @@ -60,3 +60,5 @@ target_include_directories(${PROJECT_NAME}-mips PUBLIC include) arm_add_library(${PROJECT_NAME}-arm STATIC ape.c) target_include_directories(${PROJECT_NAME}-arm PUBLIC ../../include) target_include_directories(${PROJECT_NAME}-arm PUBLIC include) + +format_target_sources(${PROJECT_NAME}) diff --git a/libs/APE/ape.c b/libs/APE/ape.c index e7f0ca8..28230af 100644 --- a/libs/APE/ape.c +++ b/libs/APE/ape.c @@ -122,12 +122,12 @@ void APE_releaseAllLocks(void) lock_release.r32 = 0; lock_release.bits.Bootcode = 1; - APE_PERI.PerLockGrantPhy0.r32 = lock_release.r32; - APE_PERI.PerLockGrantGrc.r32 = lock_release.r32; - APE_PERI.PerLockGrantPhy1.r32 = lock_release.r32; - APE_PERI.PerLockGrantPhy2.r32 = lock_release.r32; - APE_PERI.PerLockGrantMem.r32 = lock_release.r32; - APE_PERI.PerLockGrantPhy3.r32 = lock_release.r32; - APE_PERI.PerLockGrantPort6.r32 = lock_release.r32; - APE_PERI.PerLockGrantGpio.r32 = lock_release.r32; + APE_PERI.PerLockGrantPhy0.r32 = lock_release.r32; + APE_PERI.PerLockGrantGrc.r32 = lock_release.r32; + APE_PERI.PerLockGrantPhy1.r32 = lock_release.r32; + APE_PERI.PerLockGrantPhy2.r32 = lock_release.r32; + APE_PERI.PerLockGrantMem.r32 = lock_release.r32; + APE_PERI.PerLockGrantPhy3.r32 = lock_release.r32; + APE_PERI.PerLockGrantPort6.r32 = lock_release.r32; + APE_PERI.PerLockGrantGpio.r32 = lock_release.r32; } diff --git a/libs/MII/CMakeLists.txt b/libs/MII/CMakeLists.txt index 568240b..0ddeabc 100644 --- a/libs/MII/CMakeLists.txt +++ b/libs/MII/CMakeLists.txt @@ -59,3 +59,5 @@ target_include_directories(${PROJECT_NAME}-mips PUBLIC include) arm_add_library(${PROJECT_NAME}-arm STATIC mii.c) target_include_directories(${PROJECT_NAME}-arm PUBLIC ../../include) target_include_directories(${PROJECT_NAME}-arm PUBLIC include) + +format_target_sources(${PROJECT_NAME}) diff --git a/libs/MII/mii.c b/libs/MII/mii.c index ad8e2ef..05934fd 100644 --- a/libs/MII/mii.c +++ b/libs/MII/mii.c @@ -58,14 +58,12 @@ uint8_t MII_getPhy(void) if (DEVICE.SgmiiStatus.bits.MediaSelectionMode) { // SERDES platform - return DEVICE.Status.bits.FunctionNumber + - DEVICE_MII_COMMUNICATION_PHY_ADDRESS_SGMII_0; + return DEVICE.Status.bits.FunctionNumber + DEVICE_MII_COMMUNICATION_PHY_ADDRESS_SGMII_0; } else { // GPHY platform - return DEVICE.Status.bits.FunctionNumber + - DEVICE_MII_COMMUNICATION_PHY_ADDRESS_PHY_0; + return DEVICE.Status.bits.FunctionNumber + DEVICE_MII_COMMUNICATION_PHY_ADDRESS_PHY_0; } } @@ -197,14 +195,12 @@ static void MII_writeShadowRegister18(uint8_t phy, mii_reg_t reg, uint16_t data) shadow_select.r16 = 0; shadow_select.bits.ShadowRegisterReadSelector = shadow_reg; shadow_select.bits.ShadowRegisterSelector = 7; - MII_writeRegisterInternal(phy, (mii_reg_t)REG_MII_AUXILIARY_CONTROL, - shadow_select.r16); + MII_writeRegisterInternal(phy, (mii_reg_t)REG_MII_AUXILIARY_CONTROL, shadow_select.r16); RegMIIMiscellaneousControl_t write_data; write_data.r16 = data; write_data.bits.ShadowRegisterSelector = shadow_reg; - MII_writeRegisterInternal(phy, (mii_reg_t)REG_MII_AUXILIARY_CONTROL, - write_data.r16); + MII_writeRegisterInternal(phy, (mii_reg_t)REG_MII_AUXILIARY_CONTROL, write_data.r16); } static void MII_writeShadowRegister1C(uint8_t phy, mii_reg_t reg, uint16_t data) @@ -220,16 +216,14 @@ static void MII_writeShadowRegister1C(uint8_t phy, mii_reg_t reg, uint16_t data) RegMIICabletronLed_t shadow_select; shadow_select.r16 = 0; shadow_select.bits.ShadowRegisterSelector = shadow_reg; - MII_writeRegisterInternal(phy, (mii_reg_t)REG_MII_CABLETRON_LED, - shadow_select.r16); + MII_writeRegisterInternal(phy, (mii_reg_t)REG_MII_CABLETRON_LED, shadow_select.r16); RegMIICabletronLed_t write_data; write_data.r16 = data; write_data.bits.ShadowRegisterSelector = shadow_reg; write_data.bits.WriteEnable = 1; - MII_writeRegisterInternal(phy, (mii_reg_t)REG_MII_CABLETRON_LED, - write_data.r16); + MII_writeRegisterInternal(phy, (mii_reg_t)REG_MII_CABLETRON_LED, write_data.r16); } void MII_writeRegister(uint8_t phy, mii_reg_t reg, uint16_t data) @@ -268,6 +262,5 @@ void MII_reset(uint8_t phy) do { // Spin - } while ((MII_readRegister(phy, (mii_reg_t)REG_MII_CONTROL) & - MII_CONTROL_RESET_MASK) == MII_CONTROL_RESET_MASK); + } while ((MII_readRegister(phy, (mii_reg_t)REG_MII_CONTROL) & MII_CONTROL_RESET_MASK) == MII_CONTROL_RESET_MASK); } diff --git a/libs/NVRam/CMakeLists.txt b/libs/NVRam/CMakeLists.txt index 8f86e85..1ee2c39 100644 --- a/libs/NVRam/CMakeLists.txt +++ b/libs/NVRam/CMakeLists.txt @@ -60,3 +60,5 @@ target_include_directories(${PROJECT_NAME}-mips PUBLIC include) arm_add_library(${PROJECT_NAME}-arm STATIC nvm.c crc.c) target_include_directories(${PROJECT_NAME}-arm PUBLIC ../../include) target_include_directories(${PROJECT_NAME}-arm PUBLIC include) + +format_target_sources(${PROJECT_NAME}) diff --git a/libs/NVRam/nvm.c b/libs/NVRam/nvm.c index 33344ed..1813a73 100644 --- a/libs/NVRam/nvm.c +++ b/libs/NVRam/nvm.c @@ -159,8 +159,7 @@ static uint32_t NVRam_readWordInternal(uint32_t address, RegNVMCommand_t cmd) return ntohl(NVM.Read.r32); } -static void NVRam_writeWordInternal(uint32_t address, uint32_t data, - RegNVMCommand_t cmd) +static void NVRam_writeWordInternal(uint32_t address, uint32_t data, RegNVMCommand_t cmd) { address = NVRam_translate(address); |
