Update MSP432 projects to use updated driver library files.

[freertos] / FreeRTOS / Demo / CORTEX_M4F_MSP432_LaunchPad_IAR_CCS_Keil / driverlib / inc / CMSIS / cmsis_ccs.h

diff --git a/FreeRTOS/Demo/CORTEX_M4F_MSP432_LaunchPad_IAR_CCS_Keil/driverlib/inc/CMSIS/cmsis_ccs.h b/FreeRTOS/Demo/CORTEX_M4F_MSP432_LaunchPad_IAR_CCS_Keil/driverlib/inc/CMSIS/cmsis_ccs.h
index 84b3d2689cfee6c756b6ab47f0ef13e2403817d1..41f82ebdb619d6c2176caa614faffafcd4052d45 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_M4F_MSP432_LaunchPad_IAR_CCS_Keil/driverlib/inc/CMSIS/cmsis_ccs.h
+++ b/FreeRTOS/Demo/CORTEX_M4F_MSP432_LaunchPad_IAR_CCS_Keil/driverlib/inc/CMSIS/cmsis_ccs.h
@@ -1,6 +1,6 @@
 //*****************************************************************************\r
 //\r
-// Copyright (C) 2012 - 2014 Texas Instruments Incorporated - http://www.ti.com/\r
+// Copyright (C) 2012 - 2015 Texas Instruments Incorporated - http://www.ti.com/\r
 //\r
 // Redistribution and use in source and binary forms, with or without\r
 // modification, are permitted provided that the following conditions\r
@@ -41,12 +41,18 @@
 // CMSIS-compatible instruction calls\r
 //*****************************************************************************\r
 \r
+#ifndef __cplusplus\r
 // No Operation\r
 __attribute__( ( always_inline ) ) static inline void __nop(void)\r
 {\r
        __asm("  nop");\r
 }\r
 \r
+__attribute__( ( always_inline ) ) static inline void __NOP(void)\r
+{\r
+       __asm("  nop");\r
+}\r
+\r
 // Wait For Interrupt\r
 __attribute__( ( always_inline ) ) static inline void __wfi(void)\r
 {\r
@@ -58,6 +64,7 @@ __attribute__( ( always_inline ) ) static inline void __wfe(void)
 {\r
        __asm("  wfe");\r
 }\r
+#endif\r
 \r
 // Enable Interrupts\r
 __attribute__( ( always_inline ) ) static inline void __enable_irq(void)\r
@@ -194,7 +201,7 @@ static inline void __set_PRIMASK(uint32_t priMask)
 #define __SMUAD                _smuad\r
 #define __SMUADX       _smuadx\r
 #define __SMUSD                _smusd\r
-#define __SMUSDX       _smusd\r
+#define __SMUSDX       _smusdx\r
 #define __SSAT16       _ssat16\r
 #define __SSUB16       _ssub16\r
 #define __SSUB8                _ssub8\r