diff options
| author | Eric Holland <hollande@google.com> | 2016-06-16 16:31:53 -0700 |
|---|---|---|
| committer | Eric Holland <hollande@google.com> | 2016-06-16 16:31:53 -0700 |
| commit | 6388cde233702124773edab0fdbbdc9ed87dff5e (patch) | |
| tree | ed4d14300aed4133ac2fc85f497b987b365068f9 /external | |
| parent | 1491809fd05330a32213599f7fe08a660e9ef63e (diff) | |
| download | common-6388cde233702124773edab0fdbbdc9ed87dff5e.tar.gz | |
[nrf52] Platform and sample target support for Nordic NRF52 (cortex-M4)
Diffstat (limited to 'external')
| -rwxr-xr-x | external/platform/nrf52/include/platform/nrf52xxx.h | 4 | ||||
| -rwxr-xr-x | external/platform/nrf52/system_nrf52.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/external/platform/nrf52/include/platform/nrf52xxx.h b/external/platform/nrf52/include/platform/nrf52xxx.h index 412ecef0..7a36e04d 100755 --- a/external/platform/nrf52/include/platform/nrf52xxx.h +++ b/external/platform/nrf52/include/platform/nrf52xxx.h @@ -54,7 +54,7 @@ #ifndef NRF52_H
#define NRF52_H
-
+#include <platform/nrf52_bitfields.h>
#ifdef __cplusplus
extern "C" {
#endif
@@ -498,7 +498,7 @@ typedef struct { /*!< FICR Structure __I uint32_t DEVICEADDRTYPE; /*!< Device address type */
__I uint32_t DEVICEADDR[2]; /*!< Description collection[0]: Device address 0 */
__I uint32_t RESERVED3[21];
- FICR_INFO_Type INFO; /*!< Device info */
+ FICR_INFO_Type DEVICEINFO; /*!< Device info */
__I uint32_t RESERVED4[185];
FICR_TEMP_Type TEMP; /*!< Registers storing factory TEMP module linearization coefficients */
__I uint32_t RESERVED5[2];
diff --git a/external/platform/nrf52/system_nrf52.c b/external/platform/nrf52/system_nrf52.c index 18c07547..d3ca8288 100755 --- a/external/platform/nrf52/system_nrf52.c +++ b/external/platform/nrf52/system_nrf52.c @@ -30,8 +30,8 @@ #include <stdint.h>
#include <stdbool.h>
-#include "nrf.h"
-#include "system_nrf52.h"
+#include <platform/nrf52.h>
+#include <platform/system_nrf52.h>
/*lint ++flb "Enter library region" */
|