ext: hal: ti: msp432p4xx: Tweak SDK to build with Zephyr
There are some minor conflicts or porting changes needed to get the
msp432p4xx SDK to work with Zephyr:
1. Remove definition of BIT, as it conflicts with Zephyr defined one
2. Set __SYSTEM_CLOCK define based on Zephyr Kconfig define
3. Fix a build warning that gets treated as an error.
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p401m.h b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p401m.h
index 407697c..f18366f 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p401m.h
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p401m.h
@@ -257,7 +257,6 @@
#define BITD (uint16_t)(0x2000)
#define BITE (uint16_t)(0x4000)
#define BITF (uint16_t)(0x8000)
-#define BIT(x) ((uint16_t)1 << (x))
/******************************************************************************
* Device and peripheral memory map *
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p401r.h b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p401r.h
index b59d766..afd11e4 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p401r.h
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p401r.h
@@ -257,7 +257,6 @@
#define BITD (uint16_t)(0x2000)
#define BITE (uint16_t)(0x4000)
#define BITF (uint16_t)(0x8000)
-#define BIT(x) ((uint16_t)1 << (x))
/******************************************************************************
* Device and peripheral memory map *
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p4111.h b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p4111.h
index d5e6216..b76d0a9 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p4111.h
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p4111.h
@@ -248,7 +248,6 @@
#define BITD (uint16_t)(0x2000)
#define BITE (uint16_t)(0x4000)
#define BITF (uint16_t)(0x8000)
-#define BIT(x) ((uint16_t)1 << (x))
/******************************************************************************
* Device and peripheral memory map *
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p411v.h b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p411v.h
index 60b65f0..6b8a510 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p411v.h
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p411v.h
@@ -248,7 +248,6 @@
#define BITD (uint16_t)(0x2000)
#define BITE (uint16_t)(0x4000)
#define BITF (uint16_t)(0x8000)
-#define BIT(x) ((uint16_t)1 << (x))
/******************************************************************************
* Device and peripheral memory map *
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p411y.h b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p411y.h
index 7b15279..0457846 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p411y.h
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p411y.h
@@ -248,7 +248,6 @@
#define BITD (uint16_t)(0x2000)
#define BITE (uint16_t)(0x4000)
#define BITF (uint16_t)(0x8000)
-#define BIT(x) ((uint16_t)1 << (x))
/******************************************************************************
* Device and peripheral memory map *
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p4xx.h b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p4xx.h
index a0c7a6b..e7ab903 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p4xx.h
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/inc/msp432p4xx.h
@@ -250,7 +250,6 @@
#define BITD (uint16_t)(0x2000)
#define BITE (uint16_t)(0x4000)
#define BITF (uint16_t)(0x8000)
-#define BIT(x) ((uint16_t)1 << (x))
/******************************************************************************
* Device and peripheral memory map *
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p401m.c b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p401m.c
index ea13346..5f947f8 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p401m.c
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p401m.c
@@ -68,7 +68,7 @@
// <12000000> 12 MHz
// <24000000> 24 MHz
// <48000000> 48 MHz
-#define __SYSTEM_CLOCK 3000000
+#define __SYSTEM_CLOCK CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC
/*--------------------- Power Regulator Configuration -----------------------*/
// Power Regulator Mode
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p401r.c b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p401r.c
index 62d0f8c..8637028 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p401r.c
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p401r.c
@@ -68,7 +68,7 @@
// <12000000> 12 MHz
// <24000000> 24 MHz
// <48000000> 48 MHz
-#define __SYSTEM_CLOCK 3000000
+#define __SYSTEM_CLOCK CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC
/*--------------------- Power Regulator Configuration -----------------------*/
// Power Regulator Mode
@@ -105,7 +105,7 @@
float dcoConst;
int32_t calVal;
- uint32_t centeredFreq;
+ uint32_t centeredFreq = 1500000; // Default center freq
int16_t dcoTune;
divider = (CS->CTL1 & CS_CTL1_DIVM_MASK) >> CS_CTL1_DIVM_OFS;
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p4111.c b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p4111.c
index ef65403..a745c08 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p4111.c
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p4111.c
@@ -68,7 +68,7 @@
// <12000000> 12 MHz
// <24000000> 24 MHz
// <48000000> 48 MHz
-#define __SYSTEM_CLOCK 3000000
+#define __SYSTEM_CLOCK CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC
/*--------------------- Power Regulator Configuration -----------------------*/
// Power Regulator Mode
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p411v.c b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p411v.c
index 5235541..9343fdb 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p411v.c
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p411v.c
@@ -68,7 +68,7 @@
// <12000000> 12 MHz
// <24000000> 24 MHz
// <48000000> 48 MHz
-#define __SYSTEM_CLOCK 3000000
+#define __SYSTEM_CLOCK CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC
/*--------------------- Power Regulator Configuration -----------------------*/
// Power Regulator Mode
diff --git a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p411y.c b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p411y.c
index 2f806f1..e45fa1f 100644
--- a/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p411y.c
+++ b/ext/hal/ti/simplelink/source/ti/devices/msp432p4xx/startup_system_files/system_msp432p411y.c
@@ -68,7 +68,7 @@
// <12000000> 12 MHz
// <24000000> 24 MHz
// <48000000> 48 MHz
-#define __SYSTEM_CLOCK 3000000
+#define __SYSTEM_CLOCK CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC
/*--------------------- Power Regulator Configuration -----------------------*/
// Power Regulator Mode
