diff options
| author | Evan Lojewski <github@meklort.com> | 2020-10-06 16:57:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-06 16:57:58 -0600 |
| commit | 8bee5536987362169b9624606ced13659da92a10 (patch) | |
| tree | 462d89ec8c74d45831b6db84cf047e378f152fa7 /include/bcm5719_SHM.h | |
| parent | 6642528f71e49f85871d1574d533488fc5ae7c74 (diff) | |
| download | bcm5719-ortega-8bee5536987362169b9624606ced13659da92a10.tar.gz bcm5719-ortega-8bee5536987362169b9624606ced13659da92a10.zip | |
ape: Update APE SHM to report the running firmware version. (#129)
Diffstat (limited to 'include/bcm5719_SHM.h')
| -rw-r--r-- | include/bcm5719_SHM.h | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/include/bcm5719_SHM.h b/include/bcm5719_SHM.h index 00ea0db..b775fae 100644 --- a/include/bcm5719_SHM.h +++ b/include/bcm5719_SHM.h @@ -294,14 +294,10 @@ typedef register_container RegSHM4014_t { } RegSHM4014_t; #define REG_SHM_FW_VERSION ((volatile BCM5719_SHM_H_uint32_t*)0xc0014018) /* */ -#define SHM_FW_VERSION_BUILD_SHIFT 0u -#define SHM_FW_VERSION_BUILD_MASK 0xffu -#define GET_SHM_FW_VERSION_BUILD(__reg__) (((__reg__) & 0xff) >> 0u) -#define SET_SHM_FW_VERSION_BUILD(__val__) (((__val__) << 0u) & 0xffu) -#define SHM_FW_VERSION_REVISION_SHIFT 8u -#define SHM_FW_VERSION_REVISION_MASK 0xff00u -#define GET_SHM_FW_VERSION_REVISION(__reg__) (((__reg__) & 0xff00) >> 8u) -#define SET_SHM_FW_VERSION_REVISION(__val__) (((__val__) << 8u) & 0xff00u) +#define SHM_FW_VERSION_PATCH_SHIFT 0u +#define SHM_FW_VERSION_PATCH_MASK 0xffffu +#define GET_SHM_FW_VERSION_PATCH(__reg__) (((__reg__) & 0xffff) >> 0u) +#define SET_SHM_FW_VERSION_PATCH(__val__) (((__val__) << 0u) & 0xffffu) #define SHM_FW_VERSION_MINOR_SHIFT 16u #define SHM_FW_VERSION_MINOR_MASK 0xff0000u #define GET_SHM_FW_VERSION_MINOR(__reg__) (((__reg__) & 0xff0000) >> 16u) @@ -319,9 +315,7 @@ typedef register_container RegSHMFwVersion_t { BITFIELD_BEGIN(BCM5719_SHM_H_uint32_t, bits) #if defined(__LITTLE_ENDIAN__) /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_H_uint32_t, Build, 0, 8) - /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_H_uint32_t, Revision, 8, 8) + BITFIELD_MEMBER(BCM5719_SHM_H_uint32_t, Patch, 0, 16) /** @brief */ BITFIELD_MEMBER(BCM5719_SHM_H_uint32_t, Minor, 16, 8) /** @brief */ @@ -332,9 +326,7 @@ typedef register_container RegSHMFwVersion_t { /** @brief */ BITFIELD_MEMBER(BCM5719_SHM_H_uint32_t, Minor, 16, 8) /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_H_uint32_t, Revision, 8, 8) - /** @brief */ - BITFIELD_MEMBER(BCM5719_SHM_H_uint32_t, Build, 0, 8) + BITFIELD_MEMBER(BCM5719_SHM_H_uint32_t, Patch, 0, 16) #else #error Unknown Endian #endif @@ -350,10 +342,8 @@ typedef register_container RegSHMFwVersion_t { { /** @brief constructor for @ref SHM_t.FwVersion. */ r32.setName("FwVersion"); - bits.Build.setBaseRegister(&r32); - bits.Build.setName("Build"); - bits.Revision.setBaseRegister(&r32); - bits.Revision.setName("Revision"); + bits.Patch.setBaseRegister(&r32); + bits.Patch.setName("Patch"); bits.Minor.setBaseRegister(&r32); bits.Minor.setName("Minor"); bits.Major.setBaseRegister(&r32); |
