Fixed DeviceFamily_constructPath()

2018-07-23 17:37:19 +02:00 · 2018-07-23 17:37:19 +02:00 · 06cc883b3f
parent 6deae207e5
commit 06cc883b3f
39 changed files with 130 additions and 90 deletions
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x0/driverlib/ioc.h>
-#include <ti/devices/cc13x0/driverlib/udma.h>
-#include <ti/devices/cc13x0/inc/hw_ints.h>
-#include <ti/devices/cc13x0/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x0/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x0/driverlib/ioc.h>
-#include <ti/devices/cc13x0/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)

 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/udma.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_ints.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)
 #include <ti/drivers/pin/PINCC26XX.h>

 #include "Board.h"
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x0/driverlib/ioc.h>
-#include <ti/devices/cc13x0/driverlib/udma.h>
-#include <ti/devices/cc13x0/inc/hw_ints.h>
-#include <ti/devices/cc13x0/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x0/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x0/driverlib/ioc.h>
-#include <ti/devices/cc13x0/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)

 #include <ti/drivers/rf/RF.h>
 #include <ti/drivers/pin/PINCC26XX.h>
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x0/driverlib/ioc.h>
-#include <ti/devices/cc13x0/driverlib/udma.h>
-#include <ti/devices/cc13x0/inc/hw_ints.h>
-#include <ti/devices/cc13x0/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x0/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x0/driverlib/ioc.h>
-#include <ti/devices/cc13x0/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)

 #include <ti/drivers/rf/RF.h>
 #include <ti/drivers/pin/PINCC26XX.h>
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/udma.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_ints.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)
 #include <ti/drivers/rf/RF.h>
 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/udma.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_ints.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)
 #include <ti/drivers/rf/RF.h>
 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/udma.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_ints.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)
 #include <ti/drivers/rf/RF.h>
 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/udma.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_ints.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)
 #include <ti/drivers/rf/RF.h>
 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc26x0/driverlib/ioc.h>
-#include <ti/devices/cc26x0/driverlib/udma.h>
-#include <ti/devices/cc26x0/inc/hw_ints.h>
-#include <ti/devices/cc26x0/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc26x0/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc26x0/driverlib/ioc.h>
-#include <ti/devices/cc26x0/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)

 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/udma.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_ints.h>
-#include <ti/devices/cc13x2_cc26x2_v1/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/ioc.h>
-#include <ti/devices/cc13x2_cc26x2_v1/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)

 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 <ti/drivers/Power.h>
 #include <ti/drivers/power/PowerCC26XX.h>

-#include <ti/devices/cc13x0/driverlib/ioc.h>
-#include <ti/devices/cc13x0/driverlib/udma.h>
-#include <ti/devices/cc13x0/inc/hw_ints.h>
-#include <ti/devices/cc13x0/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc13x0/driverlib/ioc.h>
-#include <ti/devices/cc13x0/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)

 #include "Board.h"

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc26x0/driverlib/ioc.h>
-#include <ti/devices/cc26x0/driverlib/udma.h>
-#include <ti/devices/cc26x0/inc/hw_ints.h>
-#include <ti/devices/cc26x0/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc26x0/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc26x0/driverlib/ioc.h>
-#include <ti/devices/cc26x0/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)

 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc26x0/driverlib/ioc.h>
-#include <ti/devices/cc26x0/driverlib/udma.h>
-#include <ti/devices/cc26x0/inc/hw_ints.h>
-#include <ti/devices/cc26x0/inc/hw_memmap.h>
+#include <ti/devices/DeviceFamily.h>
+#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"

--- 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 <ti/drivers/PIN.h>
-#include <ti/devices/cc26x0/driverlib/ioc.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)

 /* Externs */
 extern const PIN_Config BoardGpioInitTable[];
--- 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 <stddef.h>
 #include <stdint.h>

-#include <ti/devices/cc26x0/driverlib/ioc.h>
-#include <ti/devices/cc26x0/driverlib/cpu.h>
+#include <ti/devices/DeviceFamily.h>
+#include DeviceFamily_constructPath(driverlib/ioc.h)
+#include DeviceFamily_constructPath(driverlib/cpu.h)

 #include <ti/drivers/pin/PINCC26XX.h>

--- 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 */

 /**