ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Conflict resolved

pull/3009/head
pradeep-gr 2016-10-26 15:07:52 +05:30
parent 4e4823053a
commit 99bd584070
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
targets/TARGET_ONSEMI/TARGET_NCS36510/trim_map.h
View File

@ -50,19 +50,15 @@
**************************************************************************************************/
/** trim register map */
<<<<<<< HEAD
typedef struct { /**< REV B REV D */
__I uint32_t PAD0; /**< 0x1FA0 0x1FA0 */
typedef struct {
__I uint32_t PAD0; /**< 0x1FA0 */
__I uint32_t MAC_ADDR_LOW; /**< 0x1FA4 */
__I uint32_t MAC_ADDR_HIGH; /**< 0x1FA8 */
#ifdef REVB
__I uint32_t TX_POWER; /**< 0x1FAC */
#endif
__I uint32_t TRIM_32K_EXT; /**< 0x1FB0 0x1FAC */
__I uint32_t TRIM_32M_EXT; /**< 0x1FB4 0x1FB0 */
__I uint32_t FVVDH_COMP_TH; /**< 0x1FB4 */
__I uint32_t TRIM_32K_EXT; /**< 0x1FAC */
__I uint32_t TRIM_32M_EXT; /**< 0x1FB0 */
__I uint32_t FVVDH_COMP_TH; /**< 0x1FB4 */
union {
struct { /* Common to REV B & REV D */
struct {
__I uint32_t CHANNEL11:4;
__I uint32_t CHANNEL12:4;
__I uint32_t CHANNEL13:4;