diff options
| author | Evan Lojewski <github@meklort.com> | 2019-06-05 21:44:59 -0600 |
|---|---|---|
| committer | Evan Lojewski <github@meklort.com> | 2019-06-05 21:44:59 -0600 |
| commit | 4ebc9cccac2fd557c5261be7adc2d4de22488029 (patch) | |
| tree | 549cd77c6ea60d90ffdc18b2819f859fd862ec8e /libs/MII | |
| parent | c75332ef9fdd8de33c860f6efe409433e553b7c7 (diff) | |
| download | bcm5719-ortega-4ebc9cccac2fd557c5261be7adc2d4de22488029.tar.gz bcm5719-ortega-4ebc9cccac2fd557c5261be7adc2d4de22488029.zip | |
Begin adding support for clang-format
Diffstat (limited to 'libs/MII')
| -rw-r--r-- | libs/MII/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libs/MII/mii.c | 21 |
2 files changed, 9 insertions, 14 deletions
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); } |
