diff options
| author | Evan Lojewski <github@meklort.com> | 2020-11-19 21:41:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 21:41:02 -0700 |
| commit | 27b7020872618b5bc87137f4682a69a85aca2bfa (patch) | |
| tree | cc7302faf83cf0040f4d8d88cb012c5f46af3ec6 /libs | |
| parent | d2a90411c94cc8ea175b879d16a30705d206ae84 (diff) | |
| download | bcm5719-ortega-27b7020872618b5bc87137f4682a69a85aca2bfa.tar.gz bcm5719-ortega-27b7020872618b5bc87137f4682a69a85aca2bfa.zip | |
Revert "build: Enable builds under LLVM 11. (#172)" (#174)
This reverts commit 5520cf3dff14b3805fafafbfc05853a03aeafcfc.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/MII/include/MII.h | 4 | ||||
| -rw-r--r-- | libs/MII/mii.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/MII/include/MII.h b/libs/MII/include/MII.h index 4997258..cea149d 100644 --- a/libs/MII/include/MII.h +++ b/libs/MII/include/MII.h @@ -55,9 +55,9 @@ #ifdef CXX_SIMULATOR #define volatile -typedef uintptr_t mii_reg_t; +typedef uint64_t mii_reg_t; #else -typedef uint32_t mii_reg_t; +typedef uint16_t mii_reg_t; #endif /** diff --git a/libs/MII/mii.c b/libs/MII/mii.c index cc4a77d..0704a9f 100644 --- a/libs/MII/mii.c +++ b/libs/MII/mii.c @@ -159,7 +159,7 @@ static int32_t MII_readShadowRegister18(volatile DEVICE_t *device, uint8_t phy, // phy_write(0x18, 0x1007); //switch to shadow 0x1 // valu = phy_read(0x18); - uint16_t shadow_reg = (reg & 0xFFFF) >> 8; + uint16_t shadow_reg = reg >> 8; RegMIIMiscellaneousControl_t shadow_select; shadow_select.r16 = 0; shadow_select.bits.ShadowRegisterReadSelector = shadow_reg; @@ -184,7 +184,7 @@ static int32_t MII_readShadowRegister1C(volatile DEVICE_t *device, uint8_t phy, // value = phy_read(0x1C); // return value; - uint16_t shadow_reg = (reg & 0xFFFF) >> 8; + uint16_t shadow_reg = reg >> 8; RegMIICabletronLed_t shadow_select; shadow_select.r16 = 0; shadow_select.bits.ShadowRegisterSelector = shadow_reg; @@ -227,7 +227,7 @@ static bool MII_writeShadowRegister18(volatile DEVICE_t *device, uint8_t phy, mi // phy_write(0x18, 0x2007); //switch to shadow 0x2 // phy_write(0x18, wdata | 0x2 ); - uint16_t shadow_reg = (reg & 0xFFFF) >> 8; + uint16_t shadow_reg = reg >> 8; RegMIIMiscellaneousControl_t shadow_select; shadow_select.r16 = 0; shadow_select.bits.ShadowRegisterReadSelector = shadow_reg; @@ -253,7 +253,7 @@ static bool MII_writeShadowRegister1C(volatile DEVICE_t *device, uint8_t phy, mi // phy_write(0x1C, 0x0800); //switch to shadow 0x2 // phy_write(0x1C, wdata | 0x8800 ); - uint16_t shadow_reg = (reg & 0xFFFF) >> 8; + uint16_t shadow_reg = reg >> 8; RegMIICabletronLed_t shadow_select; shadow_select.r16 = 0; shadow_select.bits.ShadowRegisterSelector = shadow_reg; |
