From 06cc883b3fca199d8b7003f4f3fa3475968a9b80 Mon Sep 17 00:00:00 2001 From: Edvard Pettersen Date: Mon, 23 Jul 2018 17:37:19 +0200 Subject: [PATCH] Fixed DeviceFamily_constructPath() --- .../cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.c | 9 +++++---- .../cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h | 3 ++- .../launchpad/cc1310/CC1310_LAUNCHXL_fxns.c | 5 +++-- .../cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.c | 9 +++++---- .../cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h | 3 ++- .../launchpad/cc1312r1/CC1312R1_LAUNCHXL_fxns.c | 5 +++-- .../launchpad/cc1350-4/CC1350_LAUNCHXL_433.c | 9 +++++---- .../launchpad/cc1350-4/CC1350_LAUNCHXL_433.h | 3 ++- .../launchpad/cc1350-4/CC1350_LAUNCHXL_433_fxns.c | 5 +++-- .../cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.c | 9 +++++---- .../cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h | 3 ++- .../launchpad/cc1350/CC1350_LAUNCHXL_fxns.c | 5 +++-- .../launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.c | 9 +++++---- .../launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h | 3 ++- .../launchpad/cc1352p-2/CC1352P_2_LAUNCHXL_fxns.c | 5 +++-- .../launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.c | 9 +++++---- .../launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h | 3 ++- .../launchpad/cc1352p-4/CC1352P_4_LAUNCHXL_fxns.c | 5 +++-- .../cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.c | 9 +++++---- .../cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h | 3 ++- .../launchpad/cc1352p1/CC1352P1_LAUNCHXL_fxns.c | 5 +++-- .../cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.c | 9 +++++---- .../cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h | 3 ++- .../launchpad/cc1352r1/CC1352R1_LAUNCHXL_fxns.c | 5 +++-- .../cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.c | 9 +++++---- .../cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h | 3 ++- .../launchpad/cc2650/CC2650_LAUNCHXL_fxns.c | 5 +++-- .../cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.c | 9 +++++---- .../cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h | 3 ++- .../launchpad/cc26x2r1/CC26X2R1_LAUNCHXL_fxns.c | 5 +++-- .../cc13xx-cc26xx/sensortag/cc1350/CC1350STK.c | 9 +++++---- .../cc13xx-cc26xx/sensortag/cc1350/CC1350STK_fxns.c | 5 +++-- .../simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.c | 9 +++++---- .../simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h | 3 ++- .../cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD_fxns.c | 5 +++-- .../simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.c | 9 +++++---- .../simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h | 3 ++- .../cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID_fxns.c | 5 +++-- os/sys/cc.h | 2 ++ 39 files changed, 130 insertions(+), 90 deletions(-) diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.c index b9f3adfb1..638bfa0d0 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1310_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h index 12b3bb084..4d11cd749 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL_fxns.c index 9656aa821..6918918bb 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/CC1310_LAUNCHXL_fxns.c @@ -39,8 +39,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.c index 24db2296f..e45317c9f 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1312R1_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h index d54a18e89..3d796df9b 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL_fxns.c index 77a830b4d..0a28583d4 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/CC1312R1_LAUNCHXL_fxns.c @@ -39,8 +39,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include #include "Board.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.c index 55b30637d..deec29ce6 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1350_LAUNCHXL_433.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.h index 9e9bee949..441bb04fa 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433_fxns.c index 2d2a27784..a8a6b16c0 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/CC1350_LAUNCHXL_433_fxns.c @@ -38,8 +38,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.c index 61efd4e92..cddb5a9fa 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1350_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h index a54fa9365..746a25fa1 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL_fxns.c index a60df3e65..90f69a0c0 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/CC1350_LAUNCHXL_fxns.c @@ -40,8 +40,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.c index ea178974b..4f1d297a7 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1352P_2_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h index 7c83f2935..e81d45aec 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL_fxns.c index b346056a3..f8b4930c8 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/CC1352P_2_LAUNCHXL_fxns.c @@ -40,8 +40,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.c index 9a2ae3505..bb055fbb4 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1352P_4_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h index a125dcd6a..55baa0037 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL_fxns.c index 8a703efe7..ef9c0531c 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/CC1352P_4_LAUNCHXL_fxns.c @@ -40,8 +40,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.c index 4a6e7b5e8..6fdfc525e 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1352P1_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h index dd91ea72d..a023cca75 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL_fxns.c index cdfa6342e..9f3000929 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/CC1352P1_LAUNCHXL_fxns.c @@ -40,8 +40,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.c index e84f74cbe..e60b6d73e 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.c @@ -42,10 +42,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1352R1_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h index 3a4949f87..5a0717057 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL_fxns.c index 9ee574235..520b91297 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL_fxns.c @@ -40,8 +40,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.c index 1d63a60a3..e201b8e89 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC2650_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h index 9f0fd81f9..f344e79bc 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL_fxns.c index 5562bd0a0..f471e33d6 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/CC2650_LAUNCHXL_fxns.c @@ -39,8 +39,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.c index 47a6ef8da..6fb5e357f 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.c @@ -41,10 +41,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC26X2R1_LAUNCHXL.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h index 998a8ffa6..6af14329b 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL_fxns.c index 6c288ab0b..606339f2d 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL_fxns.c @@ -39,8 +39,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK.c b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK.c index c5a7558c7..6f9f68e20 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK.c @@ -43,10 +43,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1350STK.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK_fxns.c index 16cdde8bd..dd20cb301 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/CC1350STK_fxns.c @@ -38,8 +38,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include "Board.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.c b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.c index 8e05f6574..ab1a4db22 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC1350DK_7XD.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h index 72b19a036..d9d3fc63e 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD_fxns.c index e012731c6..b7983730a 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/CC1350DK_7XD_fxns.c @@ -39,8 +39,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.c b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.c index 431b0005c..7689793a2 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.c @@ -40,10 +40,11 @@ #include #include -#include -#include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/udma.h) +#include DeviceFamily_constructPath(inc/hw_ints.h) +#include DeviceFamily_constructPath(inc/hw_memmap.h) #include "CC2650DK_7ID.h" diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h index 7901fbed1..356b50fc0 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h +++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID.h @@ -53,7 +53,8 @@ extern "C" { /* Includes */ #include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) /* Externs */ extern const PIN_Config BoardGpioInitTable[]; diff --git a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID_fxns.c b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID_fxns.c index b742aad53..aa6a6c60e 100644 --- a/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID_fxns.c +++ b/arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/CC2650DK_7ID_fxns.c @@ -39,8 +39,9 @@ #include #include -#include -#include +#include +#include DeviceFamily_constructPath(driverlib/ioc.h) +#include DeviceFamily_constructPath(driverlib/cpu.h) #include diff --git a/os/sys/cc.h b/os/sys/cc.h index 2fa5439df..cb9fb109d 100644 --- a/os/sys/cc.h +++ b/os/sys/cc.h @@ -103,6 +103,8 @@ #ifdef CC_CONF_ALIGN #define CC_ALIGN(n) CC_CONF_ALIGN(n) +#else +#define CC_ALIGN(n) #endif /* CC_CONF_INLINE */ /**